Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=690612b7168488897de9c0a0e6efd68b5e39a644

commit 690612b7168488897de9c0a0e6efd68b5e39a644
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed Aug 19 22:23:00 2009 +0200

infobox-0.9-3-i686
*add patch for fix conflict with galago
*closed #3576

diff --git a/source/xapps-extra/infobox/ConflictGalago.diff 
b/source/xapps-extra/infobox/ConflictGalago.diff
new file mode 100644
index 0000000..ffc756c
--- /dev/null
+++ b/source/xapps-extra/infobox/ConflictGalago.diff
@@ -0,0 +1,119 @@
+diff -urN InfoBox-0.9/InfoBoxd.conf InfoBox-0.9.new/InfoBoxd.conf
+--- InfoBox-0.9/InfoBoxd.conf  2005-09-14 00:43:13.000000000 +0200
++++ InfoBox-0.9.new/InfoBoxd.conf      2009-08-19 22:06:34.000000000 +0200
+@@ -4,9 +4,9 @@
+
+ <busconfig>
+  <policy context="default">
+-  <allow own="org.freedesktop.Notifications"/>
+-  <allow send_interface="org.freedesktop.Notifications"/>
+-  <allow receive_interface="org.freedesktop.Notifications"
+-         receive_sender="org.freedesktop.Notifications"/>
++  <allow own="org.freedesktop.Infobox"/>
++  <allow send_interface="org.freedesktop.Infobox"/>
++  <allow receive_interface="org.freedesktop.Infobox"
++         receive_sender="org.freedesktop.Infobox"/>
+  </policy>
+ </busconfig>
+diff -urN InfoBox-0.9/Makefile.am InfoBox-0.9.new/Makefile.am
+--- InfoBox-0.9/Makefile.am    2005-09-14 16:50:14.000000000 +0200
++++ InfoBox-0.9.new/Makefile.am        2009-08-19 22:07:08.000000000 +0200
+@@ -7,7 +7,7 @@
+ dbus_DATA = InfoBoxd.conf
+
+ servicedir       = $(DBUS_SERVICES_DIR)
+-service_in_files = org.freedesktop.Notifications.service.in
++service_in_files = org.freedesktop.Infobox.service.in
+ service_DATA     = $(service_in_files:.service.in=.service)
+
+ $(service_DATA): $(service_in_files) Makefile
+diff -urN InfoBox-0.9/Makefile.in InfoBox-0.9.new/Makefile.in
+--- InfoBox-0.9/Makefile.in    2005-09-14 16:50:26.000000000 +0200
++++ InfoBox-0.9.new/Makefile.in        2009-08-19 22:07:41.000000000 +0200
+@@ -166,7 +166,7 @@
+ dbusdir = ${DBUS_SYS_DIR}
+ dbus_DATA = InfoBoxd.conf
+ servicedir = $(DBUS_SERVICES_DIR)
+-service_in_files = org.freedesktop.Notifications.service.in
++service_in_files = org.freedesktop.Infobox.service.in
+ service_DATA = $(service_in_files:.service.in=.service)
+ infoboxdocdir = ${prefix}/doc/infob...@version@
+ infoboxdoc_DATA = \
+diff -urN InfoBox-0.9/org.freedesktop.Infobox.service.in 
InfoBox-0.9.new/org.freedesktop.Infobox.service.in
+--- InfoBox-0.9/org.freedesktop.Infobox.service.in     1970-01-01 
01:00:00.000000000 +0100
++++ InfoBox-0.9.new/org.freedesktop.Infobox.service.in 2009-08-19 
22:05:50.000000000 +0200
+@@ -0,0 +1,3 @@
++[D-BUS Service]
++Name=org.freedesktop.Infobox
++ex...@libexecdir@/infoboxd
+diff -urN InfoBox-0.9/org.freedesktop.Notifications.service.in 
InfoBox-0.9.new/org.freedesktop.Notifications.service.in
+--- InfoBox-0.9/org.freedesktop.Notifications.service.in       2005-09-13 
11:21:10.000000000 +0200
++++ InfoBox-0.9.new/org.freedesktop.Notifications.service.in   1970-01-01 
01:00:00.000000000 +0100
+@@ -1,3 +0,0 @@
+-[D-BUS Service]
+-Name=org.freedesktop.Notifications
+-ex...@libexecdir@/infoboxd
+diff -urN InfoBox-0.9/src/infobox InfoBox-0.9.new/src/infobox
+--- InfoBox-0.9/src/infobox    2005-09-15 01:05:56.000000000 +0200
++++ InfoBox-0.9.new/src/infobox        2009-08-19 22:10:12.000000000 +0200
+@@ -20,8 +20,8 @@
+     s ) summary=$OPTARG;;
+     m ) msg=$OPTARG;;
+     g ) image=$OPTARG;;
+-    c ) dbus-send --dest="org.freedesktop.Notifications" --print-reply 
--type=method_call /org/freedesktop/Notifications \
+-       org.freedesktop.Notifications.SetServerConfig string:"[InfoBoxDaemon]
++    c ) dbus-send --dest="org.freedesktop.Infobox" --print-reply 
--type=method_call /org/freedesktop/Notifications \
++       org.freedesktop.Infobox.SetServerConfig string:"[InfoBoxDaemon]
+        $OPTARG"
+       exit;;
+     h ) echo -e $usage
+@@ -33,5 +33,5 @@
+   esac
+ done
+
+-dbus-send --dest="org.freedesktop.Notifications" --print-reply 
--type=method_call /org/freedesktop/Notifications \
+- org.freedesktop.Notifications.ShortNotify string:"$app_name" 
string:"$app_icon" string:"$summary" string:"$msg" string:"$image"
++dbus-send --dest="org.freedesktop.Infobox" --print-reply --type=method_call 
/org/freedesktop/Notifications \
++ org.freedesktop.Infobox.ShortNotify string:"$app_name" string:"$app_icon" 
string:"$summary" string:"$msg" string:"$image"
+diff -urN InfoBox-0.9/src/infoboxd.c InfoBox-0.9.new/src/infoboxd.c
+--- InfoBox-0.9/src/infoboxd.c 2005-09-15 01:04:56.000000000 +0200
++++ InfoBox-0.9.new/src/infoboxd.c     2009-08-19 22:09:15.000000000 +0200
+@@ -977,7 +977,7 @@
+         DBusMessage *signal;
+         DBusMessageIter iter;
+
+-        signal=dbus_message_new_signal("/org/freedesktop/Notifications", 
"org.freedesktop.Notifications", "NotificationClosed");
++        signal=dbus_message_new_signal("/org/freedesktop/Notifications", 
"org.freedesktop.Infobox", "NotificationClosed");
+         DBG("Sending NotificationClosed signal with id %d\n", ib.notifyid);
+         dbus_message_iter_init_append(signal, &iter);
+         dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT32, &ib.notifyid);
+@@ -1315,14 +1315,14 @@
+         DBG("method=%s\n", member);
+
+         path=dbus_message_get_path(message);
+-        if(g_ascii_strcasecmp(path, "/org/freedesktop/Notifications")!=0)
++        if(g_ascii_strcasecmp(path, "/org/freedesktop/Infobox")!=0)
+         {
+             DBG("message received on unknown object '%s'\n", path);
+             RET(DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+         }
+
+         iface=dbus_message_get_interface(message);
+-        if(g_ascii_strcasecmp(iface, "org.freedesktop.Notifications")!=0)
++        if(g_ascii_strcasecmp(iface, "org.freedesktop.Infobox")!=0)
+         {
+             DBG("unknown message received: %s.%s\n", iface, member);
+             RET(DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+@@ -1391,10 +1391,10 @@
+     }
+     dbus_connection_setup_with_g_main(ib.dbusconn, NULL);
+
+-    dbus_bus_request_name(ib.dbusconn, "org.freedesktop.Notifications", 0, 
&error);
++    dbus_bus_request_name(ib.dbusconn, "org.freedesktop.Infobox", 0, &error);
+     if(dbus_error_is_set(&error))
+     {
+-        g_fprintf(stderr, "Unable to acquire service 
org.freedesktop.Notifications: %s\n",
++        g_fprintf(stderr, "Unable to acquire service org.freedesktop.Infobox: 
%s\n",
+                 error.message);
+         exit(1);
+     }
diff --git a/source/xapps-extra/infobox/FrugalBuild 
b/source/xapps-extra/infobox/FrugalBuild
index 5fedf5b..3eaf9d0 100644
--- a/source/xapps-extra/infobox/FrugalBuild
+++ b/source/xapps-extra/infobox/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=infobox
origname=InfoBox
pkgver=0.9
-pkgrel=2
+pkgrel=3
pkgdesc="InfoBox is a notification tool based on specifications from 
http://www.galago-project.org/";
url="http://www.galago-project.org/";
license="GPL"
@@ -12,10 +12,10 @@ depends=('gtk+2>=2.12.0' 'atk>=1.20.0' 'pango>=1.18.2' 
'dbus>=1.0.2-2' 'dbus-gli
archs=('i686' 'x86_64')
groups=('xapps-extra')
up2date="lynx -dump 
"http://developer.berlios.de/project/showfiles.php?group_id=1595";|grep 
$origname-[0-9\.]*\.tar.bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
-source=(http://download.berlios.de/fvwm-crystal/$origname-$pkgver.tar.bz2)
+source=(http://download.berlios.de/fvwm-crystal/$origname-$pkgver.tar.bz2 
ConflictGalago.diff)
_F_cd_path="$origname-$pkgver"
options=('scriptlet')
-sha1sums=('5741841c1fcb9659d1ceda20eacea67b99ece9c5')
-
+sha1sums=('5741841c1fcb9659d1ceda20eacea67b99ece9c5' \
+          'e33e73bf9b818cac024aa56556cef8ff23d9ed11')

# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to