commit eb8940d503c4028af374e0885427c00d7e143900
Author: Jakub Bogusz <[email protected]>
Date: Tue Jul 24 17:29:28 2012 +0200
- updated to 2.32.4
- added win32 patch (fixes build on win32 platform)
crossmingw32-glib2.spec | 11 ++++++-----
glib2-win32.patch | 11 +++++++++++
2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index ffd13a9..0454e7b 100644
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -12,14 +12,15 @@ Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı
Summary(zh_CN.UTF-8): 实用工具函数库
%define realname glib
Name: crossmingw32-glib2
-Version: 2.32.3
+Version: 2.32.4
Release: 1
License: LGPL v2+
Group: Development/Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-%{version}.tar.xz
-# Source0-md5: 9bd3ac535c24b6c162be13b2c43c5adc
+# Source0-md5: bf84fefd9c1a5b5a7a38736f4ddd674a
Patch0: %{name}-stacktest.patch
Patch1: glib2-cross.patch
+Patch2: glib2-win32.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.11
@@ -136,6 +137,7 @@ Biblioteki DLL glib2 dla Windows.
%setup -q -n %{realname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -171,9 +173,8 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll
$RPM_BUILD_ROOT%{_dlldir}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/charset.alias
# use system glib2-devel instead
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,gdb,glib-2.0,gtk-doc,man} \
- $RPM_BUILD_ROOT%{_libdir}/gdbus-2.0/codegen \
- $RPM_BUILD_ROOT/etc/bash_completion.d
+%{__rm} -r
$RPM_BUILD_ROOT%{_datadir}/{aclocal,bash-completion,gdb,glib-2.0,gtk-doc,man} \
+ $RPM_BUILD_ROOT%{_libdir}/gdbus-2.0/codegen
# runtime
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale
diff --git a/glib2-win32.patch b/glib2-win32.patch
new file mode 100644
index 0000000..734aa7f
--- /dev/null
+++ b/glib2-win32.patch
@@ -0,0 +1,11 @@
+--- glib-2.32.4/gio/gcontenttype.c.orig 2012-07-14 22:33:18.000000000
+0200
++++ glib-2.32.4/gio/gcontenttype.c 2012-07-24 16:48:52.400116342 +0200
+@@ -332,7 +332,7 @@
+
+ /* our test suite and potentially other code used -1 in the past, which is
+ * not documented and not allowed; guard against that */
+- g_return_val_if_fail (data_size != (gsize) -1, g_strdup
(XDG_MIME_TYPE_UNKNOWN));
++ g_return_val_if_fail (data_size != (gsize) -1, g_strdup ("*"));
+
+ if (filename)
+ {
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
