From e2c6b9c539b46225fd3228f0b63386104473d447 Mon Sep 17 00:00:00 2001 From: "maciag.artur" Date: Fri, 27 Mar 2009 10:04:59 +0000 Subject: gnome-desktop w/ slab USE flag git-svn-id: http://piczu-overlay.googlecode.com/svn/trunk@43 0805d722-a2c2-11dd-9b86-41075523de00 --- gnome-base/gnome-desktop/Manifest | 8 +-- .../files/gnome-desktop-2.24.2-background.patch | 26 ++++++++ .../files/gnome-desktop-recently-used-apps.patch | 72 ++++++++++------------ .../gnome-desktop/gnome-desktop-2.24.1.ebuild | 45 -------------- .../gnome-desktop/gnome-desktop-2.24.3.ebuild | 60 ++++++++++++++++++ 5 files changed, 121 insertions(+), 90 deletions(-) create mode 100644 gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch delete mode 100644 gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild create mode 100644 gnome-base/gnome-desktop/gnome-desktop-2.24.3.ebuild (limited to 'gnome-base') diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index 0fb2ffe..3baa731 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1,4 +1,4 @@ -AUX gnome-desktop-recently-used-apps.patch 64868 RMD160 02231803ef31044d88cd808bc61007c9195870ec SHA1 a2b7103ad56a584a1faa7d247ea2cd0dc201a4c8 SHA256 7f35d6549a3b1b48cac1223d76d4ef508e5f0e9dba7bc6ebe8c035f7d1c89885 -DIST gnome-desktop-2.24.1.tar.bz2 1508429 RMD160 980538be5fb4ebeff0e66a89dc2a051f679b86af SHA1 d4b396df792c5bd1b496ff3e89949b1d4d2d048e SHA256 ec7beb0886dfaeebb506b2f0e6e255b4254b3ca812ab6f69a6cafb3d9e492a40 -EBUILD gnome-desktop-2.24.1.ebuild 1119 RMD160 07bc34dc97aed8d5af06bade06178c676a6c05a3 SHA1 76b5538a532e37328557c83218657170051f885b SHA256 e32cdcb7bb8c3ca4245d541bbc72dead8a28e64a67804f9fcfeb181ae59d6f38 -MISC gnome-desktop-2.24.1.ebuild~ 1197 RMD160 ff1ca1568ccd46cdc3405dc14623b553b7b4fbfc SHA1 af302aafced42b66fccd53e2ef2caf9571d9aa66 SHA256 c1a11a97920a5dd43f5675cd3667f242fa0fc26f37a5b58c2b73675ab93716f8 +AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457 +AUX gnome-desktop-recently-used-apps.patch 63759 RMD160 63e47fbcef57d0c24215f46d44d7123d7130e030 SHA1 fe556dad7c3114ac37d3588a8956260f158c5acd SHA256 154bed9b86c6b93a833120aff47ee637130f4972c640b30e136a581242c022d4 +DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89 +EBUILD gnome-desktop-2.24.3.ebuild 1857 RMD160 5339caad80157902ea3d65a9b31298db5d77ebe7 SHA1 662855978d003da57f8969ba867ba413bc4ad5db SHA256 49b84802ed4937c9af54dc2fed676426a672c980926c66bc46ec40010eb408d9 diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch new file mode 100644 index 0000000..4c5fb8f --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch @@ -0,0 +1,26 @@ +# Do not load background if not needed +# +# https://bugs.gentoo.org/show_bug.cgi?id=251350 +# http://bugzilla.gnome.org/show_bug.cgi?id=564909 +--- a/libgnome-desktop/gnome-bg.c 2008-12-17 10:42:28.000000000 -0800 ++++ b/libgnome-desktop/gnome-bg.c 2008-12-17 10:44:33.000000000 -0800 +@@ -284,6 +284,7 @@ + GnomeBGColorType ctype; + GdkColor c1, c2; + GnomeBGPlacement placement; ++ gboolean enabled; + + g_return_if_fail (GNOME_IS_BG (bg)); + g_return_if_fail (client != NULL); +@@ -291,7 +292,9 @@ + /* Filename */ + filename = NULL; + tmp = gconf_client_get_string (client, BG_KEY_PICTURE_FILENAME, NULL); +- if (tmp != NULL && *tmp != '\0') { ++ enabled = gconf_client_get_bool (client, BG_KEY_DRAW_BACKGROUND, NULL); ++ ++ if (tmp != NULL && *tmp != '\0' && enabled) { + if (g_utf8_validate (tmp, -1, NULL) && + g_file_test (tmp, G_FILE_TEST_EXISTS)) { + filename = g_strdup (tmp); + diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-recently-used-apps.patch b/gnome-base/gnome-desktop/files/gnome-desktop-recently-used-apps.patch index 23d3881..49b7cd5 100644 --- a/gnome-base/gnome-desktop/files/gnome-desktop-recently-used-apps.patch +++ b/gnome-base/gnome-desktop/files/gnome-desktop-recently-used-apps.patch @@ -1,26 +1,22 @@ -diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/Makefile.am gnome-desktop-2.16.1/libgnome-desktop/Makefile.am ---- gnome-desktop-2.16.1-pristine/libgnome-desktop/Makefile.am 2006-06-04 07:53:09.000000000 -0400 -+++ gnome-desktop-2.16.1/libgnome-desktop/Makefile.am 2006-10-23 16:19:45.000000000 -0400 -@@ -17,9 +17,13 @@ lib_LTLIBRARIES = libgnome-desktop-2.la +--- libgnome-desktop/Makefile.am.orig 2009-03-26 16:25:01.000000000 +0100 ++++ libgnome-desktop/Makefile.am 2009-03-26 16:26:44.000000000 +0100 +@@ -16,9 +16,13 @@ lib_LTLIBRARIES = libgnome-desktop-2.la noinst_PROGRAMS = test-ditem test-hint test-ditem-edit -libgnome_desktop_2_la_SOURCES = \ -- gnome-desktop-item.c \ -- gnome-ditem-edit.c \ -+libgnome_desktop_2_la_SOURCES = \ -+ gnome-desktop-item.c \ -+ gnome-ditem-edit.c \ -+ egg-recent-item.h \ -+ egg-recent-item.c \ -+ egg-recent-model.h \ -+ egg-recent-model.c \ - gnome-hint.c - - libgnome_desktop_2_la_LIBADD = \ -diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-item.c gnome-desktop-2.16.1/libgnome-desktop/egg-recent-item.c ---- gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-item.c 1969-12-31 19:00:00.000000000 -0500 -+++ gnome-desktop-2.16.1/libgnome-desktop/egg-recent-item.c 2006-10-23 16:19:45.000000000 -0400 ++libgnome_desktop_2_la_SOURCES = \ + gnome-desktop-item.c \ + gnome-ditem-edit.c \ ++ egg-recent-item.h \ ++ egg-recent-item.c \ ++ egg-recent-model.h \ ++ egg-recent-model.c \ + gnome-hint.c \ + gnome-bg.c \ + display-name.c \ +--- libgnome-desktop/egg-recent-item.c.orig 1969-12-31 19:00:00.000000000 -0500 ++++ libgnome-desktop/egg-recent-item.c 2006-10-23 16:19:45.000000000 -0400 @@ -0,0 +1,426 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* @@ -448,9 +444,8 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-item.c gnom + + return boxed_type; +} -diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-item.h gnome-desktop-2.16.1/libgnome-desktop/egg-recent-item.h ---- gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-item.h 1969-12-31 19:00:00.000000000 -0500 -+++ gnome-desktop-2.16.1/libgnome-desktop/egg-recent-item.h 2006-10-23 16:19:45.000000000 -0400 +--- libgnome-desktop/egg-recent-item.h.orig 1969-12-31 19:00:00.000000000 -0500 ++++ libgnome-desktop/egg-recent-item.h 2006-10-23 16:19:45.000000000 -0400 @@ -0,0 +1,80 @@ + +#ifndef __EGG_RECENT_ITEM_H__ @@ -532,9 +527,8 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-item.h gnom +G_END_DECLS + +#endif /* __EGG_RECENT_ITEM_H__ */ -diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-model.c gnome-desktop-2.16.1/libgnome-desktop/egg-recent-model.c ---- gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-model.c 1969-12-31 19:00:00.000000000 -0500 -+++ gnome-desktop-2.16.1/libgnome-desktop/egg-recent-model.c 2006-10-23 16:19:45.000000000 -0400 +--- libgnome-desktop/egg-recent-model.c.orig 1969-12-31 19:00:00.000000000 -0500 ++++ libgnome-desktop/egg-recent-model.c 2006-10-23 16:19:45.000000000 -0400 @@ -0,0 +1,1965 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* @@ -2501,9 +2495,8 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-model.c gno + return egg_recent_model_type; +} + -diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-model.h gnome-desktop-2.16.1/libgnome-desktop/egg-recent-model.h ---- gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-model.h 1969-12-31 19:00:00.000000000 -0500 -+++ gnome-desktop-2.16.1/libgnome-desktop/egg-recent-model.h 2006-10-23 16:19:45.000000000 -0400 +--- libgnome-desktop/egg-recent-model.h.orig 1969-12-31 19:00:00.000000000 -0500 ++++ libgnome-desktop/egg-recent-model.h 2006-10-23 16:19:45.000000000 -0400 @@ -0,0 +1,84 @@ +/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +#ifndef __EGG_RECENT_MODEL_H__ @@ -2589,10 +2582,9 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/egg-recent-model.h gno +G_END_DECLS + +#endif /* __EGG_RECENT_MODEL_H__ */ -diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/gnome-desktop-item.c gnome-desktop-2.16.1/libgnome-desktop/gnome-desktop-item.c ---- gnome-desktop-2.16.1-pristine/libgnome-desktop/gnome-desktop-item.c 2006-08-05 07:59:08.000000000 -0400 -+++ gnome-desktop-2.16.1/libgnome-desktop/gnome-desktop-item.c 2006-10-23 17:15:41.000000000 -0400 -@@ -59,6 +59,16 @@ +--- libgnome-desktop/gnome-desktop-item.c.orig 2009-03-26 16:30:30.000000000 +0100 ++++ libgnome-desktop/gnome-desktop-item.c 2009-03-26 16:35:09.000000000 +0100 +@@ -54,6 +54,16 @@ #include #endif @@ -2608,18 +2600,18 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/gnome-desktop-item.c g + #define sure_string(s) ((s)!=NULL?(s):"") - struct _GnomeDesktopItem { -@@ -128,6 +138,8 @@ static gboolean ditem_save (Gno - const char *uri, - GError **error); + #undef GNOME_DISABLE_DEPRECATED +@@ -134,6 +144,8 @@ static GnomeDesktopItem *gnome_desktop_i + GnomeDesktopItemLoadFlags flags, + GError **error); +static void update_recently_used_apps (const GnomeDesktopItem *item); + static int readbuf_getc (ReadBuf *rb) { -@@ -2103,6 +2115,8 @@ gnome_desktop_item_launch_on_screen_with - (flags & GNOME_DESKTOP_ITEM_LAUNCH_APPEND_PATHS), +@@ -2111,6 +2123,8 @@ gnome_desktop_item_launch_on_screen_with + (flags & GNOME_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD), error); + update_recently_used_apps (item); @@ -2627,7 +2619,7 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/gnome-desktop-item.c g return ret; } -@@ -4098,3 +4112,71 @@ gnome_desktop_item_error_quark (void) +@@ -4105,3 +4119,69 @@ gnome_desktop_item_error_quark (void) return q; } @@ -2646,7 +2638,6 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/gnome-desktop-item.c g + + if (! item) + return; -+ +#ifdef USE_GTK_RECENT_MANAGER + manager = gtk_recent_manager_get_default (); + @@ -2665,7 +2656,6 @@ diff -uprN gnome-desktop-2.16.1-pristine/libgnome-desktop/gnome-desktop-item.c g + recent_data.app_exec = g_strdup (gnome_desktop_item_get_string (item, GNOME_DESKTOP_ITEM_EXEC)); + if (! recent_data.app_exec) + recent_data.app_exec = g_strdup ("gnome-open %u"); -+ + recent_data.groups = g_new0 (gchar *, 2); + recent_data.groups [0] = g_strdup ("recently-used-apps"); + recent_data.groups [1] = NULL; diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild deleted file mode 100644 index b8361c8..0000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.24.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: Exp $ - -inherit gnome2 - -DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="slab doc" - -RDEPEND=">=dev-libs/libxml2-2.4.20 - >=x11-libs/gtk+-2.11.3 - >=dev-libs/glib-2.15.4 - >=x11-libs/libXrandr-1.2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2.6 - >=x11-libs/startup-notification-0.5" -DEPEND="${RDEPEND} - app-text/scrollkeeper - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.9 - >=app-text/gnome-doc-utils-0.3.2 - doc? ( >=dev-util/gtk-doc-1.4 ) - slab? ( gnome-base/gnome-main-menu ) - ~app-text/docbook-xml-dtd-4.1.2 - x11-proto/xproto" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper" -} - -src_unpack() { - gnome2_src_unpack - - use slab && epatch "${FILESDIR}"/gnome-desktop-recently-used-apps.patch - - eautoreconf -} - diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.3.ebuild new file mode 100644 index 0000000..c8274c1 --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-2.24.3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.3.ebuild,v 1.6 2009/03/18 15:01:23 armin76 Exp $ + +inherit eutils gnome2 + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd" +IUSE="slab doc" + +# FIXME: Python deps are needed for gnome-about but not +# listed in configure.ac +RDEPEND=">=dev-libs/libxml2-2.4.20 + >=x11-libs/gtk+-2.11.3 + >=dev-libs/glib-2.15.4 + >=x11-libs/libXrandr-1.2 + >=gnome-base/gconf-2 + >=gnome-base/libgnomeui-2.6 + >=x11-libs/startup-notification-0.5 + >=dev-python/pygtk-2.8 + >=dev-python/pygobject-2.14 + >=dev-python/libgnome-python-2.22" +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.9 + >=app-text/gnome-doc-utils-0.3.2 + doc? ( >=dev-util/gtk-doc-1.4 ) + ~app-text/docbook-xml-dtd-4.1.2 + x11-proto/xproto + >=x11-proto/randrproto-1.2" +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto +# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and +# eventually libXrandr shouldn't RDEPEND on randrproto) + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper" +} + +src_unpack() { + gnome2_src_unpack + + # Slab patch + use slab && epatch "${FILESDIR}"/gnome-desktop-recently-used-apps.patch + + # Do not load background if not needed, bug #251350 + epatch "${FILESDIR}/${PN}-2.24.2-background.patch" +} + +pkg_postinst() { + ewarn + ewarn "If you are upgrading from