[Gpg4win-commits] r104 - in trunk: . patches/glib patches/glib-2.6.6

[scm-commit at wald.intevation.org]

Author: marcus
Date: 2005-12-31 13:45:27 +0100 (Sat, 31 Dec 2005)
New Revision: 104

Added:
   trunk/patches/glib-2.6.6/02-windres.patch
   trunk/patches/glib/02-windres.patch
Modified:
   trunk/ChangeLog
Log:
2005-12-31  Marcus Brinkmann  <marcus at g10code.de>

	* glib/02-windres.patch: New file.
	* glib-2.6.6/02-windres.patch: New file.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-12-31 12:44:11 UTC (rev 103)
+++ trunk/ChangeLog	2005-12-31 12:45:27 UTC (rev 104)
@@ -1,5 +1,8 @@
 2005-12-31  Marcus Brinkmann  <marcus at 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.

Added: trunk/patches/glib/02-windres.patch
===================================================================
--- trunk/patches/glib/02-windres.patch	2005-12-31 12:44:11 UTC (rev 103)
+++ trunk/patches/glib/02-windres.patch	2005-12-31 12:45:27 UTC (rev 104)
@@ -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


Property changes on: trunk/patches/glib/02-windres.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/patches/glib-2.6.6/02-windres.patch
===================================================================
--- trunk/patches/glib-2.6.6/02-windres.patch	2005-12-31 12:44:11 UTC (rev 103)
+++ trunk/patches/glib-2.6.6/02-windres.patch	2005-12-31 12:45:27 UTC (rev 104)
@@ -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


Property changes on: trunk/patches/glib-2.6.6/02-windres.patch
___________________________________________________________________
Name: svn:executable
   + *