Update to 2.32.1
- Dropped an upstreamed patch - Added two new patches to fix build
This commit is contained in:
Kalev Lember
parent
2bc7b7c718
commit
cc7ce06edd
@ -1,35 +0,0 @@
|
||||
From 8f8fc836709cff58bd666b87937542088cfc19db Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <kalevlember@gmail.com>
|
||||
Date: Wed, 28 Mar 2012 12:42:49 +0300
|
||||
Subject: [PATCH] configure: Fix alignment tests when cross compiling
|
||||
|
||||
When inserting custom code to AC_CHECK_ALIGNOF, make sure to not replace
|
||||
the default includes, but instead append to them.
|
||||
|
||||
This fixes ALIGNOF_GUINT32 and ALIGNOF_GUINT64 that were both 0 when cross
|
||||
compiling. The third 'unsigned long' test wasn't affected because the
|
||||
AC_CHECK_ALIGNOF call didn't specify the optional 2nd parameter.
|
||||
---
|
||||
configure.ac | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0d30b3e..82d74c6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3405,8 +3405,10 @@ $ac_cv_sizeof___int64)
|
||||
;;
|
||||
esac
|
||||
|
||||
-AC_CHECK_ALIGNOF([guint32], [typedef unsigned $gint32 guint32;])
|
||||
-AC_CHECK_ALIGNOF([guint64], typedef unsigned $gint64 guint64;)
|
||||
+AC_CHECK_ALIGNOF([guint32], [AC_INCLUDES_DEFAULT
|
||||
+typedef unsigned $gint32 guint32;])
|
||||
+AC_CHECK_ALIGNOF([guint64], [AC_INCLUDES_DEFAULT
|
||||
+typedef unsigned $gint64 guint64;])
|
||||
AC_CHECK_ALIGNOF([unsigned long])
|
||||
|
||||
# Check for libdbus1 - Optional - is only used in the GDBus test cases
|
||||
--
|
||||
1.7.9.3
|
||||
|
||||
26
0001-tests-fileutils-Fix-Windows-build.patch
Normal file
26
0001-tests-fileutils-Fix-Windows-build.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 8386c6e3f913248eb6944ba4351ad1592cb74dba Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <kalevlember@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
|
||||
|
||||
33
0002-Only-build-gmenumodel-test-on-unix.patch
Normal file
33
0002-Only-build-gmenumodel-test-on-unix.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 381c37bc46af842b8c3d9a66264ac34e0bbf6ccb Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <kalevlember@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
|
||||
|
||||
@ -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}.tar.xz
|
||||
# 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@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@gmail.com> - 2.32.0-2
|
||||
- Add a patch to fix alignment tests when cross compiling
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user