gtk2 0.90.2-x86-mingw32 → 0.90.3-x86-mingw32

data/vendor/local/src/tml/packaging/pkg-config_0.23-3_win32.log

@@ -1,215 +0,0 @@
-+++ latest --arch=win32 glib
-++ GLIB=glib-2.20.3-1
-+++ latest --arch=win32 proxy-libintl
-++ PROXY_LIBINTL=proxy-libintl-20080918
-++ sed -e 's/need_relink=yes/need_relink=no # no way --tml/'
-++ mv ltmain.temp ltmain.sh
-++ sed -e 's/-lglib-2.0 -liconv -lintl/-lglib-2.0/'
-++ mv configure.temp configure
-++ PKG_CONFIG_PATH=/devel/dist/win32/glib-2.20.3-1/lib/pkgconfig
-++ patch -p0
-patching file `./ChangeLog'
-patching file `./main.c'
-patching file `./parse.c'
-patching file `./pkg-config.1'
-++ CC='gcc -mtune=pentium3 -mthreads'
-+++ /opt/local/bin/pkg-config.sh --cflags glib-2.0
-++ CPPFLAGS='-mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include'
-+++ /opt/local/bin/pkg-config.sh --libs glib-2.0
-++ LDFLAGS='-Lc:/devel/dist/win32/glib-2.20.3-1/lib -lglib-2.0 -lintl   -L/devel/dist/win32/proxy-libintl-20080918/lib -Wl,--exclude-libs=libintl.a'
-++ CFLAGS=-O2
-++ ./configure --disable-static --prefix=c:/devel/target/ee2096576188f9b37bc66c6c2aa39813
-checking for a BSD-compatible install... /opt/local/bin/install -c
-checking whether build environment is sane... yes
-checking for gawk... gawk
-checking whether make sets $(MAKE)... yes
-checking whether to enable maintainer-specific portions of Makefiles... no
-checking build system type... i686-pc-mingw32
-checking host system type... i686-pc-mingw32
-checking for style of include used by make... GNU
-checking for gcc... gcc -mtune=pentium3 -mthreads
-checking for C compiler default output file name... a.exe
-checking whether the C compiler works... yes
-checking whether we are cross compiling... no
-checking for suffix of executables... .exe
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc -mtune=pentium3 -mthreads accepts -g... yes
-checking for gcc -mtune=pentium3 -mthreads option to accept ISO C89... none needed
-checking dependency style of gcc -mtune=pentium3 -mthreads... gcc3
-checking for a sed that does not truncate output... /bin/sed
-checking for grep that handles long lines and -e... /opt/gnuwin32/bin/grep
-checking for egrep... /opt/gnuwin32/bin/grep -E
-checking for ld used by gcc -mtune=pentium3 -mthreads... c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe
-checking if the linker (c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe) is GNU ld... yes
-checking for c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe option to reload object files... -r
-checking for BSD-compatible nm... /opt/mingw/bin/nm
-checking whether ln -s works... yes
-checking how to recognize dependent libraries... file_magic ^x86 archive import|^x86 DLL
-checking how to run the C preprocessor... gcc -mtune=pentium3 -mthreads -E
-checking for ANSI C header files... yes
-checking for sys/types.h... yes
-checking for sys/stat.h... yes
-checking for stdlib.h... yes
-checking for string.h... yes
-checking for memory.h... yes
-checking for strings.h... yes
-checking for inttypes.h... yes
-checking for stdint.h... yes
-checking for unistd.h... yes
-checking dlfcn.h usability... no
-checking dlfcn.h presence... no
-checking for dlfcn.h... no
-checking for g++... g++
-checking whether we are using the GNU C++ compiler... yes
-checking whether g++ accepts -g... yes
-checking dependency style of g++... gcc3
-checking how to run the C++ preprocessor... g++ -E
-checking for g77... g77
-checking whether we are using the GNU Fortran 77 compiler... yes
-checking whether g77 accepts -g... yes
-checking the maximum length of command line arguments... 8192
-checking command to parse /opt/mingw/bin/nm output from gcc -mtune=pentium3 -mthreads object... ok
-checking for objdir... .libs
-checking for ar... ar
-checking for ranlib... ranlib
-checking for strip... strip
-checking if gcc -mtune=pentium3 -mthreads supports -fno-rtti -fno-exceptions... no
-checking for gcc -mtune=pentium3 -mthreads option to produce PIC... -DDLL_EXPORT
-checking if gcc -mtune=pentium3 -mthreads PIC flag -DDLL_EXPORT works... yes
-checking if gcc -mtune=pentium3 -mthreads static flag -static works... yes
-checking if gcc -mtune=pentium3 -mthreads supports -c -o file.o... yes
-checking whether the gcc -mtune=pentium3 -mthreads linker (c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe) supports shared libraries... yes
-checking whether -lc should be explicitly linked in... yes
-checking dynamic linker characteristics... Win32 ld.exe
-checking how to hardcode library paths into programs... immediate
-checking whether stripping libraries is possible... yes
-checking if libtool supports shared libraries... yes
-checking whether to build shared libraries... yes
-checking whether to build static libraries... no
-configure: creating libtool
-appending configuration tag "CXX" to libtool
-checking for ld used by g++... c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe
-checking if the linker (c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe) is GNU ld... yes
-checking whether the g++ linker (c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe) supports shared libraries... yes
-checking for g++ option to produce PIC... -DDLL_EXPORT
-checking if g++ PIC flag -DDLL_EXPORT works... yes
-checking if g++ static flag -static works... yes
-checking if g++ supports -c -o file.o... yes
-checking whether the g++ linker (c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe) supports shared libraries... yes
-checking dynamic linker characteristics... Win32 ld.exe
-checking how to hardcode library paths into programs... immediate
-appending configuration tag "F77" to libtool
-checking if libtool supports shared libraries... yes
-checking whether to build shared libraries... yes
-checking whether to build static libraries... no
-checking for g77 option to produce PIC... -DDLL_EXPORT
-checking if g77 PIC flag -DDLL_EXPORT works... yes
-checking if g77 static flag -static works... yes
-checking if g77 supports -c -o file.o... yes
-checking whether the g77 linker (c:/opt/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../mingw32/bin/ld.exe) supports shared libraries... yes
-checking dynamic linker characteristics... Win32 ld.exe
-checking how to hardcode library paths into programs... immediate
-checking for gcc... (cached) gcc -mtune=pentium3 -mthreads
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether gcc -mtune=pentium3 -mthreads accepts -g... (cached) yes
-checking for gcc -mtune=pentium3 -mthreads option to accept ISO C89... (cached) none needed
-checking dependency style of gcc -mtune=pentium3 -mthreads... (cached) gcc3
-checking whether to list both direct and indirect dependencies... sh: line 316: ^x86: command not found
-no
-checking for Win32... yes
-checking for working alloca.h... no
-checking for alloca... yes
-checking for setresuid... no
-checking for setreuid... no
-checking dirent.h usability... yes
-checking dirent.h presence... yes
-checking for dirent.h... yes
-checking for unistd.h... (cached) yes
-checking sys/wait.h usability... no
-checking sys/wait.h presence... no
-checking for sys/wait.h... no
-configure: creating ./config.status
-config.status: creating Makefile
-config.status: creating check/Makefile
-config.status: creating config.h
-config.status: executing depfiles commands
-++ make -j3 install
-Making install in check
-make[1]: Entering directory `/devel/src/freedesktop/pkg-config/0.23-3_win32/check'
-make[2]: Entering directory `/devel/src/freedesktop/pkg-config/0.23-3_win32/check'
-make[2]: Nothing to be done for `install-exec-am'.
-make[2]: Nothing to be done for `install-data-am'.
-make[2]: Leaving directory `/devel/src/freedesktop/pkg-config/0.23-3_win32/check'
-make[1]: Leaving directory `/devel/src/freedesktop/pkg-config/0.23-3_win32/check'
-make[1]: Entering directory `/devel/src/freedesktop/pkg-config/0.23-3_win32'
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT pkg.o -MD -MP -MF ".deps/pkg.Tpo" \
-	  -c -o pkg.o `test -f 'pkg.c' || echo './'`pkg.c; \
-	then mv -f ".deps/pkg.Tpo" ".deps/pkg.Po"; \
-	else rm -f ".deps/pkg.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT partial-glib.o -MD -MP -MF ".deps/partial-glib.Tpo" \
-	  -c -o partial-glib.o `test -f 'partial-glib.c' || echo './'`partial-glib.c; \
-	then mv -f ".deps/partial-glib.Tpo" ".deps/partial-glib.Po"; \
-	else rm -f ".deps/partial-glib.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT parse.o -MD -MP -MF ".deps/parse.Tpo" \
-	  -c -o parse.o `test -f 'parse.c' || echo './'`parse.c; \
-	then mv -f ".deps/parse.Tpo" ".deps/parse.Po"; \
-	else rm -f ".deps/parse.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT main.o -MD -MP -MF ".deps/main.Tpo" \
-	  -c -o main.o `test -f 'main.c' || echo './'`main.c; \
-	then mv -f ".deps/main.Tpo" ".deps/main.Po"; \
-	else rm -f ".deps/main.Tpo"; exit 1; \
-	fi
-pkg.c: In function `scan_dir':
-pkg.c:154: warning: assignment discards qualifiers from pointer target type
-pkg.c: In function `verify_package':
-pkg.c:872: warning: assignment discards qualifiers from pointer target type
-pkg.c:878: warning: assignment discards qualifiers from pointer target type
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT findme.o -MD -MP -MF ".deps/findme.Tpo" \
-	  -c -o findme.o `test -f 'findme.c' || echo './'`findme.c; \
-	then mv -f ".deps/findme.Tpo" ".deps/findme.Po"; \
-	else rm -f ".deps/findme.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT popt.o -MD -MP -MF ".deps/popt.Tpo" \
-	  -c -o popt.o `test -f 'popt.c' || echo './'`popt.c; \
-	then mv -f ".deps/popt.Tpo" ".deps/popt.Po"; \
-	else rm -f ".deps/popt.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT poptconfig.o -MD -MP -MF ".deps/poptconfig.Tpo" \
-	  -c -o poptconfig.o `test -f 'poptconfig.c' || echo './'`poptconfig.c; \
-	then mv -f ".deps/poptconfig.Tpo" ".deps/poptconfig.Po"; \
-	else rm -f ".deps/poptconfig.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT popthelp.o -MD -MP -MF ".deps/popthelp.Tpo" \
-	  -c -o popthelp.o `test -f 'popthelp.c' || echo './'`popthelp.c; \
-	then mv -f ".deps/popthelp.Tpo" ".deps/popthelp.Po"; \
-	else rm -f ".deps/popthelp.Tpo"; exit 1; \
-	fi
-if gcc -mtune=pentium3 -mthreads -DHAVE_CONFIG_H -I. -I. -I. -DPKG_CONFIG_PC_PATH="\"c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/pkgconfig:c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/pkgconfig\"" -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/include/glib-2.0 -Ic:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib/glib-2.0/include  -mms-bitfields -Ic:/devel/dist/win32/glib-2.20.3-1/include/glib-2.0 -Ic:/devel/dist/win32/glib-2.20.3-1/lib/glib-2.0/include   -I/devel/dist/win32/proxy-libintl-20080918/include  -O2 -MT poptparse.o -MD -MP -MF ".deps/poptparse.Tpo" \
-	  -c -o poptparse.o `test -f 'poptparse.c' || echo './'`poptparse.c; \
-	then mv -f ".deps/poptparse.Tpo" ".deps/poptparse.Po"; \
-	else rm -f ".deps/poptparse.Tpo"; exit 1; \
-	fi
-/bin/sh ./libtool --mode=link gcc -mtune=pentium3 -mthreads  -O2  -Lc:/devel/dist/win32/glib-2.20.3-1/lib -lglib-2.0 -lintl   -L/devel/dist/win32/proxy-libintl-20080918/lib -Wl,--exclude-libs=libintl.a -o pkg-config.exe  pkg.o partial-glib.o parse.o main.o findme.o popt.o poptconfig.o popthelp.o poptparse.o -Lc:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib -lglib-2.0 
-mkdir .libs
-gcc -mtune=pentium3 -mthreads -O2 -Wl,--exclude-libs=libintl.a -o pkg-config.exe pkg.o partial-glib.o parse.o main.o findme.o popt.o poptconfig.o popthelp.o poptparse.o  -Lc:/devel/dist/win32/glib-2.20.3-1/lib -lintl -L/devel/dist/win32/proxy-libintl-20080918/lib -Lc:/devel/target/ee2096576188f9b37bc66c6c2aa39813/lib -lglib-2.0  
-make[2]: Entering directory `/devel/src/freedesktop/pkg-config/0.23-3_win32'
-/bin/sh ./mkinstalldirs c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/bin
-/bin/sh ./mkinstalldirs c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/aclocal
-/bin/sh ./mkinstalldirs c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/man/man1
- /opt/local/bin/install -c -m 644 pkg.m4 c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/aclocal/pkg.m4
-  /bin/sh ./libtool --mode=install /opt/local/bin/install -c pkg-config.exe c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/bin/pkg-config.exe
- /opt/local/bin/install -c -m 644 ./pkg-config.1 c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/share/man/man1/pkg-config.1
-/opt/local/bin/install -c pkg-config.exe c:/devel/target/ee2096576188f9b37bc66c6c2aa39813/bin/pkg-config.exe
-make[2]: Leaving directory `/devel/src/freedesktop/pkg-config/0.23-3_win32'
-make[1]: Leaving directory `/devel/src/freedesktop/pkg-config/0.23-3_win32'
-++ rm -f /tmp/pkg-config_0.23-3_win32.zip /tmp/pkg-config-dev_0.23-3_win32.zip
-++ cd /devel/target/ee2096576188f9b37bc66c6c2aa39813
-++ zip /tmp/pkg-config_0.23-3_win32.zip bin/pkg-config.exe
-  adding: bin/pkg-config.exe (224 bytes security) (deflated 62%)
-++ zip /tmp/pkg-config-dev_0.23-3_win32.zip man/man1/pkg-config.1 share/aclocal/pkg.m4
-  adding: share/aclocal/pkg.m4 (224 bytes security) (deflated 60%)
-	zip warning: name not matched: man/man1/pkg-config.1

