2005-12-31 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Sat, 31 Dec 2005 12:45:27 +0000 (12:45 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Sat, 31 Dec 2005 12:45:27 +0000 (12:45 +0000)
* glib/02-windres.patch: New file.
* glib-2.6.6/02-windres.patch: New file.

ChangeLog
patches/glib-2.6.6/02-windres.patch [new file with mode: 0755]
patches/glib/02-windres.patch [new file with mode: 0755]

index 0cb1556..1b4c272 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-31  Marcus Brinkmann  <marcus@g10code.de>
 
+       * glib/02-windres.patch: New file.
+       * glib-2.6.6/02-windres.patch: New file.
+
        * configure.ac (glib): Make it a source package.
        * src/Makefile.am (gpg4win_bpkgs): Move glib to ...
        (gpg4win_spkgs): ... here.
diff --git a/patches/glib-2.6.6/02-windres.patch b/patches/glib-2.6.6/02-windres.patch
new file mode 100755 (executable)
index 0000000..bdf72b8
--- /dev/null
@@ -0,0 +1,20 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Fix windres tool invocation.  This is the wrong patch!  The right way
+to do it is to add a configure tool check for WINDRES.  However, this
+requires rerunning autoconf, and this small patch is all we need to
+make it build.
+
+--- glib-2.6.6-orig/build/win32/compile-resource       2005-12-31 13:41:37.000000000 +0100
++++ glib-2.6.6/build/win32/compile-resource    2005-12-31 13:42:01.000000000 +0100
+@@ -38,7 +38,7 @@
+     fi
+     m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc &&
+-      ${WINDRES-windres} $$.rc $resfile &&
++        i586-mingw32msvc-windres $$.rc $resfile &&
+       rm $$.rc
+ else
+     # Return failure
diff --git a/patches/glib/02-windres.patch b/patches/glib/02-windres.patch
new file mode 100755 (executable)
index 0000000..bdf72b8
--- /dev/null
@@ -0,0 +1,20 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Fix windres tool invocation.  This is the wrong patch!  The right way
+to do it is to add a configure tool check for WINDRES.  However, this
+requires rerunning autoconf, and this small patch is all we need to
+make it build.
+
+--- glib-2.6.6-orig/build/win32/compile-resource       2005-12-31 13:41:37.000000000 +0100
++++ glib-2.6.6/build/win32/compile-resource    2005-12-31 13:42:01.000000000 +0100
+@@ -38,7 +38,7 @@
+     fi
+     m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc &&
+-      ${WINDRES-windres} $$.rc $resfile &&
++        i586-mingw32msvc-windres $$.rc $resfile &&
+       rm $$.rc
+ else
+     # Return failure