Fix for bug #99711. Failure to set permissions correctly.

Package-Manager: portage-2.1

7 files changed, 120 insertions, 16 deletions

diff --git a/rox-base/systemtray/ChangeLog b/rox-base/systemtray/ChangeLog
index 8aef234cf2cf..fb38c846effb 100644
--- a/rox-base/systemtray/ChangeLog
+++ b/rox-base/systemtray/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for rox-base/systemtray
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/ChangeLog,v 1.3 2006/05/23 20:18:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/ChangeLog,v 1.4 2006/06/12 14:20:35 dragonheart Exp $
+
+*systemtray-0.2-r2 (12 Jun 2006)
+
+  12 Jun 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch,
+  +systemtray-0.2-r2.ebuild:
+  Fix for bug #99711. Failure to set permissions correctly. Thanks Greg Watson
+  for the bug report and Peter Hyman for the fix
 
   23 May 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove svyatogor from metadata, bug 131936.
diff --git a/rox-base/systemtray/Manifest b/rox-base/systemtray/Manifest
index 868a7505e80c..30094810d43c 100644
--- a/rox-base/systemtray/Manifest
+++ b/rox-base/systemtray/Manifest
@@ -1,33 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST SystemTray-0.2.tgz 57894
+AUX 01_all_systemtray-0.2-ROX-CLib-2.1.6.patch 1186 RMD160 1c026be788d2ddcf55c2b8104ea4cbfed908c8ca SHA1 37ea8baa34cbe9091e9ea958e7cc27b325cd1d6c SHA256 cbf25a1c5fc888d8a9458da6501d0da8b257923367502665ae82b2468eb7b60a
+MD5 f34f89394fd890cc3ae9c1ae44c38823 files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch 1186
+RMD160 1c026be788d2ddcf55c2b8104ea4cbfed908c8ca files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch 1186
+SHA256 cbf25a1c5fc888d8a9458da6501d0da8b257923367502665ae82b2468eb7b60a files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch 1186
+DIST SystemTray-0.2.tgz 57894 RMD160 7bf583e34dc90510ea1c5c143b22f1ddf54739ad SHA1 25656998767ffcce4b25d714888b1365da51f612 SHA256 67624d61eb38651e0d7d8346a1e477b50dabd9fd7e8f284cdd76e09b8fa11b90
 EBUILD systemtray-0.2-r1.ebuild 596 RMD160 56c9af7ca57dd2b2da0a35cd9ceb59a816e3f20b SHA1 8b03ec583101beafa57498554c20a18e397065b6 SHA256 bdf85bee6b19d1808589b34ca59c9842f65cf55a738684c15e15be292ee4ed08
 MD5 532d4d613cf642bce21bef05c116c805 systemtray-0.2-r1.ebuild 596
 RMD160 56c9af7ca57dd2b2da0a35cd9ceb59a816e3f20b systemtray-0.2-r1.ebuild 596
 SHA256 bdf85bee6b19d1808589b34ca59c9842f65cf55a738684c15e15be292ee4ed08 systemtray-0.2-r1.ebuild 596
+EBUILD systemtray-0.2-r2.ebuild 854 RMD160 7bd474065f19e27fdf41cf445635f8a93a6a49da SHA1 93c6d3b599dee34885c1c7785a04910db821bfac SHA256 09fbc8789bbe7dc96421f138ff2393df54e54c90005a95af69f7cd2816b46a91
+MD5 e43a32050ee78dbdf301d64f6550818d systemtray-0.2-r2.ebuild 854
+RMD160 7bd474065f19e27fdf41cf445635f8a93a6a49da systemtray-0.2-r2.ebuild 854
+SHA256 09fbc8789bbe7dc96421f138ff2393df54e54c90005a95af69f7cd2816b46a91 systemtray-0.2-r2.ebuild 854
 EBUILD systemtray-0.2.ebuild 583 RMD160 7dfac7d05c3feff14cc1e30b36466e24ec43d4f7 SHA1 3fe49eea08643486b264c0562c8b36e0e91e8296 SHA256 a45da0dc63626d085af98cc370b7e502caba4b5778ead246678d73026bacc798
 MD5 203bf382f5b5d7bc2289e28c8cb04c45 systemtray-0.2.ebuild 583
 RMD160 7dfac7d05c3feff14cc1e30b36466e24ec43d4f7 systemtray-0.2.ebuild 583
 SHA256 a45da0dc63626d085af98cc370b7e502caba4b5778ead246678d73026bacc798 systemtray-0.2.ebuild 583
