changeset
Resynchronize with upstream package maintainer version.
Fri, 03 Aug 2012 15:16:43 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 03 Aug 2012 15:16:43 +0200
- changeset 454
- e99334bd789c
- parent 453
- 5ee40987cb02
- child 455
- eb5f1f7ac5ff
Resynchronize with upstream package maintainer version.
| glib/glib.patch | file | annotate | diff | comparison | revisions | |
| glib/glib.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/glib/glib.patch Fri Aug 03 15:15:17 2012 +0200 1.2 +++ b/glib/glib.patch Fri Aug 03 15:16:43 2012 +0200 1.3 @@ -1,29 +1,128 @@ 1.4 +Index: Makefile.in 1.5 +--- Makefile.in.orig 2012-05-15 00:09:32.000000000 +0200 1.6 ++++ Makefile.in 2012-07-13 20:35:15.000000000 +0200 1.7 +@@ -426,7 +426,7 @@ 1.8 + gio-windows-2.0.pc.in 1.9 + TEST_PROGS = 1.10 + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} 1.11 +-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs 1.12 ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po 1.13 + DIST_SUBDIRS = $(SUBDIRS) build 1.14 + bin_SCRIPTS = glib-gettextize 1.15 + AM_CPPFLAGS = \ 1.16 Index: configure 1.17 ---- configure.orig 2010-03-16 03:52:21.000000000 +0100 1.18 -+++ configure 2010-03-17 20:07:17.000000000 +0100 1.19 -@@ -25810,7 +25810,7 @@ 1.20 - add_thread_lib="-l$thread_lib" 1.21 - IN=" in -l$thread_lib" 1.22 - fi 1.23 -- LIBS="$add_thread_lib $glib_save_LIBS" 1.24 -+ LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" 1.25 +--- configure.orig 2012-05-15 00:09:26.000000000 +0200 1.26 ++++ configure 2012-07-13 20:35:26.000000000 +0200 1.27 +@@ -21276,12 +21276,6 @@ 1.28 1.29 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5 1.30 - $as_echo_n "checking for sched_get_priority_min$IN... " >&6; } 1.31 -Index: glib-2.0.pc.in 1.32 ---- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200 1.33 -+++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100 1.34 -@@ -9,6 +9,7 @@ 1.35 1.36 - Name: GLib 1.37 - Description: C Utility Library 1.38 -+Requires: libpcre 1.39 - Version: @VERSION@ 1.40 - Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ 1.41 - Libs.private: @ICONV_LIBS@ 1.42 + 1.43 +-if test "x$GCC" = "xyes"; then 1.44 +- case " $CFLAGS " in 1.45 +- *[\ \ ]-Wall[\ \ ]*) ;; 1.46 +- *) CFLAGS="$CFLAGS -Wall" ;; 1.47 +- esac 1.48 +-fi 1.49 + 1.50 + if test "$glib_native_win32" = "yes"; then 1.51 + if test x$enable_static = xyes -a x$enable_shared = xyes; then 1.52 +Index: gio/Makefile.in 1.53 +--- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200 1.54 ++++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200 1.55 +@@ -482,7 +482,7 @@ 1.56 + CTAGS = ctags 1.57 + am__tty_colors = \ 1.58 + red=; grn=; lgn=; blu=; std= 1.59 +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests 1.60 ++DIST_SUBDIRS = xdgmime inotify fen win32 . fam 1.61 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 1.62 + am__relativize = \ 1.63 + dir0=`pwd`; \ 1.64 +@@ -760,8 +760,8 @@ 1.65 + gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA) 1.66 + TEST_PROGS = 1.67 + NULL = 1.68 +-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \ 1.69 +- $(am__append_8) $(am__append_11) . $(am__append_14) tests 1.70 ++SUBDIRS = $(am__append_1) $(am__append_4) \ 1.71 ++ $(am__append_8) $(am__append_11) . $(am__append_14) 1.72 + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib 1.73 + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) 1.74 + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib 1.75 +Index: gio/glib-compile-schemas.c 1.76 +--- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200 1.77 ++++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200 1.78 +@@ -1530,7 +1530,7 @@ 1.79 + } 1.80 + /* Text {{{2 */ 1.81 + static void 1.82 +-text (GMarkupParseContext *context, 1.83 ++XXXtext (GMarkupParseContext *context, 1.84 + const gchar *text, 1.85 + gsize text_len, 1.86 + gpointer user_data, 1.87 +@@ -1695,7 +1695,7 @@ 1.88 + parse_gschema_files (gchar **files, 1.89 + gboolean strict) 1.90 + { 1.91 +- GMarkupParser parser = { start_element, end_element, text }; 1.92 ++ GMarkupParser parser = { start_element, end_element, XXXtext }; 1.93 + ParseState state = { 0, }; 1.94 + const gchar *filename; 1.95 + GError *error = NULL; 1.96 +Index: gio/tests/gdbus-peer.c 1.97 +--- gio/tests/gdbus-peer.c.orig 2012-05-14 23:58:01.000000000 +0200 1.98 ++++ gio/tests/gdbus-peer.c 2012-07-13 20:35:15.000000000 +0200 1.99 +@@ -39,6 +39,8 @@ 1.100 + #include <gio/gunixsocketaddress.h> 1.101 + #include <gio/gunixfdlist.h> 1.102 + 1.103 ++#include <sys/socket.h> 1.104 ++ 1.105 + /* used in test_overflow */ 1.106 + #ifdef G_OS_UNIX 1.107 + #include <gio/gunixconnection.h> 1.108 +Index: gio/xdgmime/xdgmimecache.h 1.109 +--- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200 1.110 ++++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200 1.111 +@@ -46,6 +46,9 @@ 1.112 + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) 1.113 + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) 1.114 + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) 1.115 ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) 1.116 ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) 1.117 ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) 1.118 + #endif 1.119 + 1.120 + extern XdgMimeCache **_caches; 1.121 +Index: glib/gatomic.c 1.122 +--- glib/gatomic.c.orig 2012-03-12 01:42:41.000000000 +0100 1.123 ++++ glib/gatomic.c 2012-07-13 20:35:15.000000000 +0200 1.124 +@@ -21,6 +21,7 @@ 1.125 + 1.126 + #include "config.h" 1.127 + 1.128 ++#include "gthread.h" 1.129 + #include "gatomic.h" 1.130 + 1.131 + /** 1.132 +Index: glib/gregex.c 1.133 +--- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200 1.134 ++++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200 1.135 +@@ -228,8 +228,10 @@ 1.136 + case PCRE_ERROR_DFA_RECURSE: 1.137 + case PCRE_ERROR_RECURSIONLIMIT: 1.138 + return _("recursion limit reached"); 1.139 ++#ifdef PCRE_ERROR_NULLWSLIMIT 1.140 + case PCRE_ERROR_NULLWSLIMIT: 1.141 + return _("workspace limit for empty substrings reached"); 1.142 ++#endif 1.143 + case PCRE_ERROR_BADNEWLINE: 1.144 + return _("invalid combination of newline flags"); 1.145 + case PCRE_ERROR_BADOFFSET: 1.146 Index: gmodule/gmodule-dl.c 1.147 ---- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200 1.148 -+++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100 1.149 +--- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200 1.150 ++++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200 1.151 @@ -107,6 +107,7 @@ 1.152 static gpointer 1.153 _g_module_self (void) 1.154 @@ -42,33 +141,3 @@ 1.155 } 1.156 1.157 static void 1.158 -Index: tests/errorcheck-mutex-test.c 1.159 ---- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200 1.160 -+++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100 1.161 -@@ -1,3 +1,5 @@ 1.162 -+#ifdef G_THREADS_ENABLED 1.163 -+ 1.164 - #undef G_DISABLE_ASSERT 1.165 - #undef G_LOG_DOMAIN 1.166 - #define G_ERRORCHECK_MUTEXES 1.167 -@@ -102,9 +104,12 @@ 1.168 - timed_wait_on_otherwise_locked_mutex} 1.169 - }; 1.170 - 1.171 -+#endif 1.172 -+ 1.173 - int 1.174 - main (int argc, char* argv[]) 1.175 - { 1.176 -+#ifdef G_THREADS_ENABLED 1.177 - int i; 1.178 - 1.179 - if (argc == 2) 1.180 -@@ -126,6 +131,7 @@ 1.181 - { 1.182 - fprintf (stderr, " %s\n", func_table[i].name); 1.183 - } 1.184 -+#endif 1.185 - 1.186 - return 0; 1.187 - }
2.1 --- a/glib/glib.spec Fri Aug 03 15:15:17 2012 +0200 2.2 +++ b/glib/glib.spec Fri Aug 03 15:16:43 2012 +0200 2.3 @@ -1,6 +1,6 @@ 2.4 ## 2.5 -## glib2.spec -- OpenPKG RPM Package Specification 2.6 -## Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## glib.spec -- OpenPKG RPM Package Specification 2.8 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 2.9 ## 2.10 ## Permission to use, copy, modify, and distribute this software for 2.11 ## any purpose with or without fee is hereby granted, provided that 2.12 @@ -22,11 +22,11 @@ 2.13 ## 2.14 2.15 # package version 2.16 -%define V_glib2_major 2.25 2.17 -%define V_glib2_minor 13 2.18 +%define V_major 2.32 2.19 +%define V_minor 3 2.20 2.21 # package information 2.22 -Name: glib2 2.23 +Name: glib 2.24 Summary: The Gtk Utility Library 2.25 URL: http://www.gtk.org/ 2.26 Vendor: The Gtk Project 2.27 @@ -35,23 +35,21 @@ 2.28 Class: BASE 2.29 Group: Algorithm 2.30 License: GPL 2.31 -Version: %{V_glib2_major}.%{V_glib2_minor} 2.32 -Release: 20101020 2.33 +Version: %{V_major}.%{V_minor} 2.34 +Release: 20120713 2.35 2.36 # package options 2.37 %option with_threads yes 2.38 2.39 # list of sources 2.40 -Source0: ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/glib-%{version}.tar.gz 2.41 -Patch0: glib2.patch 2.42 +Source0: http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/glib-%{version}.tar.xz 2.43 +Patch0: glib.patch 2.44 2.45 # build information 2.46 -Prefix: %{l_prefix} 2.47 -BuildRoot: %{l_buildroot} 2.48 -BuildPreReq: OpenPKG, openpkg >= 20100101, perl, make, pkgconfig 2.49 -PreReq: OpenPKG, openpkg >= 20100101, perl 2.50 -BuildPreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes 2.51 -PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes 2.52 +BuildPreReq: OpenPKG, openpkg >= 20120101, perl, make 2.53 +PreReq: OpenPKG, openpkg >= 20120101, perl 2.54 +BuildPreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi 2.55 +PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi 2.56 2.57 %description 2.58 GLib is the low-level core library that originally was split out 2.59 @@ -60,9 +58,9 @@ 2.60 loop, threads, dynamic loading, and an object system. 2.61 2.62 %track 2.63 - prog glib2 = { 2.64 + prog glib = { 2.65 version = %{version} 2.66 - url = ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/ 2.67 + url = http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/ 2.68 regex = glib-(__VER__)\.tar\.(gz|bz2) 2.69 } 2.70 2.71 @@ -83,29 +81,29 @@ 2.72 -e 's;/gmodule-2\.0\.pc;/gmodule-x.x.pc;g' \ 2.73 -e 's;/gio-unix-2\.0\.pc;/gio-unix-x.x.pc;g' \ 2.74 -e 's;/gio-2\.0\.pc;/gio-x.x.pc;g' \ 2.75 - -e 's;/glib-2\.0;/glib2;g' \ 2.76 - -e 's;/gobject-2\.0;/gobject2;g' \ 2.77 - -e 's;/gthread-2\.0;/gthread2;g' \ 2.78 - -e 's;/gmodule-2\.0;/gmodule2;g' \ 2.79 - -e 's;/gio-unix-2\.0;/gio-unix2;g' \ 2.80 - -e 's;/gio-2\.0;/gio2;g' \ 2.81 + -e 's;/glib-2\.0;/glib;g' \ 2.82 + -e 's;/gobject-2\.0;/gobject;g' \ 2.83 + -e 's;/gthread-2\.0;/gthread;g' \ 2.84 + -e 's;/gmodule-2\.0;/gmodule;g' \ 2.85 + -e 's;/gio-unix-2\.0;/gio-unix;g' \ 2.86 + -e 's;/gio-2\.0;/gio;g' \ 2.87 -e 's;/glib-x\.x\.pc;/glib-2.0.pc;g' \ 2.88 -e 's;/gobject-x\.x\.pc;/gobject-2.0.pc;g' \ 2.89 -e 's;/gthread-x\.x\.pc;/gthread-2.0.pc;g' \ 2.90 -e 's;/gmodule-x\.x\.pc;/gmodule-2.0.pc;g' \ 2.91 -e 's;/gio-unix-x\.x\.pc;/gio-unix-2.0.pc;g' \ 2.92 -e 's;/gio-x\.x\.pc;/gio-2.0.pc;g' \ 2.93 - -e 's;lib\(g[a-z]*\)-2\.0;lib\12;g' \ 2.94 + -e 's;lib\(g[a-z]*\)-2\.0;lib\1;g' \ 2.95 `find . -name Makefile.in -print` \ 2.96 m4macros/glib-2.0.m4 2.97 %{l_shtool} subst \ 2.98 - -e 's;/glib-2\.0;/glib2;g' \ 2.99 - -e 's;/gobject-2\.0;/gobject2;g' \ 2.100 - -e 's;/gthread-2\.0;/gthread2;g' \ 2.101 - -e 's;/gmodule-2\.0;/gmodule2;g' \ 2.102 - -e 's;/gio-unix-2\.0;/gio-unix2;g' \ 2.103 - -e 's;/gio-2\.0;/gio2;g' \ 2.104 - -e 's;-l\(g[a-z]*\)-2\.0;-l\12;g' \ 2.105 + -e 's;/glib-2\.0;/glib;g' \ 2.106 + -e 's;/gobject-2\.0;/gobject;g' \ 2.107 + -e 's;/gthread-2\.0;/gthread;g' \ 2.108 + -e 's;/gmodule-2\.0;/gmodule;g' \ 2.109 + -e 's;/gio-unix-2\.0;/gio-unix;g' \ 2.110 + -e 's;/gio-2\.0;/gio;g' \ 2.111 + -e 's;-l\(g[a-z]*\)-2\.0;-l\1;g' \ 2.112 *-2.0.pc.in 2.113 libs="" 2.114 %if "%{with_threads}" == "yes" 2.115 @@ -118,6 +116,10 @@ 2.116 CPPFLAGS="%{l_cppflags}" \ 2.117 LDFLAGS="%{l_ldflags}" \ 2.118 LIBS="$libs" \ 2.119 + LIBFFI_CFLAGS="%{l_cppflags}" \ 2.120 + LIBFFI_LIBS="%{l_ldflags} -lffi" \ 2.121 + PCRE_CFLAGS="%{l_cppflags pcre .}" \ 2.122 + PCRE_LIBS="%{l_ldflags} -lpcre" \ 2.123 PERL="%{l_prefix}/bin/perl" \ 2.124 PERL_PATH="%{l_prefix}/bin/perl" \ 2.125 GREP="grep" \ 2.126 @@ -125,25 +127,22 @@ 2.127 --prefix=%{l_prefix} \ 2.128 --mandir=%{l_prefix}/man \ 2.129 --with-libiconv=gnu \ 2.130 - --disable-debug \ 2.131 - --disable-shared \ 2.132 --with-pcre=system \ 2.133 %if "%{with_threads}" == "yes" 2.134 - --enable-threads \ 2.135 -%else 2.136 - --disable-threads \ 2.137 + --with-threads=posix \ 2.138 %endif 2.139 --disable-gtk-doc \ 2.140 - --disable-dtrace 2.141 + --disable-dtrace \ 2.142 + --disable-fam \ 2.143 + --disable-debug \ 2.144 + --disable-shared 2.145 2.146 # build package 2.147 %{l_make} %{l_mflags} 2.148 2.149 %install 2.150 - rm -rf $RPM_BUILD_ROOT 2.151 - 2.152 # install package 2.153 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.154 + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 2.155 2.156 # strip down installation 2.157 rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir 2.158 @@ -161,5 +160,4 @@ 2.159 %files -f files 2.160 2.161 %clean 2.162 - rm -rf $RPM_BUILD_ROOT 2.163
