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

Update to 2.32.0

Browse Source 
... and dropped an upstreamed patch.
This commit is contained in:
Kalev Lember 2012-03-26 17:22:55 +03:00
parent c778d6aca7
commit d18b5ea8d0
3 changed files with 7 additions and 39 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
View File

@ -1,28 +0,0 @@
--- 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

16
mingw-glib2.spec
View File

@ -1,8 +1,8 @@
%?mingw_package_header
Name: mingw-glib2
Version: 2.31.20
Release: 2%{?dist}
Version: 2.32.0
Release: 1%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@ -12,9 +12,6 @@ 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 >= 95
@ -38,9 +35,6 @@ BuildRequires: gettext
# Native version required for glib-genmarshal
BuildRequires: glib2-devel >= 2.31.20
# Needed for the patch
BuildRequires: autoconf automake libtool
%description
MinGW Windows Glib2 library.
@ -80,8 +74,6 @@ Static version of the MinGW Windows GLib2 library.
%prep
%setup -q -n glib-%{version}
%patch0 -p0
autoreconf -i --force
%build
@ -260,6 +252,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
* Mon Mar 26 2012 Kalev Lember <kalevlember@gmail.com> - 2.32.0-1
- Update to 2.32.0
- Dropped upstreamed patch
* Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.31.20-2
- Added win64 support

2
sources
View File

@ -1 +1 @@
16e1964e993b065c703157db17218d2a glib-2.31.20.tar.xz
c5fa76fbf9184d20dfb04af66b598190 glib-2.32.0.tar.xz