-MISC ChangeLog 722 RMD160 98e98f9e234aa9483a8d6602c46872c23bef8e0d SHA1 bb5c07da3e99dce35565657501a3d16f2032c017 SHA256 22765fbd6b4dfc6cc1f0fbdff2e4265bf17fe1107e098d5b47b8ceff5eb9d690
-MD5 ef7cbf1fb24feff5d66698780501e961 ChangeLog 722
-RMD160 98e98f9e234aa9483a8d6602c46872c23bef8e0d ChangeLog 722
-SHA256 22765fbd6b4dfc6cc1f0fbdff2e4265bf17fe1107e098d5b47b8ceff5eb9d690 ChangeLog 722
+MISC ChangeLog 1025 RMD160 f10005ff45f02f24e1c3f7ea8f923d2eaf978494 SHA1 1273efb08b48822db2178de039a03111e5ca0c90 SHA256 572b85a07bc56b3983eae0dd8c8bb4d8c3b1b58a9f97ae81ca2c7794cf97f7ab
+MD5 53e9852c7be17e7f6804c5c1802692e5 ChangeLog 1025
+RMD160 f10005ff45f02f24e1c3f7ea8f923d2eaf978494 ChangeLog 1025
+SHA256 572b85a07bc56b3983eae0dd8c8bb4d8c3b1b58a9f97ae81ca2c7794cf97f7ab ChangeLog 1025
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
-MD5 9340afd03dd2c10530e4151120f8918e files/digest-systemtray-0.2 62
-RMD160 5801f2b0b95962c9340ce90542a4d5fa07f6f9d5 files/digest-systemtray-0.2 62
-SHA256 febd095dfa955b8c6c43726232a1aefff462560a8c8609d62584f01ca5bbb66d files/digest-systemtray-0.2 62
-MD5 9340afd03dd2c10530e4151120f8918e files/digest-systemtray-0.2-r1 62
-RMD160 5801f2b0b95962c9340ce90542a4d5fa07f6f9d5 files/digest-systemtray-0.2-r1 62
-SHA256 febd095dfa955b8c6c43726232a1aefff462560a8c8609d62584f01ca5bbb66d files/digest-systemtray-0.2-r1 62
+MD5 8497f98b3d69a86c46d2bb94560e079f files/digest-systemtray-0.2 232
+RMD160 3fa44f5d04cbbcc9adb44b8c0fbf74e4bb8af983 files/digest-systemtray-0.2 232
+SHA256 1f20b6ecabce4d85595b536db18a61145001f5d853230fd78461c30e815913bb files/digest-systemtray-0.2 232
+MD5 8497f98b3d69a86c46d2bb94560e079f files/digest-systemtray-0.2-r1 232
+RMD160 3fa44f5d04cbbcc9adb44b8c0fbf74e4bb8af983 files/digest-systemtray-0.2-r1 232
+SHA256 1f20b6ecabce4d85595b536db18a61145001f5d853230fd78461c30e815913bb files/digest-systemtray-0.2-r1 232
+MD5 8497f98b3d69a86c46d2bb94560e079f files/digest-systemtray-0.2-r2 232
+RMD160 3fa44f5d04cbbcc9adb44b8c0fbf74e4bb8af983 files/digest-systemtray-0.2-r2 232
+SHA256 1f20b6ecabce4d85595b536db18a61145001f5d853230fd78461c30e815913bb files/digest-systemtray-0.2-r2 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEc24VugEuf3OQ0akRAoJ0AJ9OWECeNFfbCPum5kv6Q0JWWiLFKACfUGhY
-z4N1CCG1wweDXvtnoMZfq1A=
-=XYBv
+iD4DBQFEjXnamdTrptrqvGERAj1xAJYvCttiPLH1WbIctAEJprVv5DrrAJwMd8PZ
+TXdbi51jkzyiFlRoVNrNBQ==
+=0XSo
 -----END PGP SIGNATURE-----
