add patch to avoid crash on Save Display Settings, bug #58063

5 files changed, 70 insertions, 2 deletions

diff --git a/app-misc/rox/ChangeLog b/app-misc/rox/ChangeLog
index ef5e5f8bd901..ebcc677a287e 100644
--- a/app-misc/rox/ChangeLog
+++ b/app-misc/rox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/rox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/ChangeLog,v 1.31 2004/07/20 17:31:47 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/ChangeLog,v 1.32 2004/08/02 08:07:33 lanius Exp $
+
+*rox-2.1.2-r1 (02 Aug 2004)
+
+  02 Aug 2004; Heinrich Wendel <lanius@gentoo.org> rox-2.1.2-r1.ebuild,
+  files/2.1.2-crash-save-display-settings.patch.bz2:
+  add patch to avoid crash on Save Display Settings, bug #58063
 
   20 Jul 2004; Heinrich Wendel <lanius@gentoo.org> rox-2.1.2.ebuild:
   make use of the svg useflag, mark stable on x86
diff --git a/app-misc/rox/Manifest b/app-misc/rox/Manifest
index 4f8416acbf1f..86e87d4cbca8 100644
--- a/app-misc/rox/Manifest
+++ b/app-misc/rox/Manifest
@@ -1,10 +1,13 @@
 MD5 3e120dc78986425a06869aa67e7802ca rox-1.3.8.ebuild 988
 MD5 91e177ff65eb56ae49addc5af4100f06 rox-2.1.2.ebuild 1367
 MD5 a70e66be5239d3edca7647afb969e077 rox-2.0.1.ebuild 1154
+MD5 12304275ee9463b5622d2f31984e20a3 rox-2.1.2-r1.ebuild 1491
 MD5 b0fb821a4de5fc6fdc59d3f56f786c15 rox-2.1.1.ebuild 1326
-MD5 63be83c0b88b2f226874c41aca78e1f6 ChangeLog 3800
+MD5 a82c583526fb150af3f5ca049e6fb234 ChangeLog 4019
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 526e20f6955fdb00bf18b1efec738419 files/digest-rox-1.3.8 59
 MD5 afcd1529de493af9538a32697d7e9425 files/digest-rox-2.0.1 59
 MD5 28718b65c90c80b4504087b0a962c5b7 files/digest-rox-2.1.1 59
 MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2 59
+MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2-r1 59
+MD5 16ef34ea63806f156b1cf68e34055f12 files/2.1.2-crash-save-display-settings.patch.bz2 1910
diff --git a/app-misc/rox/files/2.1.2-crash-save-display-settings.patch.bz2 b/app-misc/rox/files/2.1.2-crash-save-display-settings.patch.bz2
new file mode 100644
index 000000000000..829372619e07
--- /dev/null
+++ b/app-misc/rox/files/2.1.2-crash-save-display-settings.patch.bz2
diff --git a/app-misc/rox/files/digest-rox-2.1.2-r1 b/app-misc/rox/files/digest-rox-2.1.2-r1
new file mode 100644
index 000000000000..c0541385a950
--- /dev/null
+++ b/app-misc/rox/files/digest-rox-2.1.2-r1
@@ -0,0 +1 @@
+MD5 c08a28f259e7e4bb01b56ed174ea7c12 rox-2.1.2.tgz 1758210
diff --git a/app-misc/rox/rox-2.1.2-r1.ebuild b/app-misc/rox/rox-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..e7f57893a24a
--- /dev/null
+++ b/app-misc/rox/rox-2.1.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.2-r1.ebuild,v 1.1 2004/08/02 08:07:33 lanius Exp $
+
+inherit eutils
+
+DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
+HOMEPAGE="http://rox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rox/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+
+DEPEND=">=x11-libs/gtk+-2.0.5
+	>=dev-libs/glib-2.0.4
+	>=dev-libs/libxml2-2.4.23
+	>=x11-misc/shared-mime-info-0.9
+	svg? ( gnome-base/librsvg )"
+
+IUSE="svg"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/2.1.2-crash-save-display-settings.patch.bz2
+}
+
+src_compile() {
+#	rm ROX-Filer/src/configure # see bug #26162
+	ROX-Filer/AppRun --compile || die "make failed"
+	(cd ROX-Filer/src; make clean) > /dev/null
+}
+
+src_install() {
+	doman rox.1
+
+	dodir /usr/bin
+	cp -rf ROX-Filer/ ${D}/usr/share/
+	echo "#!/bin/sh" > "${D}/usr/bin/rox"
+	echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${D}/usr/bin/rox"
+	chmod a+x ${D}/usr/bin/rox
+
+	insinto /usr/share/mime/packages
+	doins rox.xml
+
+	dodir /usr/share/
+	cp -rf Choices ${D}/usr/share/
+	dodir /usr/share/Choices/Mime-icons
+	keepdir /usr/share/Choices/Mime-icons
+
+	dodir /usr/share/icons
+	dosym /usr/share/ROX-Filer/ROX /usr/share/icons/ROX
+}
+
+pkg_postinst() {
+	update-mime-database /usr/share/mime
+}