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

(Portage version: 2.1)

6 files changed, 94 insertions, 1 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/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}"
+}