Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=fea0295a151204748c84efa32ccb9e596b3af515
commit fea0295a151204748c84efa32ccb9e596b3af515 Author: Devil505 <[email protected]> Date: Wed Jul 13 22:23:32 2011 +0200 glib2-2.29.10-2-i686 * version bump * updating patch: 71_gio_launch_handler.patch * pkgrel++ (bo conflict with gnometesting) diff --git a/source/base/glib2/71_gio_launch_handler.patch b/source/base/glib2/71_gio_launch_handler.patch index 607ae93..41167b1 100644 --- a/source/base/glib2/71_gio_launch_handler.patch +++ b/source/base/glib2/71_gio_launch_handler.patch @@ -13,11 +13,11 @@ the launch context, and the pid. gio/giomodule.c | 3 + 4 files changed, 157 insertions(+), 1 deletions(-) -Index: glib-2.27.90/gio/gdesktopappinfo.c +Index: glib2.0-2.29.10/gio/gdesktopappinfo.c =================================================================== ---- glib-2.27.90.orig/gio/gdesktopappinfo.c 2011-01-06 16:36:16.806667001 +1100 -+++ glib-2.27.90/gio/gdesktopappinfo.c 2011-01-06 16:57:33.176667000 +1100 -@@ -74,6 +74,12 @@ +--- glib2.0-2.29.10.orig/gio/gdesktopappinfo.c 2011-06-14 13:16:05.000000000 +0200 ++++ glib2.0-2.29.10/gio/gdesktopappinfo.c 2011-07-07 11:25:31.449351637 +0200 +@@ -80,6 +80,12 @@ static void mime_info_cache_reload (const char *dir); static gboolean g_desktop_app_info_ensure_saved (GDesktopAppInfo *info, GError **error); @@ -30,7 +30,7 @@ Index: glib-2.27.90/gio/gdesktopappinfo.c /** * GDesktopAppInfo: -@@ -973,6 +979,49 @@ +@@ -1131,6 +1137,49 @@ g_object_unref (msg); } @@ -80,7 +80,7 @@ Index: glib-2.27.90/gio/gdesktopappinfo.c #define _SPAWN_FLAGS_DEFAULT (G_SPAWN_SEARCH_PATH) static gboolean -@@ -1064,6 +1113,10 @@ +@@ -1222,6 +1271,10 @@ goto out; } @@ -91,7 +91,7 @@ Index: glib-2.27.90/gio/gdesktopappinfo.c if (pid_callback != NULL) pid_callback (info, pid, pid_callback_data); -@@ -3086,6 +3139,72 @@ +@@ -3265,6 +3318,72 @@ return desktop_entries; } @@ -164,11 +164,11 @@ Index: glib-2.27.90/gio/gdesktopappinfo.c /* GDesktopAppInfoLookup interface: */ typedef GDesktopAppInfoLookupIface GDesktopAppInfoLookupInterface; -Index: glib-2.27.90/gio/gdesktopappinfo.h +Index: glib2.0-2.29.10/gio/gdesktopappinfo.h =================================================================== ---- glib-2.27.90.orig/gio/gdesktopappinfo.h 2011-01-06 16:36:16.786667001 +1100 -+++ glib-2.27.90/gio/gdesktopappinfo.h 2011-01-06 16:46:46.426667000 +1100 -@@ -119,6 +119,37 @@ +--- glib2.0-2.29.10.orig/gio/gdesktopappinfo.h 2011-06-14 13:16:05.000000000 +0200 ++++ glib2.0-2.29.10/gio/gdesktopappinfo.h 2011-07-07 11:25:31.449351637 +0200 +@@ -123,6 +123,37 @@ #endif /* G_DISABLE_DEPRECATED */ @@ -206,22 +206,22 @@ Index: glib-2.27.90/gio/gdesktopappinfo.h G_END_DECLS #endif /* __G_DESKTOP_APP_INFO_H__ */ -Index: glib-2.27.90/gio/gio.symbols +Index: glib2.0-2.29.10/gio/gio.symbols =================================================================== ---- glib-2.27.90.orig/gio/gio.symbols 2011-01-06 16:36:16.786667001 +1100 -+++ glib-2.27.90/gio/gio.symbols 2011-01-06 16:46:46.426667000 +1100 -@@ -133,6 +133,7 @@ - g_desktop_app_info_get_filename +--- glib2.0-2.29.10.orig/gio/gio.symbols 2011-06-29 20:35:03.000000000 +0200 ++++ glib2.0-2.29.10/gio/gio.symbols 2011-07-07 11:25:31.497351637 +0200 +@@ -99,6 +99,7 @@ g_desktop_app_info_get_is_hidden - g_desktop_app_info_get_type G_GNUC_CONST + g_desktop_app_info_get_nodisplay + g_desktop_app_info_get_type +g_desktop_app_info_launch_handler_on_launched g_desktop_app_info_launch_uris_as_manager - g_desktop_app_info_lookup_get_type G_GNUC_CONST + g_desktop_app_info_lookup_get_type g_desktop_app_info_lookup_get_default_for_uri_scheme -Index: glib-2.27.90/gio/giomodule.c +Index: glib2.0-2.29.10/gio/giomodule.c =================================================================== ---- glib-2.27.90.orig/gio/giomodule.c 2011-01-06 16:36:16.796667001 +1100 -+++ glib-2.27.90/gio/giomodule.c 2011-01-06 16:46:46.426667000 +1100 +--- glib2.0-2.29.10.orig/gio/giomodule.c 2011-01-05 22:44:06.000000000 +0100 ++++ glib2.0-2.29.10/gio/giomodule.c 2011-07-07 11:25:31.525351637 +0200 @@ -559,6 +559,9 @@ ep = g_io_extension_point_register (G_PROXY_EXTENSION_POINT_NAME); g_io_extension_point_set_required_type (ep, G_TYPE_PROXY); diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index ed0bd78..4505058 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -4,11 +4,11 @@ USE_DOC=${USE_DOC:-"y"} pkgname=glib2 -pkgver=2.28.8 -pkgrel=1 +pkgver=2.29.10 +pkgrel=2 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/"; -depends=('glibc>=2.9-2') +depends=('glibc>=2.9-2' 'libffi') makedepends=('libgcrypt>=1.4.3-1') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc' 'arm') @@ -21,10 +21,10 @@ source=($source \ glib2.sh \ glib2.csh \ 71_gio_launch_handler.patch) -sha1sums=('20cd63705a8805260da0320c65b979233f2e3c18' \ +sha1sums=('5260de6d68c05b8eb641a22068549eddac429460' \ 'bfe05590a6498259f1045a591fd886a8572f271a' \ '6db09da816d69aab7a5cbf3460ee082bef200891' \ - '794b92b0088043adcf67e8bf3c34b0bddc59eb13') + '364ac499a3a80f34e0bfae422f1fe0c7c9806872') if Fuse $USE_DOC; then makedepends=("${makedepends[@]}" 'gtk-doc>=1.11') Fconfopts="$Fconfopts --enable-gtk-doc" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
