Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=079afd21d45a6b2ef7d973087c5e51525af44fa0
commit 079afd21d45a6b2ef7d973087c5e51525af44fa0 Author: Devil505 <[email protected]> Date: Thu Sep 23 18:13:51 2010 +0200 indicator-applet-0.4.5-1-i686 * version bump * updating patch diff --git a/source/gnome-extra/indicator-applet/FrugalBuild b/source/gnome-extra/indicator-applet/FrugalBuild index 39b99b3..f071715 100644 --- a/source/gnome-extra/indicator-applet/FrugalBuild +++ b/source/gnome-extra/indicator-applet/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 <[email protected]> pkgname=indicator-applet -pkgver=0.3.7 -pkgrel=2 +pkgver=0.4.5 +pkgrel=1 pkgdesc="A small applet to display information from various applications consistently in the panel." url="http://launchpad.net/indicator-applet"; depends=('gconf' 'gnome-panel' 'indicator-messages' 'indicator-session') @@ -14,7 +14,18 @@ _F_gnome_iconcache="y" _F_gnome_schemas=('/etc/gconf/schemas/indicator-applet.schemas') Finclude gnome-scriptlet up2date="Flasttar $url" -source=($url/0.3/$pkgver/+download/$pkgname-$pkgver.tar.gz original-user-switch-survive.patch) -sha1sums=('eb90954c2faa6235983f9b0b739c7d1734bba47f' \ - 'de70ee80104eeeb9ce11a7ade89de40cef4daf87') +source=($url/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz indicator-applet-0.4.5-fastuserswitchapplet-collision.patch) +sha1sums=('cefbec7462f680a4ac7e44f066dc0c63db87e184' \ + '2322d7788b8e1e006fc24f8ec83e825857e6ff54') + +build() { + Fcd + # Don't collide with gdm-user-switch-applet's bonobo file + mv data/GNOME_{FastUserSwitchApplet,IndicatorAppletSession}.server.in.in \ + || Fdie + Fsed "FastUserSwitchApplet" "IndicatorAppletSession" data/Makefile + Fsed "FastUserSwitchApplet" "IndicatorAppletSession" data/Makefile.in + Fbuild + Fbuild_gnome_scriptlet +} diff --git a/source/gnome-extra/indicator-applet/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch b/source/gnome-extra/indicator-applet/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch new file mode 100644 index 0000000..921965a --- /dev/null +++ b/source/gnome-extra/indicator-applet/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch @@ -0,0 +1,55 @@ +From: Romain Perier <[email protected]> +Date: Sun, 4 Apr 2010 11:24:07 +0200 +Subject: Do not collide with GNOME_FastUserSwicthApplet.server + +This file is already installed by gdm, however it's also required by indicator-applet-session +(gdm-user-switch-applet-like but a little different) that's why I renamed it properly. + +--- + data/GNOME_IndicatorAppletSession.server.in.in | 3 +- + data/Makefile.am | 2 +- + src/applet-main.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -10,7 +10,7 @@ + GNOME_IndicatorApplet.server.in \ + GNOME_IndicatorAppletComplete.server.in \ + GNOME_IndicatorAppletAppmenu.server.in \ +- GNOME_FastUserSwitchApplet.server.in ++ GNOME_IndicatorAppletSession.server.in + server_DATA = \ + $(server_in_files:.server.in=.server) + +--- a/src/applet-main.c ++++ b/src/applet-main.c +@@ -63,7 +63,7 @@ PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorApplet_Factory", + applet_fill_cb, NULL); + #endif + #ifdef INDICATOR_APPLET_SESSION +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", ++PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorAppletSession_Factory", + PANEL_TYPE_APPLET, + "indicator-applet-session", "0", + applet_fill_cb, NULL); +--- a/data/GNOME_IndicatorAppletSession.server.in.in 2010-09-18 21:30:33.000000000 +0200 ++++ b/data/GNOME_IndicatorAppletSession.server.in.in 2010-09-18 21:31:29.000000000 +0200 +@@ -1,5 +1,5 @@ + <oaf_info> +- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe" ++ <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession_Factory" type="exe" + location="@LIBEXECDIR@/indicator-applet-session"> + + <oaf_attribute name="repo_ids" type="stringv"> +@@ -13,8 +13,8 @@ + </oaf_attribute> + </oaf_server> + +- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory" +- location="OAFIID:GNOME_FastUserSwitchApplet_Factory"> ++ <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession" type="factory" ++ location="OAFIID:GNOME_IndicatorAppletSession_Factory"> + + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> diff --git a/source/gnome-extra/indicator-applet/original-user-switch-survive.patch b/source/gnome-extra/indicator-applet/original-user-switch-survive.patch deleted file mode 100644 index af6c45a..0000000 --- a/source/gnome-extra/indicator-applet/original-user-switch-survive.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Naur indicator-applet-0.3.2.orig/data/GNOME_CanonicalFastUserSwitchApplet.server.in.in indicator-applet-0.3.2/data/GNOME_CanonicalFastUserSwitchApplet.server.in.in ---- indicator-applet-0.3.2.orig/data/GNOME_CanonicalFastUserSwitchApplet.server.in.in 1970-01-01 01:00:00.000000000 +0100 -+++ indicator-applet-0.3.2/data/GNOME_CanonicalFastUserSwitchApplet.server.in.in 2009-08-24 19:31:51.000000000 +0100 -@@ -0,0 +1,28 @@ -+<oaf_info> -+ <oaf_server iid="OAFIID:GNOME_CanonicalFastUserSwitchApplet_Factory" type="exe" -+ location="@LIBEXECDIR@/indicator-applet-session"> -+ -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:Bonobo/GenericFactory:1.0"/> -+ <item value="IDL:Bonobo/Unknown:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/> -+ <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/> -+ <oaf_attribute name="bonobo:environment" type="stringv"> -+ <item value="DBUS_SESSION_BUS_ADDRESS"/> -+ </oaf_attribute> -+ </oaf_server> -+ -+ <oaf_server iid="OAFIID:GNOME_CanonicalFastUserSwitchApplet" type="factory" -+ location="OAFIID:GNOME_CanonicalFastUserSwitchApplet_Factory"> -+ -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> -+ <item value="IDL:Bonobo/Control:1.0"/> -+ <item value="IDL:Bonobo/Unknown:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/> -+ <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/> -+ <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/> -+ </oaf_server> -+</oaf_info> -diff -Naur indicator-applet-0.3.2.orig/data/GNOME_FastUserSwitchApplet.server.in.in indicator-applet-0.3.2/data/GNOME_FastUserSwitchApplet.server.in.in ---- indicator-applet-0.3.2.orig/data/GNOME_FastUserSwitchApplet.server.in.in 2009-08-24 19:31:51.000000000 +0100 -+++ indicator-applet-0.3.2/data/GNOME_FastUserSwitchApplet.server.in.in 1970-01-01 01:00:00.000000000 +0100 -@@ -1,28 +0,0 @@ --<oaf_info> -- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe" -- location="@LIBEXECDIR@/indicator-applet-session"> -- -- <oaf_attribute name="repo_ids" type="stringv"> -- <item value="IDL:Bonobo/GenericFactory:1.0"/> -- <item value="IDL:Bonobo/Unknown:1.0"/> -- </oaf_attribute> -- <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/> -- <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/> -- <oaf_attribute name="bonobo:environment" type="stringv"> -- <item value="DBUS_SESSION_BUS_ADDRESS"/> -- </oaf_attribute> -- </oaf_server> -- -- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory" -- location="OAFIID:GNOME_FastUserSwitchApplet_Factory"> -- -- <oaf_attribute name="repo_ids" type="stringv"> -- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> -- <item value="IDL:Bonobo/Control:1.0"/> -- <item value="IDL:Bonobo/Unknown:1.0"/> -- </oaf_attribute> -- <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/> -- <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/> -- <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/> -- </oaf_server> --</oaf_info> -diff -Naur indicator-applet-0.3.2.orig/data/Makefile.am indicator-applet-0.3.2/data/Makefile.am ---- indicator-applet-0.3.2.orig/data/Makefile.am 2010-01-06 03:46:44.000000000 +0000 -+++ indicator-applet-0.3.2/data/Makefile.am 2010-02-09 23:51:20.374253629 +0000 -@@ -9,7 +9,7 @@ - server_in_files = \ - GNOME_IndicatorApplet.server.in \ - GNOME_IndicatorAppletComplete.server.in \ -- GNOME_FastUserSwitchApplet.server.in -+ GNOME_CanonicalFastUserSwitchApplet.server.in - server_DATA = \ - $(server_in_files:.server.in=.server) - -@@ -70,7 +70,7 @@ - $(icons_DATA) \ - GNOME_IndicatorApplet.server.in.in \ - GNOME_IndicatorAppletComplete.server.in.in \ -- GNOME_FastUserSwitchApplet.server.in.in \ -+ GNOME_CanonicalFastUserSwitchApplet.server.in.in \ - $(schema_in_files) - - MAINTAINERCLEANFILES = \ -diff -Naur indicator-applet-0.3.2.orig/data/Makefile.in indicator-applet-0.3.2/data/Makefile.in ---- indicator-applet-0.3.2.orig/data/Makefile.in 2010-01-21 18:38:01.000000000 +0000 -+++ indicator-applet-0.3.2/data/Makefile.in 2010-02-09 23:52:03.900919873 +0000 -@@ -238,7 +238,7 @@ - server_in_files = \ - GNOME_IndicatorApplet.server.in \ - GNOME_IndicatorAppletComplete.server.in \ -- GNOME_FastUserSwitchApplet.server.in -+ GNOME_CanonicalFastUserSwitchApplet.server.in - - server_DATA = \ - $(server_in_files:.server.in=.server) -@@ -277,7 +277,7 @@ - $(icons_DATA) \ - GNOME_IndicatorApplet.server.in.in \ - GNOME_IndicatorAppletComplete.server.in.in \ -- GNOME_FastUserSwitchApplet.server.in.in \ -+ GNOME_CanonicalFastUserSwitchApplet.server.in.in \ - $(schema_in_files) - - MAINTAINERCLEANFILES = \ -diff -Naur indicator-applet-0.3.2.orig/src/applet-main.c indicator-applet-0.3.2/src/applet-main.c ---- indicator-applet-0.3.2.orig/src/applet-main.c 2010-01-21 17:27:38.000000000 +0000 -+++ indicator-applet-0.3.2/src/applet-main.c 2010-02-09 23:52:30.007582129 +0000 -@@ -61,7 +61,7 @@ - applet_fill_cb, NULL); - #endif - #ifdef INDICATOR_APPLET_SESSION --PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", -+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_CanonicalFastUserSwitchApplet_Factory", - PANEL_TYPE_APPLET, - "indicator-applet-session", "0", - applet_fill_cb, NULL); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
