New release: 0.23. Fix icon path in .desktop file, resolving bug #50295.

12 files changed, 85 insertions, 124 deletions

diff --git a/net-misc/grdesktop/ChangeLog b/net-misc/grdesktop/ChangeLog
index 3905bdf26317..1f8c82785acf 100644
--- a/net-misc/grdesktop/ChangeLog
+++ b/net-misc/grdesktop/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/grdesktop
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/ChangeLog,v 1.12 2004/04/27 21:38:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/ChangeLog,v 1.13 2004/06/09 05:36:21 leonardop Exp $
+
+*grdesktop-0.23 (09 Jun 2004)
+
+  09 Jun 2004; L. Boshell <leonardop@gentoo.org> grdesktop-0.23.ebuild:
+  New release.
+
+  08 Jun 2004; L. Boshell <leonardop@gentoo.org> grdesktop-0.22-r1.ebuild,
+  files/grdesktop-0.22-gcc2_fix.patch:
+  Added patch to fix compilation under gcc-2. Cosmetic fixes. Fix the
+  program's icon path in grdesktop.desktop, resolving bug #50295.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> grdesktop-0.22-r1.ebuild:
   Add inherit eutils
diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest
index 206d1121d7c7..c4665a63af9a 100644
--- a/net-misc/grdesktop/Manifest
+++ b/net-misc/grdesktop/Manifest
@@ -1,11 +1,8 @@
-MD5 9a54ee1dbefebd011518be2512d2aec5 ChangeLog 1810
-MD5 5398e29c4523acd1d36abafe7e0f8360 grdesktop-0.16.ebuild 882
-MD5 a6b07879c05fbe74cb38dee3561b352d grdesktop-0.17.ebuild 881
-MD5 1d18206adbd9ad7d4894b59df3defa0d grdesktop-0.19.ebuild 807
+MD5 7907b936cc4488c8a7141227671cbf6e ChangeLog 2061
+MD5 ff7336695c9fc328f9788b0c022c9152 grdesktop-0.23.ebuild 1377
+MD5 255e19be59b646ebf3e920efa3b71315 grdesktop-0.22-r1.ebuild 1352
 MD5 3028bfd8385ff166be48a323b5316d50 metadata.xml 220
-MD5 1d0d5713869f1328f4905c63368b3e2e grdesktop-0.22-r1.ebuild 1124
-MD5 8f5279603001dc6bdb032bb9e3a7376f files/digest-grdesktop-0.16 66
-MD5 bd45cda03c751d4e58d0b798d28822c6 files/digest-grdesktop-0.17 66
-MD5 c651f7b8ba78862ca01982f452964fd2 files/digest-grdesktop-0.19 66
+MD5 806d5e8650998f026e38540b9ba5b4d8 files/grdesktop-0.22-gcc2_fix.patch 681
+MD5 ce3778b120708f9ecf09d3ad4b4687e2 files/digest-grdesktop-0.23 66
 MD5 01661549d947b7edab52e75c03476c52 files/digest-grdesktop-0.22-r1 66
 MD5 c2269043464e0708e27a660f20f2ce66 files/0010_all_0.22-remove-double-makefile-syntax.patch 850
