7:55 a.m.
commit cc7ce06edd780f2afdbb77c86b41f52c570f36aa
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Apr 14 14:27:22 2012 +0300
Update to 2.32.1
- Dropped an upstreamed patch
- Added two new patches to fix build
...-Fix-alignment-tests-when-cross-compiling.patch | 35 --------------------
0001-tests-fileutils-Fix-Windows-build.patch | 26 ++++++++++++++
0002-Only-build-gmenumodel-test-on-unix.patch | 33 ++++++++++++++++++
mingw-glib2.spec | 16 ++++++---
sources | 2 +-
5 files changed, 71 insertions(+), 41 deletions(-)
---
diff --git a/0001-tests-fileutils-Fix-Windows-build.patch
b/0001-tests-fileutils-Fix-Windows-build.patch
new file mode 100644
index 0000000..dc46c89
--- /dev/null
+++ b/0001-tests-fileutils-Fix-Windows-build.patch
@@ -0,0 +1,26 @@
+From 8386c6e3f913248eb6944ba4351ad1592cb74dba Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember(a)gmail.com>
+Date: Sat, 14 Apr 2012 15:40:17 +0300
+Subject: [PATCH 1/2] tests/fileutils: Fix Windows build
+
+---
+ glib/tests/fileutils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c
+index befb71b..bb9a242 100644
+--- a/glib/tests/fileutils.c
++++ b/glib/tests/fileutils.c
+@@ -541,7 +541,9 @@ test_file_errors (void)
+ g_assert (g_file_error_from_errno (ENXIO) == G_FILE_ERROR_NXIO);
+ g_assert (g_file_error_from_errno (ENODEV) == G_FILE_ERROR_NODEV);
+ g_assert (g_file_error_from_errno (EROFS) == G_FILE_ERROR_ROFS);
++#ifdef ETXTBSY
+ g_assert (g_file_error_from_errno (ETXTBSY) == G_FILE_ERROR_TXTBSY);
++#endif
+ g_assert (g_file_error_from_errno (EFAULT) == G_FILE_ERROR_FAULT);
+ g_assert (g_file_error_from_errno (ELOOP) == G_FILE_ERROR_LOOP);
+ g_assert (g_file_error_from_errno (ENOSPC) == G_FILE_ERROR_NOSPC);
+--
+1.7.10
+
diff --git a/0002-Only-build-gmenumodel-test-on-unix.patch
b/0002-Only-build-gmenumodel-test-on-unix.patch
new file mode 100644
index 0000000..52652e5
--- /dev/null
+++ b/0002-Only-build-gmenumodel-test-on-unix.patch
@@ -0,0 +1,33 @@
+From 381c37bc46af842b8c3d9a66264ac34e0bbf6ccb Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember(a)gmail.com>
+Date: Sat, 14 Apr 2012 15:48:13 +0300
+Subject: [PATCH 2/2] Only build gmenumodel test on unix
+
+It depends on gdbus-sessionbus.c which only builds on unix.
+---
+ gio/tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 0d45e71..6e577c8 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -58,7 +58,6 @@ TEST_PROGS += \
+ vfs \
+ network-monitor \
+ fileattributematcher \
+- gmenumodel \
+ resources \
+ $(NULL)
+
+@@ -82,6 +81,7 @@ TEST_PROGS += \
+ gdbus-exit-on-close \
+ gdbus-non-socket \
+ gdbus-bz627724 \
++ gmenumodel \
+ appinfo \
+ contenttype \
+ mimeapps \
+--
+1.7.10
+
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 4f7430b..1922314 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -1,8 +1,8 @@
%?mingw_package_header
Name: mingw-glib2
-Version: 2.32.0
-Release: 2%{?dist}
+Version: 2.32.1
+Release: 1%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@@ -11,8 +11,8 @@ URL: http://www.gtk.org
# first two digits of version
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Source0:
http://download.gnome.org/sources/glib/%{release_version}/glib-%{version}...
-# Already upstreamed
-Patch0: 0001-configure-Fix-alignment-tests-when-cross-compiling.patch
+Patch0: 0001-tests-fileutils-Fix-Windows-build.patch
+Patch1: 0002-Only-build-gmenumodel-test-on-unix.patch
BuildArch: noarch
@@ -79,7 +79,8 @@ Static version of the MinGW Windows GLib2 library.
%prep
%setup -q -n glib-%{version}
-%patch0 -p1 -b .alignof
+%patch0 -p1 -b .ETXTBSY
+%patch1 -p1 -b .gmenumodel
autoreconf -i --force
@@ -259,6 +260,11 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Sat Apr 14 2012 Kalev Lember <kalevlember(a)gmail.com> - 2.32.1-1
+- Update to 2.32.1
+- Dropped an upstreamed patch
+- Added two new patches to fix build
+
* Wed Mar 28 2012 Kalev Lember <kalevlember(a)gmail.com> - 2.32.0-2
- Add a patch to fix alignment tests when cross compiling
diff --git a/sources b/sources
index 34e042a..417e466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5fa76fbf9184d20dfb04af66b598190 glib-2.32.0.tar.xz
+032c7cf9868c9aa186b490b155a41144 glib-2.32.1.tar.xz