From 3d2f6e0313f44d906c5b7f083f0cde89bbe7175f Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 19 Nov 2006 13:17:23 +0000 Subject: Update to the newer version, keeping the wakeup fix and in-process applets on top of what is in portage --- gnome-base/gnome-panel/ChangeLog | 4 ++ gnome-base/gnome-panel/Manifest | 32 +++++----- .../gnome-panel/files/digest-gnome-panel-2.16.0 | 3 - .../gnome-panel/files/digest-gnome-panel-2.16.1 | 3 + .../files/gnome-panel-2.16.0-no-seconds.patch | 65 -------------------- .../files/gnome-panel-2.16.1-no-seconds.patch | 65 ++++++++++++++++++++ gnome-base/gnome-panel/gnome-panel-2.16.0.ebuild | 71 ---------------------- gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild | 71 ++++++++++++++++++++++ 8 files changed, 159 insertions(+), 155 deletions(-) delete mode 100644 gnome-base/gnome-panel/files/digest-gnome-panel-2.16.0 create mode 100644 gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1 delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.16.0-no-seconds.patch create mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.16.1-no-seconds.patch delete mode 100644 gnome-base/gnome-panel/gnome-panel-2.16.0.ebuild create mode 100644 gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index 55de57e..cce4099 100644 --- a/gnome-base/gnome-panel/ChangeLog +++ b/gnome-base/gnome-panel/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Nov 2006; Mart Raudsepp ChangeLog: + Update to the newer version, keeping the wakeup fix and in-process applets + on top of what is in portage + 18 Sep 2006; Mart Raudsepp ChangeLog: Wake up the clock applet only when needed - only every full minute or full second (depending on if seconds are shown), instead of in a one second diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest index 9851f0e..1dcc6e5 100644 --- a/gnome-base/gnome-panel/Manifest +++ b/gnome-base/gnome-panel/Manifest @@ -1,16 +1,16 @@ -AUX gnome-panel-2.16.0-no-seconds.patch 1813 RMD160 639071e02e5c45d7c69f3405c6d61d9d151208a3 SHA1 677a7e8d2da5dae1bec4ac70573793b3567f12a2 SHA256 7b46700c2fe38e03d992612141c67426963ec5234f5b51767ce90d1460225389 -MD5 16977724182a2174b6762471e1e72553 files/gnome-panel-2.16.0-no-seconds.patch 1813 -RMD160 639071e02e5c45d7c69f3405c6d61d9d151208a3 files/gnome-panel-2.16.0-no-seconds.patch 1813 -SHA256 7b46700c2fe38e03d992612141c67426963ec5234f5b51767ce90d1460225389 files/gnome-panel-2.16.0-no-seconds.patch 1813 -DIST gnome-panel-2.16.0.tar.bz2 2664150 RMD160 fd761c133140a0999683748796d3b64982143a29 SHA1 32077d18d7255acb518a1795ce201b2a79017d97 SHA256 d13883bbf290ecf1a4fdb21c1afc39e62b68d2cc97701ca34f99654d891db7ef -EBUILD gnome-panel-2.16.0.ebuild 2184 RMD160 47cf4176c56b124f56be51fa797384b4b23911f5 SHA1 a864688b2b47443e59e55e32e968cfa911dd82c0 SHA256 5423d616999edf269477768b10c419a5ff3379baa0e582b2689a410b6fc47a94 -MD5 9ec2a0eaaadc0538324e3d8d3fdb8833 gnome-panel-2.16.0.ebuild 2184 -RMD160 47cf4176c56b124f56be51fa797384b4b23911f5 gnome-panel-2.16.0.ebuild 2184 -SHA256 5423d616999edf269477768b10c419a5ff3379baa0e582b2689a410b6fc47a94 gnome-panel-2.16.0.ebuild 2184 -MISC ChangeLog 518 RMD160 8b0d7343ce966d855115f864a9b4d1ebd3103635 SHA1 c681b3d28841274f35f6b8ba2af792c6146ef638 SHA256 a1e5d6e4570bde21e23f533e671f7d473caa17e08a2a60581efcf8d4133945fb -MD5 1018b5b2ba1b56c93d7d6808f18a0e8a ChangeLog 518 -RMD160 8b0d7343ce966d855115f864a9b4d1ebd3103635 ChangeLog 518 -SHA256 a1e5d6e4570bde21e23f533e671f7d473caa17e08a2a60581efcf8d4133945fb ChangeLog 518 -MD5 157eba34216c163b3abbee65f8d1a7b0 files/digest-gnome-panel-2.16.0 262 -RMD160 7d32a2699e1ad43fcb8b605b5039b582dda14e8f files/digest-gnome-panel-2.16.0 262 -SHA256 3bf2c9b7fab3a3d84d835676c269ba7ad539eef1d1f2e1335267f8179ca423af files/digest-gnome-panel-2.16.0 262 +AUX gnome-panel-2.16.1-no-seconds.patch 1813 RMD160 639071e02e5c45d7c69f3405c6d61d9d151208a3 SHA1 677a7e8d2da5dae1bec4ac70573793b3567f12a2 SHA256 7b46700c2fe38e03d992612141c67426963ec5234f5b51767ce90d1460225389 +MD5 16977724182a2174b6762471e1e72553 files/gnome-panel-2.16.1-no-seconds.patch 1813 +RMD160 639071e02e5c45d7c69f3405c6d61d9d151208a3 files/gnome-panel-2.16.1-no-seconds.patch 1813 +SHA256 7b46700c2fe38e03d992612141c67426963ec5234f5b51767ce90d1460225389 files/gnome-panel-2.16.1-no-seconds.patch 1813 +DIST gnome-panel-2.16.1.tar.bz2 2689938 RMD160 9cff06b11d65b905cab3582747da4e00c56f8029 SHA1 7f10a31edb3082c0ef16b1a980807a73e7ef39fa SHA256 711d7c19f0cacc5a0d0407065793c50dd7e3a154551602f4768df2da55743b23 +EBUILD gnome-panel-2.16.1.ebuild 2196 RMD160 f61b4f967d2cb991401f8e5cd8a6caa1850491df SHA1 258efb56854754b0e386d6af5ac2cb91594e1bcc SHA256 677e4676e55c176ab1ae9ad20e498e6a878a2d8629c517c73f224af13ad1e4e9 +MD5 42bec2b6b19a6e3277908b20ebe1fa68 gnome-panel-2.16.1.ebuild 2196 +RMD160 f61b4f967d2cb991401f8e5cd8a6caa1850491df gnome-panel-2.16.1.ebuild 2196 +SHA256 677e4676e55c176ab1ae9ad20e498e6a878a2d8629c517c73f224af13ad1e4e9 gnome-panel-2.16.1.ebuild 2196 +MISC ChangeLog 685 RMD160 d34697dae31575f47db2a06b31d35894e87609aa SHA1 cb0191667e0d963862a4cefb5007692d3b908756 SHA256 1ebe024c7b62f398fc821fb4349a7d30edb37a85524c3a3515964e0ae630b15c +MD5 3480ff26dff5b71c3d9f72793f0d2296 ChangeLog 685 +RMD160 d34697dae31575f47db2a06b31d35894e87609aa ChangeLog 685 +SHA256 1ebe024c7b62f398fc821fb4349a7d30edb37a85524c3a3515964e0ae630b15c ChangeLog 685 +MD5 07c3a327f97d64e3d40650465b5aa3af files/digest-gnome-panel-2.16.1 262 +RMD160 17992948838317cde790c07e6f7e7a0f123f6ba5 files/digest-gnome-panel-2.16.1 262 +SHA256 028a33249354b819c6e2e035fc04b1cd8b61756ab0a7101d6417cd5d48fb5877 files/digest-gnome-panel-2.16.1 262 diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.0 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.0 deleted file mode 100644 index 8dfc84e..0000000 --- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3ad554554e504ec7b1857cd4acbbd661 gnome-panel-2.16.0.tar.bz2 2664150 -RMD160 fd761c133140a0999683748796d3b64982143a29 gnome-panel-2.16.0.tar.bz2 2664150 -SHA256 d13883bbf290ecf1a4fdb21c1afc39e62b68d2cc97701ca34f99654d891db7ef gnome-panel-2.16.0.tar.bz2 2664150 diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1 new file mode 100644 index 0000000..30bdaa7 --- /dev/null +++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1 @@ -0,0 +1,3 @@ +MD5 d0131e0b33a63b17b22b4d78b00291f8 gnome-panel-2.16.1.tar.bz2 2689938 +RMD160 9cff06b11d65b905cab3582747da4e00c56f8029 gnome-panel-2.16.1.tar.bz2 2689938 +SHA256 711d7c19f0cacc5a0d0407065793c50dd7e3a154551602f4768df2da55743b23 gnome-panel-2.16.1.tar.bz2 2689938 diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.16.0-no-seconds.patch b/gnome-base/gnome-panel/files/gnome-panel-2.16.0-no-seconds.patch deleted file mode 100644 index d76907d..0000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.16.0-no-seconds.patch +++ /dev/null @@ -1,65 +0,0 @@ -From Fedora Core 6: - -https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=204862 -http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/gnome-panel/devel/gnome-panel-2.15.92-no-seconds.patch?rev=1.1 -http://bugzilla.gnome.org/attachment.cgi?id=72039&action=view - -Alternative approach discussion on upstream bug, with possibly better timezone change notification done in the future: -http://bugzilla.gnome.org/show_bug.cgi?id=348749 - ---- gnome-panel-2.15.92/applets/clock/clock.c.no-seconds 2006-09-01 13:52:10.000000000 -0400 -+++ gnome-panel-2.15.92/applets/clock/clock.c 2006-09-01 13:56:36.000000000 -0400 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -243,6 +244,7 @@ - { - ClockData *cd = data; - time_t new_time; -+ int timeouttime; - - time (&new_time); - -@@ -262,7 +264,20 @@ - update_clock (cd); - } - -- return TRUE; -+ if (cd->format == CLOCK_FORMAT_INTERNET) -+ timeouttime = INTERNETSECOND; -+ else { -+ struct timeval tv; -+ gettimeofday(&tv, NULL); -+ timeouttime = (1000000 - tv.tv_usec)/1000+1; -+ if (!cd->showseconds) -+ timeouttime += 1000 * (59 - cd->current_time % 60); -+ } -+ cd->timeout = g_timeout_add (timeouttime, -+ clock_timeout_callback, -+ cd); -+ -+ return FALSE; - } - - static float -@@ -489,8 +504,13 @@ - - if (cd->format == CLOCK_FORMAT_INTERNET) - timeouttime = INTERNETSECOND; -- else -- timeouttime = 1000; -+ else { -+ struct timeval tv; -+ gettimeofday(&tv, NULL); -+ timeouttime = (1000000 - tv.tv_usec)/1000+1; -+ if (!cd->showseconds) -+ timeouttime += 1000 * (59 - cd->current_time % 60); -+ } - - cd->timeout = g_timeout_add (timeouttime, - clock_timeout_callback, diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.16.1-no-seconds.patch b/gnome-base/gnome-panel/files/gnome-panel-2.16.1-no-seconds.patch new file mode 100644 index 0000000..d76907d --- /dev/null +++ b/gnome-base/gnome-panel/files/gnome-panel-2.16.1-no-seconds.patch @@ -0,0 +1,65 @@ +From Fedora Core 6: + +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=204862 +http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/gnome-panel/devel/gnome-panel-2.15.92-no-seconds.patch?rev=1.1 +http://bugzilla.gnome.org/attachment.cgi?id=72039&action=view + +Alternative approach discussion on upstream bug, with possibly better timezone change notification done in the future: +http://bugzilla.gnome.org/show_bug.cgi?id=348749 + +--- gnome-panel-2.15.92/applets/clock/clock.c.no-seconds 2006-09-01 13:52:10.000000000 -0400 ++++ gnome-panel-2.15.92/applets/clock/clock.c 2006-09-01 13:56:36.000000000 -0400 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -243,6 +244,7 @@ + { + ClockData *cd = data; + time_t new_time; ++ int timeouttime; + + time (&new_time); + +@@ -262,7 +264,20 @@ + update_clock (cd); + } + +- return TRUE; ++ if (cd->format == CLOCK_FORMAT_INTERNET) ++ timeouttime = INTERNETSECOND; ++ else { ++ struct timeval tv; ++ gettimeofday(&tv, NULL); ++ timeouttime = (1000000 - tv.tv_usec)/1000+1; ++ if (!cd->showseconds) ++ timeouttime += 1000 * (59 - cd->current_time % 60); ++ } ++ cd->timeout = g_timeout_add (timeouttime, ++ clock_timeout_callback, ++ cd); ++ ++ return FALSE; + } + + static float +@@ -489,8 +504,13 @@ + + if (cd->format == CLOCK_FORMAT_INTERNET) + timeouttime = INTERNETSECOND; +- else +- timeouttime = 1000; ++ else { ++ struct timeval tv; ++ gettimeofday(&tv, NULL); ++ timeouttime = (1000000 - tv.tv_usec)/1000+1; ++ if (!cd->showseconds) ++ timeouttime += 1000 * (59 - cd->current_time % 60); ++ } + + cd->timeout = g_timeout_add (timeouttime, + clock_timeout_callback, diff --git a/gnome-base/gnome-panel/gnome-panel-2.16.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.16.0.ebuild deleted file mode 100644 index 2096bd2..0000000 --- a/gnome-base/gnome-panel/gnome-panel-2.16.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2006 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.16.0.ebuild,v 1.2 2006/09/12 15:21:36 dang Exp $ - -inherit gnome2 eutils - -DESCRIPTION="The GNOME panel" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc eds" - -RDEPEND=">=gnome-base/gnome-desktop-2.11.92 - >=x11-libs/gtk+-2.10 - >=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 - >=gnome-base/gnome-vfs-2.14.2 - >=x11-libs/libwnck-2.13.5 - >=gnome-base/gconf-2.6.1 - >=gnome-base/gnome-menus-2.11.1 - >=gnome-base/libbonobo-2 - >=sys-apps/dbus-0.60 - >=x11-libs/cairo-1.0.0 - media-libs/libpng - eds? ( >=gnome-extra/evolution-data-server-1.6 )" - -DEPEND="${RDEPEND} - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.3.2 - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35 - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="--disable-scrollkeeper $(use_enable eds) \ - --with-in-process-applets=all" -} - -src_unpack() { - gnome2_src_unpack - - # FIXME : uh yeah, this is nice - # We should patch in a switch here and send it upstream - sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed" - - # Wake up the clock applet only when needed. E.g, on a minute change with a clock that doesn't show seconds, - # instead of every second. Leads to saving battery power, possibly more millisecond precise, but potentially - # taking longer to react to time and/or timezone adjustments. - epatch "${FILESDIR}/${P}-no-seconds.patch" -} - -pkg_postinst() { - local entries="/etc/gconf/schemas/panel-default-setup.entries" - if [ -e "$entries" ]; then - einfo "setting panel gconf defaults..." - GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source` - ${ROOT}/usr/bin/gconftool-2 --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 -} diff --git a/gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild new file mode 100644 index 0000000..3627692 --- /dev/null +++ b/gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2006 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.16.1.ebuild,v 1.2 2006/10/14 21:13:50 vapier Exp $ + +inherit gnome2 eutils + +DESCRIPTION="The GNOME panel" +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" +IUSE="doc eds" + +RDEPEND=">=gnome-base/gnome-desktop-2.11.92 + >=x11-libs/gtk+-2.10 + >=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 + >=gnome-base/gnome-vfs-2.14.2 + >=x11-libs/libwnck-2.13.5 + >=gnome-base/gconf-2.6.1 + >=gnome-base/gnome-menus-2.11.1 + >=gnome-base/libbonobo-2 + >=sys-apps/dbus-0.60 + >=x11-libs/cairo-1.0.0 + media-libs/libpng + eds? ( >=gnome-extra/evolution-data-server-1.6 )" + +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=app-text/gnome-doc-utils-0.3.2 + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +pkg_setup() { + G2CONF="--disable-scrollkeeper $(use_enable eds) \ + --with-in-process-applets=all" +} + +src_unpack() { + gnome2_src_unpack + + # FIXME : uh yeah, this is nice + # We should patch in a switch here and send it upstream + sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed" + + # Wake up the clock applet only when needed. E.g, on a minute change with a clock that doesn't show seconds, + # instead of every second. Leads to saving battery power, possibly more millisecond precise, but potentially + # taking longer to react to time and/or timezone adjustments. + epatch "${FILESDIR}/${P}-no-seconds.patch" +} + +pkg_postinst() { + local entries="/etc/gconf/schemas/panel-default-setup.entries" + if [ -e "$entries" ]; then + einfo "setting panel gconf defaults..." + GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source` + ${ROOT}/usr/bin/gconftool-2 --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 +} -- cgit v1.2.3