[arch-commits] CVS update of extra/gnome/gnome-power-manager (4 files)
Jan de Groot
jgc at archlinux.org
Tue Dec 25 17:01:44 UTC 2007
Date: Tuesday, December 25, 2007 @ 12:01:44
Author: jgc
Path: /home/cvs-extra/extra/gnome/gnome-power-manager
Modified: PKGBUILD (1.11 -> 1.12)
Removed: gpm-desktop-startupnotify.patch (1.1) gpm-icon.patch (1.1)
gpm.diff (1.3)
upgpkg: gnome-power-manager 2.20.2-1
---------------------------------+
PKGBUILD | 12 ++--
gpm-desktop-startupnotify.patch | 10 ---
gpm-icon.patch | 100 --------------------------------------
gpm.diff | 10 ---
4 files changed, 6 insertions(+), 126 deletions(-)
Index: extra/gnome/gnome-power-manager/PKGBUILD
diff -u extra/gnome/gnome-power-manager/PKGBUILD:1.11 extra/gnome/gnome-power-manager/PKGBUILD:1.12
--- extra/gnome/gnome-power-manager/PKGBUILD:1.11 Sun Sep 23 08:48:42 2007
+++ extra/gnome/gnome-power-manager/PKGBUILD Tue Dec 25 12:01:44 2007
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD,v 1.11 2007/09/23 12:48:42 jgc Exp $
+# $Id: PKGBUILD,v 1.12 2007/12/25 17:01:44 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-power-manager
-pkgver=2.20.0
+pkgver=2.20.2
pkgrel=1
pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
arch=(i686 x86_64)
url="http://www.gnome.org/projects/gnome-power-manager/"
license=('GPL')
-depends=('libnotify>=0.4.4' 'gnome-panel>=2.20.0' 'gstreamer0.10')
+depends=('libnotify>=0.4.4' 'gnome-panel>=2.20.2' 'gstreamer0.10')
makedepends=('gettext' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
options=(!emptydirs)
install=gnome-power-manager.install
groups=(gnome-extra)
source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.20/${pkgname}-${pkgver}.tar.bz2
gnome-power-manager-2.17.92-tray-kde.patch)
-md5sums=('881f012dcbdff38a85603393cb9d39bb'
+md5sums=('8a38e3a169b80c44639f4383a64835d0'
'ae15a1b3b6bb45b999175d2414710115')
build() {
@@ -28,9 +28,9 @@
--disable-scrollkeeper \
--with-dbus-sys=/etc/dbus-1/system.d \
--with-dbus-services=/usr/share/dbus-1/services \
- --enable-applets
+ --enable-applets || return 1
make || return 1
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
Index: extra/gnome/gnome-power-manager/gpm-desktop-startupnotify.patch
diff -u extra/gnome/gnome-power-manager/gpm-desktop-startupnotify.patch:1.1 extra/gnome/gnome-power-manager/gpm-desktop-startupnotify.patch:removed
--- extra/gnome/gnome-power-manager/gpm-desktop-startupnotify.patch:1.1 Sat Mar 24 12:07:33 2007
+++ extra/gnome/gnome-power-manager/gpm-desktop-startupnotify.patch Tue Dec 25 12:01:44 2007
@@ -1,10 +0,0 @@
---- data/gnome-power-manager.desktop.in
-+++ data/gnome-power-manager.desktop.in
-@@ -8,6 +8,7 @@
- Type=Application
- Categories=
- OnlyShowIn=GNOME;XFCE;
-+StartupNotify=true
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-power-manager
- X-GNOME-Bugzilla-Component=gnome-power-manager
Index: extra/gnome/gnome-power-manager/gpm-icon.patch
diff -u extra/gnome/gnome-power-manager/gpm-icon.patch:1.1 extra/gnome/gnome-power-manager/gpm-icon.patch:removed
--- extra/gnome/gnome-power-manager/gpm-icon.patch:1.1 Sun Apr 22 12:33:43 2007
+++ extra/gnome/gnome-power-manager/gpm-icon.patch Tue Dec 25 12:01:44 2007
@@ -1,100 +0,0 @@
-Index: src/gpm-tray-icon.c
-===================================================================
---- src/gpm-tray-icon.c (révision 1934)
-+++ src/gpm-tray-icon.c (copie de travail)
-@@ -125,6 +125,21 @@
- }
-
- /**
-+ * gpm_tray_icon_show:
-+ * @icon: This TrayIcon class instance
-+ * @enabled: If we should show the tray
-+ **/
-+static void
-+gpm_tray_icon_show (GpmTrayIcon *icon,
-+ gboolean enabled)
-+{
-+ g_return_if_fail (GPM_IS_TRAY_ICON (icon));
-+
-+ gtk_status_icon_set_visible (GTK_STATUS_ICON (icon->priv->status_icon), enabled);
-+ icon->priv->is_visible = enabled != FALSE;
-+}
-+
-+/**
- * gpm_tray_icon_set_tooltip:
- * @icon: This TrayIcon class instance
- * @tooltip: The tooltip text, e.g. "Batteries fully charged"
-@@ -160,14 +175,18 @@
- if (strcmp (icon->priv->stock_id, stock_id) != 0) {
- gpm_debug ("Setting icon to %s", stock_id);
- gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (icon->priv->status_icon), stock_id);
-- gtk_status_icon_set_visible (GTK_STATUS_ICON (icon->priv->status_icon), TRUE);
- /* don't keep trying to set the same icon */
- g_free (icon->priv->stock_id);
- icon->priv->stock_id = g_strdup (stock_id);
- }
-+ /* make sure that we are visible */
-+ gpm_tray_icon_show (icon, TRUE);
- } else {
-- /* get rid of the icon */
-- gtk_status_icon_set_visible (GTK_STATUS_ICON (icon->priv->status_icon), FALSE);
-+ /* remove icon */
-+ gpm_debug ("no icon will be displayed");
-+
-+ /* make sure that we are hidden */
-+ gpm_tray_icon_show (icon, FALSE);
- }
- }
-
-@@ -437,21 +456,6 @@
- }
-
- /**
-- * gpm_tray_icon_show:
-- * @icon: This TrayIcon class instance
-- * @enabled: If we should show the tray
-- **/
--static void
--gpm_tray_icon_show (GpmTrayIcon *icon,
-- gboolean enabled)
--{
-- g_return_if_fail (GPM_IS_TRAY_ICON (icon));
--
-- gtk_status_icon_set_visible (GTK_STATUS_ICON (icon->priv->status_icon), enabled);
-- icon->priv->is_visible = enabled != FALSE;
--}
--
--/**
- * gpm_tray_icon_popup_menu_cb:
- *
- * Display the popup menu.
-@@ -762,14 +766,12 @@
-
- gpm_debug ("Going to use stock id: %s", stock_id);
-
-+ gpm_tray_icon_set_image_from_stock (icon, stock_id);
-+
- /* only create if we have a valid filename */
- if (stock_id) {
- gchar *tooltip = NULL;
-
-- gpm_tray_icon_set_image_from_stock (icon, stock_id);
-- /* make sure that we are visible */
-- gpm_tray_icon_show (icon, TRUE);
--
- gpm_debug ("emitting description-changed %s", stock_id);
- g_signal_emit (icon, signals [DESCRIPTION_CHANGED], 0, stock_id);
- g_free (stock_id);
-@@ -778,12 +780,6 @@
-
- gpm_tray_icon_set_tooltip (icon, tooltip);
- g_free (tooltip);
-- } else {
-- /* remove icon */
-- gpm_debug ("no icon will be displayed");
--
-- /* make sure that we are hidden */
-- gpm_tray_icon_show (icon, FALSE);
- }
- }
-
Index: extra/gnome/gnome-power-manager/gpm.diff
diff -u extra/gnome/gnome-power-manager/gpm.diff:1.3 extra/gnome/gnome-power-manager/gpm.diff:removed
--- extra/gnome/gnome-power-manager/gpm.diff:1.3 Sat Mar 24 12:07:33 2007
+++ extra/gnome/gnome-power-manager/gpm.diff Tue Dec 25 12:01:44 2007
@@ -1,10 +0,0 @@
---- data/gnome-power-manager.desktop.in
-+++ data/gnome-power-manager.desktop.in
-@@ -8,6 +8,7 @@
- Type=Application
- Categories=
- OnlyShowIn=GNOME;XFCE;
-+StartupNotify=true
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-power-manager
- X-GNOME-Bugzilla-Component=gnome-power-manager
More information about the arch-commits
mailing list