Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=920d4f8301675642e8d8128f4192e2e71dcaf349

commit 920d4f8301675642e8d8128f4192e2e71dcaf349
Author: Devil505 <devil505li...@gmail.com>
Date:   Sat Feb 5 13:11:24 2011 +0100

indicator-applet-0.4.8-1-i686
* version bump
* removing patch

diff --git a/source/gnome-extra/indicator-applet/FrugalBuild 
b/source/gnome-extra/indicator-applet/FrugalBuild
index 1d6d9de..b55d02f 100644
--- a/source/gnome-extra/indicator-applet/FrugalBuild
+++ b/source/gnome-extra/indicator-applet/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Devil505 <devil505li...@gmail.com>

pkgname=indicator-applet
-pkgver=0.4.6
-pkgrel=2
+pkgver=0.4.8
+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,16 +14,15 @@ _F_gnome_iconcache="y"
_F_gnome_schemas=('/etc/gconf/schemas/indicator-applet.schemas')
Finclude gnome-scriptlet
up2date="Flasttar $url"
-source=($url/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz 
indicator-applet-0.4.5-fastuserswitchapplet-collision.patch)
-sha1sums=('a37fc2e49863e95b59b973819a44109bf6d2b3df' \
-          '2322d7788b8e1e006fc24f8ec83e825857e6ff54')
+source=($url/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+sha1sums=('79b4b880d835c78d472f73aaaaade71ca798c1f4')

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.in
+  #rename FastUserSwitchApplet to avoid conflict with GDM
+  mv data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in 
data/org.ayatana.panel.IndicatorAppletSession.panel-applet.in.in
+  mv data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in 
data/org.gnome.panel.applet.IndicatorAppletSessionFactory.service.in
+  find -type f | xargs sed -i 's/FastUserSwitchApplet/IndicatorAppletSession/'
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
deleted file mode 100644
index 921965a..0000000
--- 
a/source/gnome-extra/indicator-applet/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Romain Perier <mrpo...@gentoo.org>
-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"/>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to