diff --git a/rox-base/systemtray/files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch b/rox-base/systemtray/files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch
new file mode 100644
index 000000000000..b0bf671afb16
--- /dev/null
+++ b/rox-base/systemtray/files/01_all_systemtray-0.2-ROX-CLib-2.1.6.patch
@@ -0,0 +1,47 @@
+diff -ur SystemTray-0.2/src/main.c SystemTray/src/main.c
+--- SystemTray-0.2/src/main.c	2003-07-12 17:51:14.000000000 +0100
++++ SystemTray/src/main.c	2005-10-18 18:44:40.000000000 +0100
+@@ -118,7 +118,7 @@
+ 
+   if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+     {
+-      applet_popup_menu(plug, menu, event);
++      rox_applet_popup_menu(plug, menu, event);
+       return TRUE;
+     }
+   return FALSE;
+@@ -160,12 +160,6 @@
+     return gdk_handler(display, error);
+ }
+ 
+-typedef struct applet_info {
+-  PanelLocation loc;
+-  int margin;
+-} AppletInfo;
+-AppletInfo *get_position(GtkWidget *plug);
+-
+ #define SHORT_OPS "hv"
+ 
+ #ifdef HAVE_GETOPT_LONG
+@@ -178,10 +172,10 @@
+ 
+ 
+ int main(int argc, char *argv[]) {
+-  AppletInfo *info = NULL;
++  ROXAppletInfo *info = NULL;
+   long window_id;
+   char c;
+-  PanelLocation location = PANEL_UNKNOWN;
++  ROXPanelLocation location = PANEL_UNKNOWN;
+   int long_index;
+   GtkWidget *align;
+   GtkWidget *eventbox;
+@@ -231,7 +225,7 @@
+       window_id = atol(argv[1]);
+       plug = gtk_plug_new(window_id);
+ 
+-      info = get_position(plug);
++      info = rox_applet_get_position(plug);
+       if (info) 
+ 	{
+ 	  location = info->loc;
diff --git a/rox-base/systemtray/files/digest-systemtray-0.2 b/rox-base/systemtray/files/digest-systemtray-0.2
index a7942d6316b7..82e7454f271e 100644
--- a/rox-base/systemtray/files/digest-systemtray-0.2
+++ b/rox-base/systemtray/files/digest-systemtray-0.2
@@ -1 +1,3 @@
 MD5 dd2bd6dafc99ae0fb7857dc40f5ff918 SystemTray-0.2.tgz 57894
+RMD160 7bf583e34dc90510ea1c5c143b22f1ddf54739ad SystemTray-0.2.tgz 57894
+SHA256 67624d61eb38651e0d7d8346a1e477b50dabd9fd7e8f284cdd76e09b8fa11b90 SystemTray-0.2.tgz 57894
diff --git a/rox-base/systemtray/files/digest-systemtray-0.2-r1 b/rox-base/systemtray/files/digest-systemtray-0.2-r1
index a7942d6316b7..82e7454f271e 100644
--- a/rox-base/systemtray/files/digest-systemtray-0.2-r1
+++ b/rox-base/systemtray/files/digest-systemtray-0.2-r1
@@ -1 +1,3 @@
 MD5 dd2bd6dafc99ae0fb7857dc40f5ff918 SystemTray-0.2.tgz 57894
+RMD160 7bf583e34dc90510ea1c5c143b22f1ddf54739ad SystemTray-0.2.tgz 57894
+SHA256 67624d61eb38651e0d7d8346a1e477b50dabd9fd7e8f284cdd76e09b8fa11b90 SystemTray-0.2.tgz 57894
diff --git a/rox-base/systemtray/files/digest-systemtray-0.2-r2 b/rox-base/systemtray/files/digest-systemtray-0.2-r2
new file mode 100644
index 000000000000..82e7454f271e
--- /dev/null
+++ b/rox-base/systemtray/files/digest-systemtray-0.2-r2
@@ -0,0 +1,3 @@
+MD5 dd2bd6dafc99ae0fb7857dc40f5ff918 SystemTray-0.2.tgz 57894
+RMD160 7bf583e34dc90510ea1c5c143b22f1ddf54739ad SystemTray-0.2.tgz 57894
+SHA256 67624d61eb38651e0d7d8346a1e477b50dabd9fd7e8f284cdd76e09b8fa11b90 SystemTray-0.2.tgz 57894
diff --git a/rox-base/systemtray/systemtray-0.2-r2.ebuild b/rox-base/systemtray/systemtray-0.2-r2.ebuild
new file mode 100644
index 000000000000..b58c9bb9148c
--- /dev/null
+++ b/rox-base/systemtray/systemtray-0.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/systemtray-0.2-r2.ebuild,v 1.1 2006/06/12 14:20:35 dragonheart Exp $
+
+# this patch makes system tray compatble with the new
+# ROX-CLib verion 2.1.6 and higher. See bug #78309
+inherit rox eutils
+
+MY_PN="SystemTray"
+PATCH_FN="01_all_systemtray-0.2-ROX-CLib-2.1.6.patch"
+DESCRIPTION="SystemTray is a notification area applet for ROX-Filer"
+HOMEPAGE="http://home.comcast.net/~andyhanton/software/"
+SRC_URI="http://home.comcast.net/~andyhanton/software/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+ROX_LIB_VER=1.9.10
+ROX_CLIB_VER=2.1.6
+
+APPNAME="${MY_PN}"
+S="${WORKDIR}"
+SET_PERM=true
+
+src_unpack() {
+	unpack ${A}
+	cd "${APPNAME}/src"
+	epatch "${FILESDIR}/${PATCH_FN}"
+}