data/vendor/local/src/tml/packaging/pkg-config_0.23-3_win32.sh

@@ -1,278 +0,0 @@
-# This is a shell script that calls functions and scripts from
-# tml@iki.fi's personal work environment. It is not expected to be
-# usable unmodified by others, and is included only for reference.
-
-MOD=pkg-config
-VER=0.23
-REV=3
-ARCH=win32
-
-THIS=${MOD}_${VER}-${REV}_${ARCH}
-
-RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip
-DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
-
-HEX=`echo $THIS | md5sum | cut -d' ' -f1`
-TARGET=c:/devel/target/$HEX
-
-usedev
-
-(
-
-set -x
-
-GLIB=`latest --arch=${ARCH} glib`
-PROXY_LIBINTL=`latest --arch=${ARCH} proxy-libintl`
-
-sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh &&
-
-sed -e 's/-lglib-2.0 -liconv -lintl/-lglib-2.0/' <configure >configure.temp && mv configure.temp configure &&
-
-PKG_CONFIG_PATH=/devel/dist/$ARCH/$GLIB/lib/pkgconfig
-
-patch -p0 <<'EOF'
-diff -ru ../orig-0.23/ChangeLog ./ChangeLog
---- ../orig-0.23/ChangeLog	2008-01-17 00:49:33.000000000 +0200
-+++ ./ChangeLog	2009-06-12 14:56:02.093008900 +0300
-@@ -1,3 +1,31 @@
-+2009-06-12  Tor Lillqvist  <tml@iki.fi>
-+
-+	* parse.c: If the value of a a variable other than the "prefix"
-+	one starts with the non-overridden value of "prefix", then replace
-+	that prefix, too, with the run-time one.
-+
-+	* pkg-config.1: Corresponding update.
-+
-+2008-02-19  Tor Lillqvist  <tml@novell.com>
-+
-+	* main.c: Remove the possibility to have a default PKG_CONFIG_PATH
-+	in the Registry. It is much more flexible to just use environment
-+	variables. In general the Registry is not used in the ports of
-+	GTK+ or GNOME libraries and software to Windows.
-+
-+	* parse.c (parse_line): On Windows, handle also .pc files found in
-+	a share/pkgconfig folder when automatically redefining a prefix
-+	variable for the package.
-+
-+	* pkg-config.1: Corresponding changes.
-+
-+2008-02-18  Tor Lillqvist  <tml@novell.com>
-+
-+	* main.c: Fix some bitrot: On Windows, don't use the compile-time
-+	PKG_CONFIG_PC_PATH, but deduce a default one at run-time based on
-+	the location of the executable. This was originally what
-+	pkg-config did on Windows, but it had bit-rotted.
-+
- 2008-01-16  Tollef Fog Heen  <tfheen@err.no>
- 
- 	* NEWS, configure.in: Release 0.23
-diff -ru ../orig-0.23/main.c ./main.c
---- ../orig-0.23/main.c	2008-01-17 00:06:48.000000000 +0200
-+++ ./main.c	2009-06-12 13:28:26.671133900 +0300
-@@ -38,9 +38,13 @@
- 
- #ifdef G_OS_WIN32
- /* No hardcoded paths in the binary, thanks */
--#undef PKGLIBDIR
--/* It's OK to leak this, as PKGLIBDIR is invoked only once */
--#define PKG_CONFIG_PATH g_strconcat (g_win32_get_package_installation_directory (PACKAGE, NULL), "\\lib\\pkgconfig", NULL)
-+/* It's OK to leak this */
-+#undef PKG_CONFIG_PC_PATH
-+#define PKG_CONFIG_PC_PATH \
-+  g_strconcat (g_win32_get_package_installation_subdirectory (NULL, NULL, "lib/pkgconfig"), \
-+	       ";", \
-+	       g_win32_get_package_installation_subdirectory (NULL, NULL, "share/pkgconfig"), \
-+	       NULL)
- #endif
- 
- static int want_debug_spew = 0;
-@@ -296,57 +300,6 @@
-       add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
-     }
- 
--#ifdef G_OS_WIN32
--  {
--    /* Add search directories from the Registry */
--
--    HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
--    gchar *root_names[] = { "HKEY_CURRENT_USER", "HKEY_LOCAL_MACHINE" };
--    HKEY key;
--    int i;
--    gulong max_value_name_len, max_value_len;
--
--    for (i = 0; i < G_N_ELEMENTS (roots); i++)
--      {
--	key = NULL;
--	if (RegOpenKeyEx (roots[i], "Software\\" PACKAGE "\\PKG_CONFIG_PATH", 0,
--			  KEY_QUERY_VALUE, &key) == ERROR_SUCCESS &&
--	    RegQueryInfoKey (key, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
--			     &max_value_name_len, &max_value_len,
--			     NULL, NULL) == ERROR_SUCCESS)
--	  {
--	    int index = 0;
--	    gchar *value_name = g_malloc (max_value_name_len + 1);
--	    gchar *value = g_malloc (max_value_len + 1);
--
--	    while (TRUE)
--	      {
--		gulong type;
--		gulong value_name_len = max_value_name_len + 1;
--		gulong value_len = max_value_len + 1;
--
--		if (RegEnumValue (key, index++, value_name, &value_name_len,
--				  NULL, &type,
--				  value, &value_len) != ERROR_SUCCESS)
--		  break;
--
--		if (type != REG_SZ)
--		  continue;
--
--		value_name[value_name_len] = '\0';
--		value[value_len] = '\0';
--		debug_spew ("Adding directory '%s' from %s\\Software\\"
--			    PACKAGE "\\PKG_CONFIG_PATH\\%s\n",
--			    value, root_names[i], value_name);
--		add_search_dir (value);
--	      }
--	  }
--	if (key != NULL)
--	  RegCloseKey (key);
--      }
--  }
--#endif
--
-   pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
-   if (pcsysrootdir)
-     {
-diff -ru ../orig-0.23/parse.c ./parse.c
---- ../orig-0.23/parse.c	2008-01-16 22:42:49.000000000 +0200
-+++ ./parse.c	2009-06-12 14:52:58.296133900 +0300
-@@ -897,6 +897,8 @@
- }
- 
- #ifdef G_OS_WIN32
-+static char *orig_prefix = NULL;
-+
- static int
- pathnamecmp (const char *a,
- 	     const char *b)
-@@ -1011,29 +1013,38 @@
- 	  gchar *prefix = pkg->pcfiledir;
- 	  const int prefix_len = strlen (prefix);
- 	  const char *const lib_pkgconfig = "\\lib\\pkgconfig";
-+	  const char *const share_pkgconfig = "\\share\\pkgconfig";
- 	  const int lib_pkgconfig_len = strlen (lib_pkgconfig);
-+	  const int share_pkgconfig_len = strlen (share_pkgconfig);
- 
--	  if (strlen (prefix) > lib_pkgconfig_len &&
--	      pathnamecmp (prefix + prefix_len - lib_pkgconfig_len,
--			   lib_pkgconfig) == 0)
-+	  if ((strlen (prefix) > lib_pkgconfig_len &&
-+	       pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, lib_pkgconfig) == 0) ||
-+	      (strlen (prefix) > share_pkgconfig_len &&
-+	       pathnamecmp (prefix + prefix_len - share_pkgconfig_len, share_pkgconfig) == 0))
- 	    {
--	      /* It ends in lib\pkgconfig. Good. */
-+	      /* It ends in lib\pkgconfig or share\pkgconfig. Good. */
- 	      
--	      gchar *p;
-+	      gchar *q;
- 	      
-+	      orig_prefix = g_strdup (p);
-+
- 	      prefix = g_strdup (prefix);
--	      prefix[prefix_len - lib_pkgconfig_len] = '\0';
-+	      if (strlen (prefix) > lib_pkgconfig_len &&
-+		  pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, lib_pkgconfig) == 0)
-+		prefix[prefix_len - lib_pkgconfig_len] = '\0';
-+	      else
-+		prefix[prefix_len - share_pkgconfig_len] = '\0';
- 	      
- 	      /* Turn backslashes into slashes or
- 	       * poptParseArgvString() will eat them when ${prefix}
- 	       * has been expanded in parse_libs().
- 	       */
--	      p = prefix;
--	      while (*p)
-+	      q = prefix;
-+	      while (*q)
- 		{
--		  if (*p == '\\')
--		    *p = '/';
--		  p++;
-+		  if (*q == '\\')
-+		    *q = '/';
-+		  q++;
- 		}
- 	      varname = g_strdup (tag);
- 	      debug_spew (" Variable declaration, '%s' overridden with '%s'\n",
-@@ -1042,6 +1053,16 @@
- 	      goto cleanup;
- 	    }
- 	}
-+      else if (!dont_define_prefix &&
-+	       orig_prefix != NULL &&
-+	       strncmp (p, orig_prefix, strlen (orig_prefix)) == 0 &&
-+	       G_IS_DIR_SEPARATOR (p[strlen (orig_prefix)]))
-+	{
-+	  char *oldstr = str;
-+
-+	  p = str = g_strconcat (g_hash_table_lookup (pkg->vars, prefix_variable), p + strlen (orig_prefix), NULL);
-+	  g_free (oldstr);
-+	}
- #endif
- 
-       if (g_hash_table_lookup (pkg->vars, tag))
-diff -ru ../orig-0.23/pkg-config.1 ./pkg-config.1
---- ../orig-0.23/pkg-config.1	2008-01-16 23:26:50.000000000 +0200
-+++ ./pkg-config.1	2009-06-12 13:40:20.249258900 +0300
-@@ -274,20 +274,14 @@
- 
- .SH WINDOWS SPECIALITIES
- If a .pc file is found in a directory that matches the usual
--conventions (i.e., ends with \\lib\\pkgconfig), the prefix for that
--package is assumed to be the grandparent of the directory where the
--file was found, and the \fIprefix\fP variable is overridden for that
--file accordingly.
--
--In addition to the \fIPKG_CONFIG_PATH\fP environment variable, the
--Registry keys
--.DW
--\fIHKEY_CURRENT_USER\\Software\\pkgconfig\\PKG_CONFIG_PATH\fP and
--.EW
--\fIHKEY_LOCAL_MACHINE\\Software\\pkgconfig\\PKG_CONFIG_PATH\fP can be
--used to specify directories to search for .pc files. Each (string)
--value in these keys is treated as a directory where to look for .pc
--files.
-+conventions (i.e., ends with \\lib\\pkgconfig or \\share\\pkgconfig),
-+the prefix for that package is assumed to be the grandparent of the
-+directory where the file was found, and the \fIprefix\fP variable is
-+overridden for that file accordingly.
-+
-+If the value of a variable in a .pc file begins with the original,
-+non-overridden, value of the \fIprefix\fP variable, then the overridden
-+value of \fIprefix\fP is used instead.
- 
- .SH AUTOCONF MACROS
- 
-EOF
-
-CC='gcc -mtune=pentium3 -mthreads' \
-CPPFLAGS="`$PKG_CONFIG --cflags glib-2.0` \
--I/devel/dist/${ARCH}/${PROXY_LIBINTL}/include" \
-LDFLAGS="`$PKG_CONFIG --libs glib-2.0` \
--L/devel/dist/${ARCH}/${PROXY_LIBINTL}/lib -Wl,--exclude-libs=libintl.a" \
-CFLAGS=-O2 \
-./configure --disable-static --prefix=c:/devel/target/$HEX &&
-make -j3 install &&
-
-rm -f /tmp/$RUNZIP /tmp/$DEVZIP
-
-cd /devel/target/$HEX && 
-zip /tmp/$RUNZIP bin/pkg-config.exe &&
-zip /tmp/$DEVZIP man/man1/pkg-config.1 share/aclocal/pkg.m4
-
-) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
-
-(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
-manifestify /tmp/$RUNZIP /tmp/$DEVZIP