fixed freewrl.desktop as per bug 495108

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

4 files changed, 26 insertions, 5 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 5143b05ab5d0..adeb24d9132c 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.52 2013/08/09 13:42:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.53 2013/12/23 16:20:49 axs Exp $
+
+*freewrl-1.22.13-r3 (23 Dec 2013)
+
+  23 Dec 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/freewrl-1.22.13-desktop.patch, +freewrl-1.22.13-r3.ebuild,
+  -freewrl-1.22.13-r2.ebuild, freewrl-9999.ebuild:
+  fixed freewrl.desktop as per bug 495108
 
   09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13-r1.ebuild,
   freewrl-1.22.13-r2.ebuild, freewrl-9999.ebuild:
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
new file mode 100644
index 000000000000..6d620b7ab94b
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
@@ -0,0 +1,11 @@
+--- a/freewrl-1.22.13/data/freewrl.desktop	2009-06-08 06:26:21.000000000 -0400
++++ b/freewrl-1.22.13/data/freewrl.desktop	2013-12-23 10:45:54.916307951 -0500
+@@ -3,7 +3,7 @@
+ Name=FreeWRL
+ Comment=View X3D and VRML files
+ Exec=/usr/bin/freewrl
+-Icon=freewrl.png
++Icon=freewrl
+ Terminal=false
+ Type=Application
+ Categories=Graphics;3DGraphics;Viewer;
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
index 15cddc34eb21..f82a52194771 100644
--- a/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild,v 1.2 2013/08/09 13:42:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.1 2013/12/23 16:20:49 axs Exp $
 
 EAPI=5
 
@@ -50,6 +50,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${P}-desktop.patch
 }
 
 src_configure() {
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 9817df094e74..63e8c0753f69 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.2 2013/08/09 13:42:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.3 2013/12/23 16:20:49 axs Exp $
 
 EAPI=5
 
@@ -70,13 +70,15 @@ src_configure() {
 	# list of js libs without .pc support, to disable ./configure auto-checking
 	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
 	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
-	local spidermonkeys_pc=( mozjs17 mozjs187 mozjs185 )
+	local spidermonkeys_pc=( mozjs187 mozjs185 )
 
 	local myconf="--enable-fontconfig
 		--without-expat
+		--without-glu
 		--with-x
 		--with-imageconvert=/usr/bin/convert
 		--with-unzip=/usr/bin/unzip
+		--disable-mozjs-17.0
 		${spidermonkeys[@]/#/ --disable-}"
 
 	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
@@ -111,7 +113,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable sox sound) \
 		$(usex sox "--with-soundconv=/usr/bin/sox") \
-		$(usex motif "--with-target=motif" "--with-target=X11") \
+		$(usex motif "--with-target=motif" "--with-target=x11") \
 		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
 }