# HG changeset patch # User Michael Schloh von Bennewitz # Date 1343999803 -7200 # Node ID e99334bd789c4a876d7ad40e2dca2e7855ffb215 # Parent 5ee40987cb020079b45440869ea9fec60397071a Resynchronize with upstream package maintainer version. diff -r 5ee40987cb02 -r e99334bd789c glib/glib.patch --- a/glib/glib.patch Fri Aug 03 15:15:17 2012 +0200 +++ b/glib/glib.patch Fri Aug 03 15:16:43 2012 +0200 @@ -1,29 +1,128 @@ +Index: Makefile.in +--- Makefile.in.orig 2012-05-15 00:09:32.000000000 +0200 ++++ Makefile.in 2012-07-13 20:35:15.000000000 +0200 +@@ -426,7 +426,7 @@ + gio-windows-2.0.pc.in + TEST_PROGS = + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} +-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po + DIST_SUBDIRS = $(SUBDIRS) build + bin_SCRIPTS = glib-gettextize + AM_CPPFLAGS = \ Index: configure ---- configure.orig 2010-03-16 03:52:21.000000000 +0100 -+++ configure 2010-03-17 20:07:17.000000000 +0100 -@@ -25810,7 +25810,7 @@ - add_thread_lib="-l$thread_lib" - IN=" in -l$thread_lib" - fi -- LIBS="$add_thread_lib $glib_save_LIBS" -+ LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" +--- configure.orig 2012-05-15 00:09:26.000000000 +0200 ++++ configure 2012-07-13 20:35:26.000000000 +0200 +@@ -21276,12 +21276,6 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5 - $as_echo_n "checking for sched_get_priority_min$IN... " >&6; } -Index: glib-2.0.pc.in ---- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200 -+++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100 -@@ -9,6 +9,7 @@ - Name: GLib - Description: C Utility Library -+Requires: libpcre - Version: @VERSION@ - Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ - Libs.private: @ICONV_LIBS@ + +-if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -Wall" ;; +- esac +-fi + + if test "$glib_native_win32" = "yes"; then + if test x$enable_static = xyes -a x$enable_shared = xyes; then +Index: gio/Makefile.in +--- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200 ++++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200 +@@ -482,7 +482,7 @@ + CTAGS = ctags + am__tty_colors = \ + red=; grn=; lgn=; blu=; std= +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests ++DIST_SUBDIRS = xdgmime inotify fen win32 . fam + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + am__relativize = \ + dir0=`pwd`; \ +@@ -760,8 +760,8 @@ + gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA) + TEST_PROGS = + NULL = +-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \ +- $(am__append_8) $(am__append_11) . $(am__append_14) tests ++SUBDIRS = $(am__append_1) $(am__append_4) \ ++ $(am__append_8) $(am__append_11) . $(am__append_14) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib +Index: gio/glib-compile-schemas.c +--- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200 ++++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200 +@@ -1530,7 +1530,7 @@ + } + /* Text {{{2 */ + static void +-text (GMarkupParseContext *context, ++XXXtext (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, +@@ -1695,7 +1695,7 @@ + parse_gschema_files (gchar **files, + gboolean strict) + { +- GMarkupParser parser = { start_element, end_element, text }; ++ GMarkupParser parser = { start_element, end_element, XXXtext }; + ParseState state = { 0, }; + const gchar *filename; + GError *error = NULL; +Index: gio/tests/gdbus-peer.c +--- gio/tests/gdbus-peer.c.orig 2012-05-14 23:58:01.000000000 +0200 ++++ gio/tests/gdbus-peer.c 2012-07-13 20:35:15.000000000 +0200 +@@ -39,6 +39,8 @@ + #include + #include + ++#include ++ + /* used in test_overflow */ + #ifdef G_OS_UNIX + #include +Index: gio/xdgmime/xdgmimecache.h +--- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200 ++++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200 +@@ -46,6 +46,9 @@ + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) + #endif + + extern XdgMimeCache **_caches; +Index: glib/gatomic.c +--- glib/gatomic.c.orig 2012-03-12 01:42:41.000000000 +0100 ++++ glib/gatomic.c 2012-07-13 20:35:15.000000000 +0200 +@@ -21,6 +21,7 @@ + + #include "config.h" + ++#include "gthread.h" + #include "gatomic.h" + + /** +Index: glib/gregex.c +--- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200 ++++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200 +@@ -228,8 +228,10 @@ + case PCRE_ERROR_DFA_RECURSE: + case PCRE_ERROR_RECURSIONLIMIT: + return _("recursion limit reached"); ++#ifdef PCRE_ERROR_NULLWSLIMIT + case PCRE_ERROR_NULLWSLIMIT: + return _("workspace limit for empty substrings reached"); ++#endif + case PCRE_ERROR_BADNEWLINE: + return _("invalid combination of newline flags"); + case PCRE_ERROR_BADOFFSET: Index: gmodule/gmodule-dl.c ---- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200 -+++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100 +--- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200 ++++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200 @@ -107,6 +107,7 @@ static gpointer _g_module_self (void) @@ -42,33 +141,3 @@ } static void -Index: tests/errorcheck-mutex-test.c ---- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200 -+++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100 -@@ -1,3 +1,5 @@ -+#ifdef G_THREADS_ENABLED -+ - #undef G_DISABLE_ASSERT - #undef G_LOG_DOMAIN - #define G_ERRORCHECK_MUTEXES -@@ -102,9 +104,12 @@ - timed_wait_on_otherwise_locked_mutex} - }; - -+#endif -+ - int - main (int argc, char* argv[]) - { -+#ifdef G_THREADS_ENABLED - int i; - - if (argc == 2) -@@ -126,6 +131,7 @@ - { - fprintf (stderr, " %s\n", func_table[i].name); - } -+#endif - - return 0; - } diff -r 5ee40987cb02 -r e99334bd789c glib/glib.spec --- a/glib/glib.spec Fri Aug 03 15:15:17 2012 +0200 +++ b/glib/glib.spec Fri Aug 03 15:16:43 2012 +0200 @@ -1,6 +1,6 @@ ## -## glib2.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2010 OpenPKG Foundation e.V. +## glib.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -22,11 +22,11 @@ ## # package version -%define V_glib2_major 2.25 -%define V_glib2_minor 13 +%define V_major 2.32 +%define V_minor 3 # package information -Name: glib2 +Name: glib Summary: The Gtk Utility Library URL: http://www.gtk.org/ Vendor: The Gtk Project @@ -35,23 +35,21 @@ Class: BASE Group: Algorithm License: GPL -Version: %{V_glib2_major}.%{V_glib2_minor} -Release: 20101020 +Version: %{V_major}.%{V_minor} +Release: 20120713 # package options %option with_threads yes # list of sources -Source0: ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/glib-%{version}.tar.gz -Patch0: glib2.patch +Source0: http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/glib-%{version}.tar.xz +Patch0: glib.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20100101, perl, make, pkgconfig -PreReq: OpenPKG, openpkg >= 20100101, perl -BuildPreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes -PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes +BuildPreReq: OpenPKG, openpkg >= 20120101, perl, make +PreReq: OpenPKG, openpkg >= 20120101, perl +BuildPreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi +PreReq: gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi %description GLib is the low-level core library that originally was split out @@ -60,9 +58,9 @@ loop, threads, dynamic loading, and an object system. %track - prog glib2 = { + prog glib = { version = %{version} - url = ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/ + url = http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/ regex = glib-(__VER__)\.tar\.(gz|bz2) } @@ -83,29 +81,29 @@ -e 's;/gmodule-2\.0\.pc;/gmodule-x.x.pc;g' \ -e 's;/gio-unix-2\.0\.pc;/gio-unix-x.x.pc;g' \ -e 's;/gio-2\.0\.pc;/gio-x.x.pc;g' \ - -e 's;/glib-2\.0;/glib2;g' \ - -e 's;/gobject-2\.0;/gobject2;g' \ - -e 's;/gthread-2\.0;/gthread2;g' \ - -e 's;/gmodule-2\.0;/gmodule2;g' \ - -e 's;/gio-unix-2\.0;/gio-unix2;g' \ - -e 's;/gio-2\.0;/gio2;g' \ + -e 's;/glib-2\.0;/glib;g' \ + -e 's;/gobject-2\.0;/gobject;g' \ + -e 's;/gthread-2\.0;/gthread;g' \ + -e 's;/gmodule-2\.0;/gmodule;g' \ + -e 's;/gio-unix-2\.0;/gio-unix;g' \ + -e 's;/gio-2\.0;/gio;g' \ -e 's;/glib-x\.x\.pc;/glib-2.0.pc;g' \ -e 's;/gobject-x\.x\.pc;/gobject-2.0.pc;g' \ -e 's;/gthread-x\.x\.pc;/gthread-2.0.pc;g' \ -e 's;/gmodule-x\.x\.pc;/gmodule-2.0.pc;g' \ -e 's;/gio-unix-x\.x\.pc;/gio-unix-2.0.pc;g' \ -e 's;/gio-x\.x\.pc;/gio-2.0.pc;g' \ - -e 's;lib\(g[a-z]*\)-2\.0;lib\12;g' \ + -e 's;lib\(g[a-z]*\)-2\.0;lib\1;g' \ `find . -name Makefile.in -print` \ m4macros/glib-2.0.m4 %{l_shtool} subst \ - -e 's;/glib-2\.0;/glib2;g' \ - -e 's;/gobject-2\.0;/gobject2;g' \ - -e 's;/gthread-2\.0;/gthread2;g' \ - -e 's;/gmodule-2\.0;/gmodule2;g' \ - -e 's;/gio-unix-2\.0;/gio-unix2;g' \ - -e 's;/gio-2\.0;/gio2;g' \ - -e 's;-l\(g[a-z]*\)-2\.0;-l\12;g' \ + -e 's;/glib-2\.0;/glib;g' \ + -e 's;/gobject-2\.0;/gobject;g' \ + -e 's;/gthread-2\.0;/gthread;g' \ + -e 's;/gmodule-2\.0;/gmodule;g' \ + -e 's;/gio-unix-2\.0;/gio-unix;g' \ + -e 's;/gio-2\.0;/gio;g' \ + -e 's;-l\(g[a-z]*\)-2\.0;-l\1;g' \ *-2.0.pc.in libs="" %if "%{with_threads}" == "yes" @@ -118,6 +116,10 @@ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ LIBS="$libs" \ + LIBFFI_CFLAGS="%{l_cppflags}" \ + LIBFFI_LIBS="%{l_ldflags} -lffi" \ + PCRE_CFLAGS="%{l_cppflags pcre .}" \ + PCRE_LIBS="%{l_ldflags} -lpcre" \ PERL="%{l_prefix}/bin/perl" \ PERL_PATH="%{l_prefix}/bin/perl" \ GREP="grep" \ @@ -125,25 +127,22 @@ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --with-libiconv=gnu \ - --disable-debug \ - --disable-shared \ --with-pcre=system \ %if "%{with_threads}" == "yes" - --enable-threads \ -%else - --disable-threads \ + --with-threads=posix \ %endif --disable-gtk-doc \ - --disable-dtrace + --disable-dtrace \ + --disable-fam \ + --disable-debug \ + --disable-shared # build package %{l_make} %{l_mflags} %install - rm -rf $RPM_BUILD_ROOT - # install package - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" # strip down installation rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir @@ -161,5 +160,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT