[mingw-glib2] Added patch to fix GNOME bug #671676
epienbro
epienbro at fedoraproject.org
Thu Mar 8 19:27:00 UTC 2012
commit d88004b6070e03418f3f9e3515a7f3680850ad0b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Mar 8 20:26:41 2012 +0100
Added patch to fix GNOME bug #671676
...rect-glib-genmarshal-when-cross-compiling.patch | 28 ++++++++++++++++++++
mingw-glib2.spec | 8 +++++
2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/glib-use-correct-glib-genmarshal-when-cross-compiling.patch b/glib-use-correct-glib-genmarshal-when-cross-compiling.patch
new file mode 100644
index 0000000..f0763a0
--- /dev/null
+++ b/glib-use-correct-glib-genmarshal-when-cross-compiling.patch
@@ -0,0 +1,28 @@
+--- gobject/tests/Makefile.am.orig 2012-03-08 20:09:45.755049810 +0100
++++ gobject/tests/Makefile.am 2012-03-08 20:10:59.873748244 +0100
+@@ -2,6 +2,12 @@
+
+ INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
+
++if CROSS_COMPILING
++ glib_genmarshal=$(GLIB_GENMARSHAL)
++else
++ glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
++endif
++
+ noinst_PROGRAMS = $(TEST_PROGS)
+ LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
+
+@@ -21,10 +27,10 @@
+ signals_SOURCES = signals.c marshalers.c
+
+ marshalers.h: Makefile.am marshalers.list
+- $(AM_V_GEN) ../glib-genmarshal --prefix=test $(srcdir)/marshalers.list --header --valist-marshallers > marshalers.h
++ $(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --header --valist-marshallers > marshalers.h
+
+ marshalers.c: Makefile.am marshalers.list
+- $(AM_V_GEN) ../glib-genmarshal --prefix=test $(srcdir)/marshalers.list --body --valist-marshallers > marshalers.c
++ $(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --body --valist-marshallers > marshalers.c
+
+ BUILT_SOURCES = marshalers.h marshalers.c
+ CLEANFILES = marshalers.h marshalers.c
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 77efe32..3277485 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -14,6 +14,9 @@ URL: http://www.gtk.org
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Source0: http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}.tar.xz
+# http://bugzilla.gnome.org/671676
+Patch0: glib-use-correct-glib-genmarshal-when-cross-compiling.patch
+
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
@@ -29,6 +32,9 @@ BuildRequires: gettext
# Native version required for glib-genmarshal
BuildRequires: glib2-devel >= 2.31.14
+# Needed for the patch
+BuildRequires: autoconf automake libtool
+
%description
MinGW Windows Glib2 library.
@@ -52,6 +58,8 @@ Static version of the MinGW Windows GLib2 library.
%prep
%setup -q -n glib-%{version}
+%patch0 -p0
+autoreconf -i --force
%build
More information about the scm-commits
mailing list