Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=92210c54c995ebbc9b5d9b6f8085d8db88028d5e
commit 92210c54c995ebbc9b5d9b6f8085d8db88028d5e
Author: Devil505 <devil505li...@gmail.com>
Date: Mon Feb 21 22:13:14 2011 +0100
glib2-2.28.1-1ayatana1-i686
* version bump
* special pkgrel to avoid conflict with gnometesting, bouleetbil ^^
* updating patch for gio
diff --git a/source/base/glib2/71_gio_launch_handler.patch
b/source/base/glib2/71_gio_launch_handler.patch
index ec3afdc..607ae93 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: glib2.0-2.25.16/gio/gdesktopappinfo.c
+Index: glib-2.27.90/gio/gdesktopappinfo.c
===================================================================
---- glib2.0-2.25.16.orig/gio/gdesktopappinfo.c 2010-08-09 15:34:46.000000000
+0200
-+++ glib2.0-2.25.16/gio/gdesktopappinfo.c 2010-09-27 14:03:33.000000000
+0200
-@@ -69,6 +69,12 @@
+--- 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 @@
static void mime_info_cache_reload (const char *dir);
static gboolean g_desktop_app_info_ensure_saved (GDesktopAppInfo *info,
GError **error);
@@ -30,8 +30,8 @@ Index: glib2.0-2.25.16/gio/gdesktopappinfo.c
/**
* GDesktopAppInfo:
-@@ -913,6 +919,49 @@
- }
+@@ -973,6 +979,49 @@
+ g_object_unref (msg);
}
+static void
@@ -77,26 +77,10 @@ Index: glib2.0-2.25.16/gio/gdesktopappinfo.c
+ app_info, uris, launch_ctx,
pid);
+}
+
- static gboolean
- g_desktop_app_info_launch_uris (GAppInfo *appinfo,
- GList *uris,
-@@ -965,13 +1014,14 @@
- g_list_free (launched_files);
- }
+ #define _SPAWN_FLAGS_DEFAULT (G_SPAWN_SEARCH_PATH)
-+ gint pid;
- if (!g_spawn_async (info->path,
- argv,
- NULL,
- G_SPAWN_SEARCH_PATH,
- child_setup,
- &data,
-- NULL,
-+ &pid,
- error))
- {
- if (data.sn_id)
-@@ -982,6 +1032,10 @@
+ static gboolean
+@@ -1064,6 +1113,10 @@
goto out;
}
@@ -105,13 +89,12 @@ Index: glib2.0-2.25.16/gio/gdesktopappinfo.c
+ g_desktop_app_info_on_launched (info, old_uris, launch_context, pid);
+ }
- g_free (data.sn_id);
- g_free (data.display);
-@@ -2715,3 +2769,70 @@
-
- return (* iface->get_default_for_uri_scheme) (lookup, uri_scheme);
+ if (pid_callback != NULL)
+ pid_callback (info, pid, pid_callback_data);
+@@ -3086,6 +3139,72 @@
+ return desktop_entries;
}
-+
+
+/* GDesktopAppInfoLaunchHandler interface: */
+
+static void g_desktop_app_info_launch_handler_base_init (gpointer g_class);
@@ -178,13 +161,16 @@ Index: glib2.0-2.25.16/gio/gdesktopappinfo.c
+ (* iface->on_launched) (launch_handler, app_info, uris, launch_ctx, pid);
+}
+
-Index: glib2.0-2.25.16/gio/gdesktopappinfo.h
+ /* GDesktopAppInfoLookup interface: */
+
+ typedef GDesktopAppInfoLookupIface GDesktopAppInfoLookupInterface;
+Index: glib-2.27.90/gio/gdesktopappinfo.h
===================================================================
---- glib2.0-2.25.16.orig/gio/gdesktopappinfo.h 2010-04-08 08:10:50.000000000
+0200
-+++ glib2.0-2.25.16/gio/gdesktopappinfo.h 2010-09-27 14:03:33.000000000
+0200
-@@ -91,6 +91,37 @@
- GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme
(GDesktopAppInfoLookup *lookup,
- const char
*uri_scheme);
+--- 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 @@
+
+ #endif /* G_DISABLE_DEPRECATED */
+
+
@@ -220,29 +206,29 @@ Index: glib2.0-2.25.16/gio/gdesktopappinfo.h
G_END_DECLS
#endif /* __G_DESKTOP_APP_INFO_H__ */
-Index: glib2.0-2.25.16/gio/gio.symbols
+Index: glib-2.27.90/gio/gio.symbols
===================================================================
---- glib2.0-2.25.16.orig/gio/gio.symbols 2010-09-18 00:32:39.000000000
+0200
-+++ glib2.0-2.25.16/gio/gio.symbols 2010-09-27 14:03:33.000000000 +0200
-@@ -91,6 +91,7 @@
- g_desktop_app_info_get_type G_GNUC_CONST
+--- 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
g_desktop_app_info_get_is_hidden
- g_desktop_app_info_set_desktop_env
+ g_desktop_app_info_get_type G_GNUC_CONST
+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_default_for_uri_scheme
- #endif
-Index: glib2.0-2.25.16/gio/giomodule.c
+Index: glib-2.27.90/gio/giomodule.c
===================================================================
---- glib2.0-2.25.16.orig/gio/giomodule.c 2010-09-13 17:57:51.000000000
+0200
-+++ glib2.0-2.25.16/gio/giomodule.c 2010-09-27 14:03:33.000000000 +0200
-@@ -525,6 +525,9 @@
- #ifdef G_OS_UNIX
- ep = g_io_extension_point_register
(G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
- g_io_extension_point_set_required_type (ep,
G_TYPE_DESKTOP_APP_INFO_LOOKUP);
-+
+--- 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
+@@ -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);
+
+ ep = g_io_extension_point_register
(G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME);
+ g_io_extension_point_set_required_type (ep,
G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER);
- #endif
-
- ep = g_io_extension_point_register
(G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME);
++
+ ep = g_io_extension_point_register (G_TLS_BACKEND_EXTENSION_POINT_NAME);
+ g_io_extension_point_set_required_type (ep, G_TYPE_TLS_BACKEND);
+ }
diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild
index f773456..b26b976 100644
--- a/source/base/glib2/FrugalBuild
+++ b/source/base/glib2/FrugalBuild
@@ -4,26 +4,27 @@
USE_DOC=${USE_DOC:-"y"}
pkgname=glib2
-pkgver=2.26.1
-pkgrel=1
+pkgver=2.28.1
+pkgrel=1ayatana1
pkgdesc="Common C routines used by GTK+2 and other libraries"
url="http://www.gtk.org/";
depends=('glibc>=2.9-2')
makedepends=('libgcrypt>=1.4.3-1')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
-options=('scriptlet' 'force')
+options=('scriptlet')
_F_gnome_name="glib"
Finclude gnome
_F_cd_path="glib-$pkgver"
## DON'T remove nor change the debug level or it breaks again ..
-source=($source 71_gio_launch_handler.patch \
+source=($source \
glib2.sh \
- glib2.csh)
-sha1sums=('8d35d5cf41d681dd6480a16be39f7d3cffbd29f0' \
- 'e5325c30c0f98dc832a17c47919d831f6ce2e0ab' \
+ glib2.csh \
+ 71_gio_launch_handler.patch)
+sha1sums=('f65a89d0a15d0dab07959d01f88502531a4d7ea5' \
'bfe05590a6498259f1045a591fd886a8572f271a' \
- '6db09da816d69aab7a5cbf3460ee082bef200891')
+ '6db09da816d69aab7a5cbf3460ee082bef200891' \
+ '794b92b0088043adcf67e8bf3c34b0bddc59eb13')
if Fuse $USE_DOC; then
makedepends=("${makedepends[@]}" 'gtk-doc>=1.11')
Fconfopts="$Fconfopts --enable-gtk-doc"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
