rpms/mingw-glib2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added patch to fix GNOME bug #671676

Browse Source
This commit is contained in:
Erik van Pienbroek 2012-03-08 20:26:41 +01:00
parent e07da3d967
commit d88004b607
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
glib-use-correct-glib-genmarshal-when-cross-compiling.patch Normal file
View File

@ -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

8
mingw-glib2.spec
View File

@ -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