commit ba6393e759c57a3c7d90003a24a4f93cad3520bb Author: Erik van Pienbroek epienbro@fedoraproject.org Date: Fri Oct 5 15:48:28 2012 +0200

Update to 2.34.0

...ile-on-Win32-to-make-sure-g_unlink-always.patch | 2 +- glib-build-dbus-proxy-testcase-only-on-unix.patch | 36 ++++++++++++++++++++ mingw-glib2.spec | 11 +++++- sources | 2 +- 4 files changed, 47 insertions(+), 4 deletions(-) --- diff --git a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch index 62b19f2..f32fd49 100644 --- a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch +++ b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch @@ -151,7 +151,7 @@ index 6d763e1..c1d072f 100644 + return retval; #else - return open (filename, flags, mode); + int fd; @@ -248,6 +355,8 @@ g_creat (const gchar *filename, int mode) { diff --git a/glib-build-dbus-proxy-testcase-only-on-unix.patch b/glib-build-dbus-proxy-testcase-only-on-unix.patch new file mode 100644 index 0000000..201c4e3 --- /dev/null +++ b/glib-build-dbus-proxy-testcase-only-on-unix.patch @@ -0,0 +1,36 @@ +From db0f0197a2e1740ec2e13cf254d0e6a968bf6db4 Mon Sep 17 00:00:00 2001 +From: "Arnel A. Borja" kyoushuu@yahoo.com +Date: Thu, 13 Sep 2012 22:20:49 +0800 +Subject: [PATCH 3/4] gio/tests: Compile gdbus-proxy only when target is Unix + +--- + gio/tests/Makefile.am | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am +index e352383..68ebcf0 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am +@@ -71,7 +71,6 @@ TEST_PROGS += \ + gdbus-connection-loss \ + gdbus-connection-slow \ + gdbus-names \ +- gdbus-proxy \ + gdbus-proxy-threads \ + gdbus-proxy-well-known-name \ + gdbus-introspection \ +@@ -81,6 +80,12 @@ TEST_PROGS += \ + gdbus-bz627724 \ + gmenumodel \ + $(NULL) ++ ++if OS_UNIX ++TEST_PROGS += \ ++ gdbus-proxy \ ++ $(NULL) ++endif + endif + + +-- +1.7.10.4 diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 06b15ff..2a09122 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -1,8 +1,8 @@ %?mingw_package_header

Name: mingw-glib2 -Version: 2.33.10 -Release: 2%{?dist} +Version: 2.34.0 +Release: 1%{?dist} Summary: MinGW Windows GLib2 library

License: LGPLv2+ @@ -41,6 +41,9 @@ Patch0: 0001-Don-t-start-a-DBus-server-when-built-as-static-lib.patch # https://bugzilla.gnome.org/show_bug.cgi?id=674214 Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch

+# https://bugzilla.gnome.org/show_bug.cgi?id=684145 +Patch2: glib-build-dbus-proxy-testcase-only-on-unix.patch +

%description MinGW Windows Glib2 library. @@ -83,6 +86,7 @@ Static version of the MinGW Windows GLib2 library. %setup -q -n glib-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1

%build @@ -261,6 +265,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete

%changelog +* Fri Oct 5 2012 Erik van Pienbroek epienbro@fedoraproject.org - 2.34.0-1 +- Update to 2.34.0 + * Mon Aug 27 2012 Erik van Pienbroek epienbro@fedoraproject.org - 2.33.10-2 - Use CreateFile on Win32 to make sure g_unlink always works (GNOME BZ #674214) - Fixed typo's in description diff --git a/sources b/sources index 55c3f60..3251010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f817af6c6794200af23f9ef084c85219 glib-2.33.10.tar.xz +d80aef668f981b5dcf157633d13081c0 glib-2.34.0.tar.xz