Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9cfff63b7c0f0511f52d075df24751ff1a126eaa
commit 9cfff63b7c0f0511f52d075df24751ff1a126eaa Author: Devil505 <devil505li...@gmail.com> Date: Thu Sep 9 18:15:22 2010 +0200 indicator-applet-0.3.2-2-i686 * added patch to avoid a conflict with a file owned by GDM diff --git a/source/gnome-extra/indicator-applet/FrugalBuild b/source/gnome-extra/indicator-applet/FrugalBuild index 0cb6a90..ddd7ed2 100644 --- a/source/gnome-extra/indicator-applet/FrugalBuild +++ b/source/gnome-extra/indicator-applet/FrugalBuild @@ -3,7 +3,7 @@ pkgname=indicator-applet pkgver=0.3.2 -pkgrel=1 +pkgrel=2 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') @@ -13,7 +13,8 @@ archs=('i686' 'x86_64') _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) -sha1sums=('b8f942dc40458234dea61c0c0bdaf5fe4c87be5d') +up2date="lynx -dump $url | grep tar.gz | Flasttar" +source=($url/0.3/$pkgver/+download/$pkgname-$pkgver.tar.gz original-user-switch-survive.patch) +sha1sums=('b8f942dc40458234dea61c0c0bdaf5fe4c87be5d' \ + 'de70ee80104eeeb9ce11a7ade89de40cef4daf87') diff --git a/source/gnome-extra/indicator-applet/original-user-switch-survive.patch b/source/gnome-extra/indicator-applet/original-user-switch-survive.patch new file mode 100644 index 0000000..af6c45a --- /dev/null +++ b/source/gnome-extra/indicator-applet/original-user-switch-survive.patch @@ -0,0 +1,118 @@ +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 Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
