diff options
4 files changed, 209 insertions, 2 deletions
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest index 9a8157e..280ddcb 100644 --- a/gnome-base/gnome-panel/Manifest +++ b/gnome-base/gnome-panel/Manifest @@ -1,6 +1,9 @@ +AUX gnome-panel-2.24.3-daylight.patch 1009 RMD160 6b84a6e00dbc350fd0bf4e1850940e7c925fb86b SHA1 87ccfb70d97038d2916d1074efb954f316be53ee SHA256 ea8c1598b5c6fddc751ee18a7aab34781aa82e936fc76b9304409304e5601a1f +AUX gnome-panel-2.24.3-shutdown.patch 2548 RMD160 9fa99e6a7c310114af4f5d41160a3703fb3dac03 SHA1 fa2eb42aa677d8c4459903b50a1aa42def28ffb8 SHA256 ae5d2a04ae292966b6661e9cc73623cfd8204a8b3012b40c4274e449933e495e AUX gnome-panel-alt-f1-slab.patch 1458 RMD160 090bee7ad7933426509fde2a7305a410ebe92af8 SHA1 78b45ef6ca4234db783b3f23de4f2b9410a83c70 SHA256 d085431812451f471fa78aacd37f0fde85bc5e6588a7e525d3187002aa7f91e4 AUX gnome-panel-recently-used-apps.patch 4948 RMD160 ebb5b64a0a0573ad5794670985cdd723fe78c830 SHA1 9d4555f328a0cdc7dd9df5f39b0d160dc39d7845 SHA256 33bf7902537bb36dd405532d69d40a6cda7a22607e8b254b4173584d8af72390 -AUX gnome-panel-recently-used-apps.patch~ 4933 RMD160 12071989addf1fa4ffc21c3b00198e2b0db3ffd2 SHA1 18c255bd31587d07d2c49d987cb9613c7133eabb SHA256 20a248d37f035e646f7b23e704f20161e45d2d572f9c35368d15052f1f3d70be DIST gnome-panel-2.24.1.tar.bz2 3354268 RMD160 84e7ccd0425c567c9b800cdfecb653f206cdf768 SHA1 01a2376582ba81b006511279767cb74ecb3332af SHA256 35a845990a8f56da191615a82e22f1be47657476647f4fb5c5148668cc999907 +DIST gnome-panel-2.24.2-logout+po.tar.bz2 75365 RMD160 dadb220e3505fdd37bbddd332a760f6d3fa9498a SHA1 1eb32102d62ee6e5ef4420a41e0647a0d3768a72 SHA256 2e67af4d204ff65092d6b37abbfe41d7baea0fc27b1ed46aa7eb3494c2d53ee6 +DIST gnome-panel-2.24.3.tar.bz2 3354686 RMD160 ac38a86fd844d4e7d27c9785dc27a0327d83809f SHA1 46a115529c2e6ef5429e58e5389ad44660aff428 SHA256 2b52f9cd5b3e028f5e67b75af6c484f21cd208e4403041ea1b4d831d67fc21b0 EBUILD gnome-panel-2.24.1.ebuild 2206 RMD160 d571dad7e648a322ff1d0185e38ff3349683bf86 SHA1 91515827cc4033d69b6ac79e2b1f52729a76125f SHA256 e1cc6a8966a9f452150f1c00f81ea2d6750d24404fd2d043f398850f35e9c433 -MISC gnome-panel-2.24.1.ebuild~ 2311 RMD160 096a7b08768e7ac7ac57b92a942e033341032d96 SHA1 216954a2e1f26800d61293c011525b473dbc96ae SHA256 2e8dfd8903e7e5786564d78ccfd187c4a534a27d5a107492e801a3b9faf46ebe +EBUILD gnome-panel-2.24.3-r1.ebuild 2766 RMD160 8eba82a924d390fe01c986d0da868d72ce87c785 SHA1 13418d5978e62c30d3be278c7e1fa4bdd3a65339 SHA256 ff97f99250c01455aca743c5b30b0c10b617e51f77318a24fef1e19f42ba899f diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch new file mode 100644 index 0000000..508aa0d --- /dev/null +++ b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch @@ -0,0 +1,25 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=569737 +https://bugs.gentoo.org/show_bug.cgi?id=256859 + +--- gnome-panel-2.24.3/applets/clock/clock.c.old 2009-01-29 21:59:18 +0000 ++++ gnome-panel-2.24.3/applets/clock/clock.c 2009-01-29 21:59:29 +0000 +@@ -653,7 +653,7 @@ + time (&now_t); + localtime_r (&now_t, &now); + +- if (daylight && now.tm_isdst) { ++ if (now.tm_isdst>0) { + zone = tzname[1]; + } else { + zone = tzname[0]; +--- gnome-panel-2.24.3/applets/clock/clock-location.c.old 2009-01-29 22:00:15 +0000 ++++ gnome-panel-2.24.3/applets/clock/clock-location.c 2009-01-29 22:00:29 +0000 +@@ -337,7 +337,7 @@ + now_t = time (NULL); + localtime_r (&now_t, &now); + +- if (daylight && now.tm_isdst) { ++ if (now.tm_isdst>0) { + clock_location_set_tzname (this, tzname[1]); + } else { + clock_location_set_tzname (this, tzname[0]); diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch new file mode 100644 index 0000000..aefb74c --- /dev/null +++ b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch @@ -0,0 +1,78 @@ +# Fix shutdown without gdm +# https://bugs.gentoo.org/show_bug.cgi?id=259138 +--- a/gnome-panel/panel-gdm.c 2009-02-15 20:33:57.000000000 +0000 ++++ b/gnome-panel/panel-gdm.c 2009-02-15 20:38:47.000000000 +0000 +@@ -233,6 +233,15 @@ + char *response; + + g_assert (data->fd <= 0); ++ ++ if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) ++ strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); ++ else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS)) ++ strcpy (addr.sun_path, "/tmp/.gdm_socket"); ++ else { ++ gdm_shutdown_protocol_connection (data); ++ return FALSE; ++ } + + data->fd = socket (AF_UNIX, SOCK_STREAM, 0); + if (data->fd < 0) { +@@ -242,11 +251,6 @@ + return FALSE; + } + +- if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) +- strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); +- else +- strcpy (addr.sun_path, "/tmp/.gdm_socket"); +- + addr.sun_family = AF_UNIX; + + if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) { +@@ -398,6 +402,16 @@ + gdm_shutdown_protocol_connection (&gdm_protocol_data); + } + ++gboolean ++gdm_available (void) ++{ ++ if (!gdm_init_protocol_connection (&gdm_protocol_data)) ++ return FALSE; ++ ++ gdm_shutdown_protocol_connection (&gdm_protocol_data); ++ return TRUE; ++} ++ + void + gdm_new_login (void) + { +--- a/gnome-panel/panel-gdm.h 2009-02-15 20:33:57.000000000 +0000 ++++ b/gnome-panel/panel-gdm.h 2009-02-15 20:38:58.000000000 +0000 +@@ -46,6 +46,7 @@ + void gdm_set_logout_action (GdmLogoutAction action); + GdmLogoutAction gdm_get_logout_action (void); + void gdm_new_login (void); ++gboolean gdm_available (void); + + G_END_DECLS + +--- a/gnome-panel/panel-logout.c 2009-02-15 20:33:57.000000000 +0000 ++++ b/gnome-panel/panel-logout.c 2009-02-15 20:40:48.000000000 +0000 +@@ -341,10 +341,12 @@ + // FIXME need to verify that this response can be used + logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT; + +- //FIXME is gdm running? +- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), +- _("_Switch User"), +- PANEL_LOGOUT_RESPONSE_SWITCH_USER); ++ //FIXME need to have a more flexible test for availability ++ if (gdm_available()) ++ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), ++ _("_Switch User"), ++ PANEL_LOGOUT_RESPONSE_SWITCH_USER); ++ + gtk_dialog_add_button (GTK_DIALOG (logout_dialog), + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL); diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild new file mode 100644 index 0000000..23df464 --- /dev/null +++ b/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild,v 1.6 2009/03/18 15:04:50 armin76 Exp $ + +GCONF_DEBUG="no" + +inherit autotools gnome2 + +MY_P="${PN}-2.24.2" +DESCRIPTION="The GNOME panel" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="${SRC_URI} + mirror://gentoo/${MY_P}-logout+po.tar.bz2" + +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd" +IUSE="doc eds networkmanager slab" + +RDEPEND=">=gnome-base/gnome-desktop-2.12 + >=x11-libs/pango-1.15.4 + >=dev-libs/glib-2.16.0 + >=x11-libs/gtk+-2.13.1 + >=dev-libs/libgweather-2.24.1 + dev-libs/libxml2 + >=gnome-base/libglade-2.5 + >=gnome-base/libgnome-2.13 + >=gnome-base/libgnomeui-2.5.4 + >=gnome-base/libbonoboui-2.1.1 + >=gnome-base/orbit-2.4 + >=x11-libs/libwnck-2.19.5 + >=gnome-base/gconf-2.6.1 + >=gnome-base/gnome-menus-2.11.1 + >=gnome-base/libbonobo-2.20.4 + gnome-base/librsvg + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-1.1.2 + x11-libs/libXau + >=x11-libs/cairo-1.0.0 + eds? ( >=gnome-extra/evolution-data-server-1.6 ) + networkmanager? ( >=net-misc/networkmanager-0.6 )" +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=app-text/gnome-doc-utils-0.3.2 + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.40 + ~app-text/docbook-xml-dtd-4.1.2 + >=dev-util/gtk-doc-am-1 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-scrollkeeper + --disable-schemas-install + --with-in-process-applets=clock,notification-area,wncklet + --disable-polkit + $(use_enable networkmanager network-manager) + $(use_enable eds)" +} + +src_unpack() { + gnome2_src_unpack + + if use slab; then + epatch ${FILESDIR}/${PN}-alt-f1-slab.patch + epatch ${FILESDIR}/${PN}-recently-used-apps.patch + fi + + # Allow logout/shutdown without gnome-session 2.24, bug #246170 + epatch "${WORKDIR}/${MY_P}-logout.patch" + epatch "${WORKDIR}/${MY_P}-po.patch" + + # Fixes build on BSD, bug #256859 + epatch "${FILESDIR}/${P}-daylight.patch" + + # Fixes shutdown without gdm, bug #259138 + epatch "${FILESDIR}/${P}-shutdown.patch" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautomake +} + +pkg_postinst() { + local entries="${ROOT}etc/gconf/schemas/panel-default-setup.entries" + local gconftool="${ROOT}usr/bin/gconftool-2" + + if [ -e "$entries" ]; then + einfo "setting panel gconf defaults..." + + GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")" + + "${gconftool}" --direct --config-source \ + "${GCONF_CONFIG_SOURCE}" --load="${entries}" + fi + + # Calling this late so it doesn't process the GConf schemas file we already + # took care of. + gnome2_pkg_postinst +} |