diff --git a/net-misc/grdesktop/files/digest-grdesktop-0.16 b/net-misc/grdesktop/files/digest-grdesktop-0.16
deleted file mode 100644
index be1546b7a664..000000000000
--- a/net-misc/grdesktop/files/digest-grdesktop-0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1b5a11870afe9eaa172f4600b3564bc grdesktop-0.16.tar.gz 391114
diff --git a/net-misc/grdesktop/files/digest-grdesktop-0.17 b/net-misc/grdesktop/files/digest-grdesktop-0.17
deleted file mode 100644
index 944980a7b500..000000000000
--- a/net-misc/grdesktop/files/digest-grdesktop-0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9bba114a6729d01073ff846db10d304 grdesktop-0.17.tar.gz 394086
diff --git a/net-misc/grdesktop/files/digest-grdesktop-0.19 b/net-misc/grdesktop/files/digest-grdesktop-0.19
deleted file mode 100644
index f1f05c87e773..000000000000
--- a/net-misc/grdesktop/files/digest-grdesktop-0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00b0168b5fcdd1d324ecbf7debcb018f grdesktop-0.19.tar.gz 420683
diff --git a/net-misc/grdesktop/files/digest-grdesktop-0.23 b/net-misc/grdesktop/files/digest-grdesktop-0.23
new file mode 100644
index 000000000000..dc33bb7ce6b2
--- /dev/null
+++ b/net-misc/grdesktop/files/digest-grdesktop-0.23
@@ -0,0 +1 @@
+MD5 46f8f3e2d4aa2433b8b1537fefa8a4b7 grdesktop-0.23.tar.gz 299914
diff --git a/net-misc/grdesktop/files/grdesktop-0.22-gcc2_fix.patch b/net-misc/grdesktop/files/grdesktop-0.22-gcc2_fix.patch
new file mode 100644
index 000000000000..12a37719956b
--- /dev/null
+++ b/net-misc/grdesktop/files/grdesktop-0.22-gcc2_fix.patch
@@ -0,0 +1,20 @@
+diff -NurdB grdesktop-0.22-orig/src/options.c grdesktop-0.22/src/options.c
+--- grdesktop-0.22-orig/src/options.c	2004-06-08 23:27:14 -0500
++++ grdesktop-0.22/src/options.c	2004-06-08 23:27:42 -0500
+@@ -487,6 +487,7 @@
+ 
+ 		while((entry = readdir(licence_dir)) != NULL) {
+ 			gchar *fullname = NULL;
++			char *hostname;
+ 			struct stat sts;
+ 
+ 			fullname = g_strdup_printf("%s/%s", licence_path,
+@@ -500,7 +501,7 @@
+ 			if(strlen(entry->d_name) <= strlen(prefix))
+ 				continue;
+ 
+-			gchar *hostname = &entry->d_name[strlen(prefix)];
++			hostname = &entry->d_name[strlen(prefix)];
+ 			licence_list = g_list_append(licence_list, g_strdup(hostname));
+ 		}
+ 		closedir(licence_dir);
diff --git a/net-misc/grdesktop/grdesktop-0.16.ebuild b/net-misc/grdesktop/grdesktop-0.16.ebuild
deleted file mode 100644
index 2d85456f232b..000000000000
--- a/net-misc/grdesktop/grdesktop-0.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.16.ebuild,v 1.6 2004/04/27 21:38:29 agriffis Exp $
-
-DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.0.6-r3
-	>=net-misc/rdesktop-1.1.0.19.9.0
-	app-text/docbook-sgml-utils"
-
-#RDEPEND=""
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf \
-	    --host=${CHOST} \
-	    --prefix=/usr \
-	    --infodir=/usr/share/info \
-	    --datadir=/usr/share \
-	    --mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	einstall
-
-	dodoc AUTHORS ABOUT-NLS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-misc/grdesktop/grdesktop-0.17.ebuild b/net-misc/grdesktop/grdesktop-0.17.ebuild
deleted file mode 100644
index 420fbe47217e..000000000000
--- a/net-misc/grdesktop/grdesktop-0.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.17.ebuild,v 1.5 2004/04/27 21:38:29 agriffis Exp $
-
-DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.0.6-r3
-	>=net-misc/rdesktop-1.1.0.19.9.0
-	>=app-text/docbook2X-0.6.1"
-
-#RDEPEND=""
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf \
-	    --host=${CHOST} \
-	    --prefix=/usr \
-	    --infodir=/usr/share/info \
-	    --datadir=/usr/share \
-	    --mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	einstall
-
-	dodoc AUTHORS ABOUT-NLS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-misc/grdesktop/grdesktop-0.19.ebuild b/net-misc/grdesktop/grdesktop-0.19.ebuild
deleted file mode 100644
index b2275a85731a..000000000000
--- a/net-misc/grdesktop/grdesktop-0.19.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.19.ebuild,v 1.5 2004/04/27 21:38:29 agriffis Exp $
-
-DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.0.6-r3
-	>=net-misc/rdesktop-1.1.0.19.9.0
-	>=app-text/docbook2X-0.6.1"
-
-#RDEPEND=""
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf \
-	    --with-keymap-path=/usr/share/rdesktop/keymaps || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	einstall
-
-	dodoc AUTHORS ABOUT-NLS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-misc/grdesktop/grdesktop-0.22-r1.ebuild b/net-misc/grdesktop/grdesktop-0.22-r1.ebuild
index fad4aa5f151f..9af12333d8ff 100644
--- a/net-misc/grdesktop/grdesktop-0.22-r1.ebuild
+++ b/net-misc/grdesktop/grdesktop-0.22-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.22-r1.ebuild,v 1.4 2004/04/27 21:38:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.22-r1.ebuild,v 1.5 2004/06/09 05:36:21 leonardop Exp $
 
 inherit eutils
 
 DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop"
+HOMEPAGE="http://www.nongnu.org/grdesktop/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc amd64"
 
-IUSE=""
+IUSE="doc"
 
 RDEPEND=">=x11-libs/gtk+-2.0.6-r3
 	>=net-misc/rdesktop-1.1.0.19.9.0
@@ -23,7 +23,16 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/docbook2X )
 	app-text/scrollkeeper"
 
-S="${WORKDIR}/${P}"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix invalid C code that breaks compilation under gcc 2.
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
+
+	# Correct icon path. See bug #50295.
+	sed -i -e 's:Icon=.*:Icon=grdesktop/icon.png:' grdesktop.desktop
+}
 
 src_compile() {
 	econf \
diff --git a/net-misc/grdesktop/grdesktop-0.23.ebuild b/net-misc/grdesktop/grdesktop-0.23.ebuild
new file mode 100644
index 000000000000..fda97c391e9e
--- /dev/null
+++ b/net-misc/grdesktop/grdesktop-0.23.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.23.ebuild,v 1.1 2004/06/09 05:36:21 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gtk2 frontend for rdesktop"
+HOMEPAGE="http://www.nongnu.org/grdesktop/"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64"
+
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=gnome-base/libgnomeui-2
+	net-misc/rdesktop
+	>=gnome-base/gconf-2"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper"
+
+G2CONF="${G2CONF} --with-keymap-path=/usr/share/rdesktop/keymaps/"
+
+docs="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Correct icon path. See bug #50295.
+	sed -i -e 's:Icon=.*:Icon=grdesktop/icon.png:' grdesktop.desktop
+}