cairo 1.12.2-x86-mingw32 → 1.12.3-x86-mingw32

data/vendor/local/src/dieterv/packaging/cairo_1.10.2-2_win32.sh

@@ -0,0 +1,251 @@
+# 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=cairo
+VER=1.10.2
+REV=2
+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=/devel/target/$HEX
+
+usedev
+usewinsdk52
+
+(
+
+set -x
+
+# Fix A1 format win32 surfaces, https://bugs.freedesktop.org/show_bug.cgi?id=42739
+patch --verbose -p1 --fuzz=0 <<'EOF' &&
+diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
+index 660aaba..8ebd185 100644
+--- a/src/cairo-win32-surface.c
++++ b/src/cairo-win32-surface.c
+@@ -545,6 +545,79 @@ _cairo_win32_surface_get_subimage (cairo_win32_surface_t  *surface,
+     return CAIRO_STATUS_SUCCESS;
+ }
+ 
++static const unsigned char mirror[256] = {
++  0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
++  0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
++  0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
++  0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
++  0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
++  0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
++  0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
++  0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
++  0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
++  0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
++  0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
++  0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
++  0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
++  0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
++  0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
++  0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
++  0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
++  0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
++  0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
++  0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
++  0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
++  0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
++  0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
++  0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
++  0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
++  0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
++  0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
++  0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
++  0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
++  0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
++  0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
++  0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
++};
++
++static void
++mirror_a1_bits (cairo_surface_t *image_surface)
++{
++    int w, h, stride, x, y;
++    unsigned char *data;
++
++    h = cairo_image_surface_get_height (image_surface);
++    stride = cairo_image_surface_get_stride (image_surface);
++    data = cairo_image_surface_get_data (image_surface);
++
++    for (y = 0; y < h; y++) {
++	for (x = 0; x < stride; x++) {
++	    *data = mirror[*data];
++	    data++;
++	}
++    }
++}
++
++static cairo_bool_t
++_cairo_win32_surface_is_gdi_format (cairo_surface_t *image_surface)
++{
++    return cairo_image_surface_get_format (image_surface) != CAIRO_FORMAT_A1;
++}
++
++static void
++_cairo_win32_surface_convert_from_gdi_format (cairo_surface_t *image_surface)
++{
++    if (cairo_image_surface_get_format (image_surface) == CAIRO_FORMAT_A1)
++	mirror_a1_bits (image_surface);
++}
++
++static void
++_cairo_win32_surface_convert_to_gdi_format (cairo_surface_t *image_surface)
++{
++    if (cairo_image_surface_get_format (image_surface) == CAIRO_FORMAT_A1)
++	mirror_a1_bits (image_surface);
++}
++
+ static cairo_status_t
+ _cairo_win32_surface_acquire_source_image (void                    *abstract_surface,
+ 					   cairo_image_surface_t  **image_out,
+@@ -554,7 +627,7 @@ _cairo_win32_surface_acquire_source_image (void                    *abstract_sur
+     cairo_win32_surface_t *local;
+     cairo_status_t status;
+ 
+-    if (surface->image) {
++    if (surface->image && _cairo_win32_surface_is_gdi_format (surface->image)) {
+ 	*image_out = (cairo_image_surface_t *)surface->image;
+ 	*image_extra = NULL;
+ 	return CAIRO_STATUS_SUCCESS;
+@@ -566,6 +639,8 @@ _cairo_win32_surface_acquire_source_image (void                    *abstract_sur
+     if (status)
+ 	return status;
+ 
++    _cairo_win32_surface_convert_from_gdi_format (local->image);
++
+     *image_out = (cairo_image_surface_t *)local->image;
+     *image_extra = local;
+     return CAIRO_STATUS_SUCCESS;
+@@ -593,7 +668,7 @@ _cairo_win32_surface_acquire_dest_image (void                    *abstract_surfa
+     cairo_win32_surface_t *local = NULL;
+     cairo_status_t status;
+ 
+-    if (surface->image) {
++    if (surface->image && _cairo_win32_surface_is_gdi_format (surface->image)) {
+ 	GdiFlush();
+ 
+ 	*image_out = (cairo_image_surface_t *) surface->image;
+@@ -611,6 +686,8 @@ _cairo_win32_surface_acquire_dest_image (void                    *abstract_surfa
+     if (status)
+ 	return status;
+ 
++    _cairo_win32_surface_convert_from_gdi_format (local->image);
++
+     *image_out = (cairo_image_surface_t *) local->image;
+     *image_extra = local;
+     *image_rect = *interest_rect;
+@@ -630,6 +707,8 @@ _cairo_win32_surface_release_dest_image (void                    *abstract_surfa
+     if (!local)
+ 	return;
+ 
++    _cairo_win32_surface_convert_from_gdi_format (local->image);
++
+     if (!BitBlt (surface->dc,
+ 		 image_rect->x, image_rect->y,
+ 		 image_rect->width, image_rect->height,
+@@ -1313,7 +1392,7 @@ _cairo_win32_surface_composite (cairo_operator_t	op,
+ 
+ UNSUPPORTED:
+     /* Fall back to image surface directly, if this is a DIB surface */
+-    if (dst->image) {
++    if (dst->image && _cairo_win32_surface_is_gdi_format (dst->image)) {
+ 	GdiFlush();
+ 
+ 	return dst->image->backend->composite (op, pattern, mask_pattern,
+EOF
+
+# Reset clip region when writing fallback results , https://bugs.freedesktop.org/show_bug.cgi?id=42821
+patch --verbose -p1 --fuzz=0 <<'EOF' &&
+commit a02dd8ddc7dde30ba71e87ab5e90bf910b68da2b
+Author: Alexander Larsson <alexl@redhat.com>
+Date:   Fri Nov 11 16:15:31 2011 +0100
+
+    win32: Reset clip in _cairo_win32_surface_release_dest_image
+    
+    Without this we were using leftover clip regions from e.g. show_glyphs
+    which made the fallback drawing results disappear.
+
+diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
+index 660aaba..59305f1 100644
+--- a/src/cairo-win32-surface.c
++++ b/src/cairo-win32-surface.c
+@@ -707,6 +707,7 @@ _cairo_win32_surface_release_dest_image (void                    *abstract_surfa
+     if (!local)
+ 	return;
+ 
++    _cairo_win32_surface_set_clip_region (surface, NULL);
+     _cairo_win32_surface_convert_from_gdi_format (local->image);
+
+     if (!BitBlt (surface->dc,
+EOF
+
+sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <build/ltmain.sh >build/ltmain.temp && mv build/ltmain.temp build/ltmain.sh
+
+# Avoid using "file" in libtool. Otherwise libtool won't create a
+# shared library, and give the warning "Trying to link with static lib
+# archive [...] But I can only do this if you have shared version of
+# the library, which you do not appear to have."  I know what I am
+# doing, I do want to link with a static libpixman-1.
+
+sed -e 's!file /!dont-want-to-use-file!' <configure >configure.temp && mv configure.temp configure
+
+DEPS=`latest --arch=${ARCH} gettext-runtime glib pkg-config pixman libpng fontconfig freetype`
+
+PKG_CONFIG_PATH=/dummy
+for D in $DEPS; do
+    PATH=/devel/dist/${ARCH}/$D/bin:$PATH
+    PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH
+done
+
+GETTEXT_RUNTIME=`latest --arch=${ARCH} gettext-runtime`
+ZLIB=`latest --arch=${ARCH} zlib`
+
+png_REQUIRES=libpng \
+CC='gcc -mms-bitfields -mthreads' \
+CPPFLAGS="-I/devel/dist/${ARCH}/${ZLIB}/include" \
+LDFLAGS="-L/devel/dist/${ARCH}/${GETTEXT_RUNTIME}/lib \
+-L/devel/dist/${ARCH}/${ZLIB}/lib" \
+CFLAGS=-O2 \
+./configure --disable-static --enable-ft=yes --prefix=/devel/target/$HEX &&
+
+make -j3 zips &&
+
+cp $MOD-$VER.zip /tmp/$RUNZIP &&
+cp $MOD-dev-$VER.zip /tmp/$DEVZIP &&
+
+cp -p src/cairo.def /devel/target/$HEX/lib &&
+
+mkdir -p /devel/target/$HEX/share/doc/$THIS &&
+cp -p COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 /devel/target/$HEX/share/doc/$THIS &&
+
+cd /devel/target/$HEX &&
+
+zip /tmp/$RUNZIP bin/libcairo-gobject-2.dll &&
+zip /tmp/$RUNZIP bin/libcairo-script-interpreter-2.dll &&
+
+zip /tmp/$DEVZIP lib/libcairo-gobject.dll.a &&
+zip /tmp/$DEVZIP lib/libcairo-script-interpreter.dll.a &&
+
+(cd lib && lib.exe -machine:X86 -def:cairo.def -out:cairo.lib) &&
+
+zip /tmp/$DEVZIP lib/cairo.def lib/cairo.lib &&
+zip -r -D /tmp/$RUNZIP share/doc/$THIS &&
+
+# Don't depend on pixman
+sed -e 's/ pixman-1 >= 0.18.4//' <lib/pkgconfig/cairo.pc >lib/pkgconfig/cairo.pc.temp && mv lib/pkgconfig/cairo.pc.temp lib/pkgconfig/cairo.pc &&
+zip /tmp/$DEVZIP lib/pkgconfig/cairo.pc
+
+) 2>&1 | tee /devel/src/dieterv/packaging/$THIS.log &&
+
+(cd /devel && zip /tmp/$DEVZIP src/dieterv/packaging/$THIS.{sh,log}) &&
+manifestify /tmp/$RUNZIP /tmp/$DEVZIP

data/vendor/local/src/dieterv/packaging/expat_2.1.0-1_win32.log

@@ -0,0 +1,181 @@
+++ sed -e 's/need_relink=yes/need_relink=no # no way --tml/'
+++ mv conftools/ltmain.temp conftools/ltmain.sh
+++ patch -p0
+patching file Makefile.in
+++ CC='gcc -mthreads'
+++ LDFLAGS=-Wl,--enable-auto-image-base
+++ CFLAGS=-O2
+++ ./configure --prefix=/devel/target/194b81514e48f3c8b94a247610845982 --disable-static
+checking build system type... i686-pc-mingw32
+checking host system type... i686-pc-mingw32
+checking for as... as
+checking for dlltool... dlltool
+checking for objdump... objdump
+checking how to print strings... printf
+checking for gcc... gcc -mthreads
+checking whether the C compiler works... yes
+checking for C compiler default output file name... a.exe
+checking for suffix of executables... .exe
+checking whether we are cross compiling... no
+checking for suffix of object files... o
+checking whether we are using the GNU C compiler... yes
+checking whether gcc -mthreads accepts -g... yes
+checking for gcc -mthreads option to accept ISO C89... none needed
+checking for a sed that does not truncate output... /bin/sed
+checking for grep that handles long lines and -e... /bin/grep
+checking for egrep... /bin/grep -E
+checking for fgrep... /bin/grep -F
+checking for ld used by gcc -mthreads... c:/mingw/mingw32/bin/ld.exe
+checking if the linker (c:/mingw/mingw32/bin/ld.exe) is GNU ld... yes
+checking for BSD- or MS-compatible name lister (nm)... /mingw/bin/nm
+checking the name lister (/mingw/bin/nm) interface... BSD nm
+checking whether ln -s works... no, using cp -p
+checking the maximum length of command line arguments... 8192
+checking whether the shell understands some XSI constructs... yes
+checking whether the shell understands "+="... yes
+checking how to convert i686-pc-mingw32 file names to i686-pc-mingw32 format... func_convert_file_msys_to_w32
+checking how to convert i686-pc-mingw32 file names to toolchain format... func_convert_file_msys_to_w32
+checking for c:/mingw/mingw32/bin/ld.exe option to reload object files... -r
+checking for objdump... (cached) objdump
+checking how to recognize dependent libraries... file_magic ^x86 archive import|^x86 DLL
+checking for dlltool... (cached) dlltool
+checking how to associate runtime and link libraries... func_cygming_dll_for_implib
+checking for ar... ar
+checking for archiver @FILE support... @
+checking for strip... strip
+checking for ranlib... ranlib
+checking for gawk... gawk
+checking command to parse /mingw/bin/nm output from gcc -mthreads object... ok
+checking for sysroot... no
+checking for mt... no
+checking if : is a manifest tool... no
+checking how to run the C preprocessor... gcc -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 for dlfcn.h... no
+checking for objdir... .libs
+checking if gcc -mthreads supports -fno-rtti -fno-exceptions... no
+checking for gcc -mthreads option to produce PIC... -DDLL_EXPORT -DPIC
+checking if gcc -mthreads PIC flag -DDLL_EXPORT -DPIC works... yes
+checking if gcc -mthreads static flag -static works... yes
+checking if gcc -mthreads supports -c -o file.o... yes
+checking if gcc -mthreads supports -c -o file.o... (cached) yes
+checking whether the gcc -mthreads linker (c:/mingw/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
+checking for gcc... (cached) gcc -mthreads
+checking whether we are using the GNU C compiler... (cached) yes
+checking whether gcc -mthreads accepts -g... (cached) yes
+checking for gcc -mthreads option to accept ISO C89... (cached) none needed
+checking for g++... g++
+checking whether we are using the GNU C++ compiler... yes
+checking whether g++ accepts -g... yes
+checking how to run the C++ preprocessor... g++ -E
+checking for ld used by g++... c:/mingw/mingw32/bin/ld.exe
+checking if the linker (c:/mingw/mingw32/bin/ld.exe) is GNU ld... yes
+checking whether the g++ linker (c:/mingw/mingw32/bin/ld.exe) supports shared libraries... yes
+checking for g++ option to produce PIC... -DDLL_EXPORT -DPIC
+checking if g++ PIC flag -DDLL_EXPORT -DPIC works... yes
+checking if g++ static flag -static works... yes
+checking if g++ supports -c -o file.o... yes
+checking if g++ supports -c -o file.o... (cached) yes
+checking whether the g++ linker (c:/mingw/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 a BSD-compatible install... /bin/install -c
+checking whether gcc -mthreads accepts -fexceptions... yes
+checking for ANSI C header files... (cached) yes
+checking whether byte ordering is bigendian... no
+checking for an ANSI C-conforming const... yes
+checking for size_t... yes
+checking for memmove... yes
+checking for bcopy... no
+checking fcntl.h usability... yes
+checking fcntl.h presence... yes
+checking for fcntl.h... yes
+checking for unistd.h... (cached) yes
+checking for off_t... yes
+checking for stdlib.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking for sys/param.h... yes
+checking for getpagesize... yes
+checking for working mmap... no
+checking for gcc -mthreads option to accept ISO C99... -std=gnu99
+checking for gcc -mthreads -std=gnu99 option to accept ISO Standard C... (cached) -std=gnu99
+checking for an ANSI C99-conforming __func__... yes
+configure: creating ./config.status
+config.status: creating Makefile
+config.status: WARNING:  'Makefile.in' seems to ignore the --datarootdir setting
+config.status: creating expat.pc
+config.status: creating expat_config.h
+config.status: executing libtool commands
+++ make install
+gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o xmlwf/xmlwf.o -c xmlwf/xmlwf.c
+gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o xmlwf/xmlfile.o -c xmlwf/xmlfile.c
+gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o xmlwf/codepage.o -c xmlwf/codepage.c
+gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o xmlwf/readfilemap.o -c xmlwf/readfilemap.c
+/bin/sh ./libtool --silent --mode=compile gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o lib/xmlparse.lo -c lib/xmlparse.c
+/bin/sh ./libtool --silent --mode=compile gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o lib/xmltok.lo -c lib/xmltok.c
+/bin/sh ./libtool --silent --mode=compile gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -o lib/xmlrole.lo -c lib/xmlrole.c
+/bin/sh ./libtool --silent --mode=link gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -no-undefined -version-info 7:0:6 -rpath /devel/target/194b81514e48f3c8b94a247610845982/lib -Wl,--enable-auto-image-base -o libexpat.la -export-symbols lib/libexpat.def lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
+Creating library file: .libs/libexpat.dll.a
+/bin/sh ./libtool --silent --mode=link gcc -mthreads -std=gnu99 -I./lib -I. -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions  -DHAVE_EXPAT_CONFIG_H -Wl,--enable-auto-image-base -o xmlwf/xmlwf.exe xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/readfilemap.o libexpat.la
+/bin/sh ./conftools/mkinstalldirs /devel/target/194b81514e48f3c8b94a247610845982/lib /devel/target/194b81514e48f3c8b94a247610845982/include /devel/target/194b81514e48f3c8b94a247610845982/lib/pkgconfig
+mkdir /devel/target/194b81514e48f3c8b94a247610845982
+mkdir /devel/target/194b81514e48f3c8b94a247610845982/lib
+mkdir /devel/target/194b81514e48f3c8b94a247610845982/include
+mkdir /devel/target/194b81514e48f3c8b94a247610845982/lib/pkgconfig
+/bin/sh ./libtool --mode=install /bin/install -c libexpat.la /devel/target/194b81514e48f3c8b94a247610845982/lib/libexpat.la
+libtool: install: /bin/install -c .libs/libexpat.dll.a /devel/target/194b81514e48f3c8b94a247610845982/lib/libexpat.dll.a
+libtool: install: base_file=`basename libexpat.la`
+libtool: install:  dlpath=`/bin/sh 2>&1 -c '. .libs/'libexpat.la'i; echo libexpat-1.dll'`
+libtool: install:  dldir=/devel/target/194b81514e48f3c8b94a247610845982/lib/`dirname ../bin/libexpat-1.dll`
+libtool: install:  test -d /devel/target/194b81514e48f3c8b94a247610845982/lib/../bin || mkdir -p /devel/target/194b81514e48f3c8b94a247610845982/lib/../bin
+libtool: install:  /bin/install -c .libs/libexpat-1.dll /devel/target/194b81514e48f3c8b94a247610845982/lib/../bin/libexpat-1.dll
+libtool: install:  chmod a+x /devel/target/194b81514e48f3c8b94a247610845982/lib/../bin/libexpat-1.dll
+libtool: install:  if test -n '' && test -n 'strip --strip-unneeded'; then eval 'strip --strip-unneeded /devel/target/194b81514e48f3c8b94a247610845982/lib/../bin/libexpat-1.dll' || exit 0; fi
+libtool: install: /bin/install -c .libs/libexpat.lai /devel/target/194b81514e48f3c8b94a247610845982/lib/libexpat.la
+for FN in ./lib/expat.h ./lib/expat_external.h ; do /bin/install -c -m 644 $FN /devel/target/194b81514e48f3c8b94a247610845982/include ; done
+/bin/install -c -m 644 expat.pc /devel/target/194b81514e48f3c8b94a247610845982/lib/pkgconfig/expat.pc
+/bin/sh ./conftools/mkinstalldirs /devel/target/194b81514e48f3c8b94a247610845982/bin /devel/target/194b81514e48f3c8b94a247610845982/share/man/man1
+mkdir /devel/target/194b81514e48f3c8b94a247610845982/share
+mkdir /devel/target/194b81514e48f3c8b94a247610845982/share/man
+mkdir /devel/target/194b81514e48f3c8b94a247610845982/share/man/man1
+/bin/sh ./libtool --mode=install /bin/install -c xmlwf/xmlwf.exe /devel/target/194b81514e48f3c8b94a247610845982/bin/xmlwf.exe
+libtool: install: /bin/install -c xmlwf/.libs/xmlwf.exe /devel/target/194b81514e48f3c8b94a247610845982/bin/xmlwf.exe
+/bin/install -c -m 644 ./doc/xmlwf.1 /devel/target/194b81514e48f3c8b94a247610845982/share/man/man1
+++ cp lib/libexpat.def /devel/target/194b81514e48f3c8b94a247610845982/lib
+++ cd /devel/target/194b81514e48f3c8b94a247610845982/lib
+++ lib.exe -machine:IX86 -def:libexpat.def -out:expat.lib
+Microsoft (R) Library Manager Version 8.00.40310.39
+Copyright (C) Microsoft Corporation.  All rights reserved.
+
+   Creating library expat.lib and object expat.exp
+++ rm -f /tmp/expat_2.1.0-1_win32.zip /tmp/expat-dev_2.1.0-1_win32.zip
+++ cd /devel/target/194b81514e48f3c8b94a247610845982
+++ zip /tmp/expat_2.1.0-1_win32.zip bin/libexpat-1.dll
+  adding: bin/libexpat-1.dll (deflated 63%)
+++ zip /tmp/expat-dev_2.1.0-1_win32.zip bin/xmlwf.exe
+  adding: bin/xmlwf.exe (deflated 70%)
+++ zip -r -D /tmp/expat-dev_2.1.0-1_win32.zip include
+  adding: include/expat.h (deflated 74%)
+  adding: include/expat_external.h (deflated 58%)
+++ zip /tmp/expat-dev_2.1.0-1_win32.zip lib/libexpat.dll.a lib/libexpat.def lib/expat.lib
+  adding: lib/libexpat.dll.a (deflated 92%)
+  adding: lib/libexpat.def (deflated 66%)
+  adding: lib/expat.lib (deflated 84%)
+++ zip -r -D /tmp/expat-dev_2.1.0-1_win32.zip share
+  adding: share/man/man1/xmlwf.1 (deflated 57%)

data/vendor/local/src/{tml/packaging/expat_2.0.1-1_win32.sh → dieterv/packaging/expat_2.1.0-1_win32.sh}

@@ -3,7 +3,7 @@
 # usable unmodified by others, and is included only for reference.
 
 MOD=expat
-VER=2.0.1
+VER=2.1.0
 REV=1
 ARCH=win32
 
@@ -16,10 +16,10 @@ DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
 # just a hash value and not supposed to be relevant at end-user
 # machines.
 HEX=`echo $THIS | md5sum | cut -d' ' -f1`
-TARGET=c:/devel/target/$HEX
+TARGET=/devel/target/$HEX
 
 usestable
-usemsvs6
+usewinsdk52
 
 (
 
@@ -33,7 +33,16 @@ sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <conftools/ltmain.sh >
 patch -p0 <<\EOF &&
 --- Makefile.in
 +++ Makefile.in
-@@ -117,7 +117,7 @@
+@@ -79,7 +79,7 @@
+ 
+ install: xmlwf/xmlwf@EXEEXT@ installlib
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf@EXEEXT@ $(DESTDIR)$(bindir)/xmlwf
++	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf@EXEEXT@ $(DESTDIR)$(bindir)/xmlwf@EXEEXT@
+ 	$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
+ 
+ installlib: $(LIBRARY) $(APIHEADER) expat.pc
+@@ -121,7 +121,7 @@
  COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
  CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
  LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
@@ -44,25 +53,24 @@ patch -p0 <<\EOF &&
  
 EOF
 
-CC='gcc -mthreads' LDFLAGS='-Wl,--enable-auto-image-base' CFLAGS=-O2 ./configure --prefix=c:/devel/target/$HEX --disable-static &&
+CC='gcc -mthreads' LDFLAGS='-Wl,--enable-auto-image-base' CFLAGS=-O2 ./configure --prefix=$TARGET --disable-static &&
 
 make install &&
 
-cp lib/libexpat.def /devel/target/$HEX/lib &&
-
-(cd /devel/target/$HEX/lib && lib.exe -machine:IX86 -def:libexpat.def -out:expat.lib) &&
+cp lib/libexpat.def $TARGET/lib &&
+(cd $TARGET/lib && lib.exe -machine:IX86 -def:libexpat.def -out:expat.lib) &&
 
 rm -f /tmp/$RUNZIP /tmp/$DEVZIP &&
 
-(cd /devel/target/$HEX &&
+(cd $TARGET &&
 zip /tmp/$RUNZIP bin/libexpat-1.dll &&
 zip /tmp/$DEVZIP bin/xmlwf.exe &&
 zip -r -D /tmp/$DEVZIP include &&
 zip /tmp/$DEVZIP lib/{libexpat.dll.a,libexpat.def,expat.lib} &&
-zip -r -D /tmp/$DEVZIP man
+zip -r -D /tmp/$DEVZIP share
 )
 
-) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
+) 2>&1 | tee /devel/src/dieterv/packaging/$THIS.log
 
-(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
+(cd /devel && zip /tmp/$DEVZIP src/dieterv/packaging/$THIS.{sh,log}) &&
 manifestify /tmp/$RUNZIP /tmp/$DEVZIP