fix desktop files according to fd.o desktop entry specifications. Thanks to Julian Ospald <hasufell@gentoo.org>. Bug #431784

(Portage version: 2.1.11.11/cvs/Linux x86_64)

4 files changed, 105 insertions, 21 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 7fde294df7fb..9dee10fc5843 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.251 2012/08/25 22:49:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.252 2012/08/27 10:29:27 hwoarang Exp $
+
+*openbox-3.5.0_p20111019-r2 (27 Aug 2012)
+
+  27 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/openbox-3.5.0-fix-desktop-files.patch,
+  +openbox-3.5.0_p20111019-r2.ebuild, -openbox-3.5.0_p20111019-r1.ebuild,
+  openbox-9999.ebuild:
+  fix desktop files according to fd.o desktop entry specifications. Thanks to
+  Julian Ospald <hasufell@gentoo.org>. Bug #431784
 
   25 Aug 2012; Agostino Sarubbo <ago@gentoo.org>
   openbox-3.5.0_p20111019-r1.ebuild:
diff --git a/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch b/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
new file mode 100644
index 000000000000..af37e1040b1d
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
@@ -0,0 +1,74 @@
+https://bugs.gentoo.org/show_bug.cgi?id=431784

+

+fix desktop files according to fd.o desktop entry specifications

+

+diff --git a/data/gnome-wm-properties/openbox.desktop b/data/gnome-wm-properties/openbox.desktop

+index 67e49e4..266c147 100644

+--- a/data/gnome-wm-properties/openbox.desktop

++++ b/data/gnome-wm-properties/openbox.desktop

+@@ -7,7 +7,7 @@ Exec=openbox

+ X-GNOME-WMName=Openbox

+ 

+ # our config tool

+-ConfigExec=obconf

++X-ConfigExec=obconf

+ 

+-[Window Manager]

++[X-Window Manager]

+ SessionManaged=true

+diff --git a/data/openbox.desktop b/data/openbox.desktop

+index d49ae22..631778b 100644

+--- a/data/openbox.desktop

++++ b/data/openbox.desktop

+@@ -1,6 +1,5 @@

+ [Desktop Entry]

+ Type=Application

+-Encoding=UTF-8

+ Name=Openbox

+ Exec=openbox

+ Icon=openbox

+diff --git a/data/xsession/openbox-gnome.desktop.in b/data/xsession/openbox-gnome.desktop.in

+index 19ae82e..24931b5 100644

+--- a/data/xsession/openbox-gnome.desktop.in

++++ b/data/xsession/openbox-gnome.desktop.in

+@@ -1,8 +1,7 @@

+ [Desktop Entry]

+-Encoding=UTF-8

+ Name=GNOME/Openbox

+ Comment=Use the Openbox window manager inside of the GNOME desktop environment

+ Exec=@bindir@/openbox-gnome-session

+ TryExec=gnome-session

+-Icon=openbox.png

+-Type=XSession

++Icon=openbox

++Type=Application

+diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in

+index ddfc72d..bc78a97 100644

+--- a/data/xsession/openbox-kde.desktop.in

++++ b/data/xsession/openbox-kde.desktop.in

+@@ -1,8 +1,7 @@

+ [Desktop Entry]

+-Encoding=UTF-8

+ Name=KDE/Openbox

+ Comment=Use the Openbox window manager inside of the K Desktop Environment

+ Exec=@bindir@/openbox-kde-session

+ TryExec=startkde

+-Icon=openbox.png

+-Type=XSession

++Icon=openbox

++Type=Application

+diff --git a/data/xsession/openbox.desktop.in b/data/xsession/openbox.desktop.in

+index 0914e5b..21669cf 100644

+--- a/data/xsession/openbox.desktop.in

++++ b/data/xsession/openbox.desktop.in

+@@ -1,8 +1,7 @@

+ [Desktop Entry]

+-Encoding=UTF-8

+ Name=Openbox

+ Comment=Log in using the Openbox window manager (without a session manager)

+ Exec=@bindir@/openbox-session

+ TryExec=@bindir@/openbox-session

+-Icon=openbox.png

+-Type=XSession

++Icon=openbox

++Type=Application

diff --git a/x11-wm/openbox/openbox-3.5.0_p20111019-r1.ebuild b/x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild
index 34713129569a..4d41d6b85d29 100644
--- a/x11-wm/openbox/openbox-3.5.0_p20111019-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019-r1.ebuild,v 1.3 2012/08/25 22:49:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild,v 1.1 2012/08/27 10:29:27 hwoarang Exp $
 
 EAPI="2"
 inherit multilib autotools eutils
@@ -38,6 +38,7 @@ S="${WORKDIR}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
 	epatch "${FILESDIR}"/${P/_p*/}-gtk34.patch
+	epatch "${FILESDIR}"/${P/_p*/}-fix-desktop-files.patch
 	sed -i -e "s:-O0 -ggdb ::" "${S}"/m4/openbox.m4 || die
 	epatch_user
 	eautopoint
@@ -61,15 +62,15 @@ src_install() {
 	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
 	fperms a+x /etc/X11/Sessions/${PN}
 	emake DESTDIR="${D}" install || die "emake install failed"
-    if use branding; then
-        insinto /usr/share/themes
-        doins -r "${WORKDIR}"/Surreal_Gentoo
-        # make it the default theme
-        sed -i \
-            "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
-            "${D}"/etc/xdg/openbox/rc.xml \
-            || die "failed to set Surreal Gentoo as the default theme"
-    fi
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			"/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
 	! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
 	! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
 }
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index e81894a2af6e..eaeaa65f3aed 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.18 2012/08/25 09:41:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.19 2012/08/27 10:29:27 hwoarang Exp $
 
 EAPI="2"
 inherit multilib autotools eutils git-2
@@ -62,15 +62,15 @@ src_install() {
 	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
 	fperms a+x /etc/X11/Sessions/${PN}
 	emake DESTDIR="${D}" install || die "emake install failed"
-    if use branding; then
-        insinto /usr/share/themes
-        doins -r "${WORKDIR}"/Surreal_Gentoo
-        # make it the default theme
-        sed -i \
-            "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
-            "${D}"/etc/xdg/openbox/rc.xml \
-            || die "failed to set Surreal Gentoo as the default theme"
-    fi
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			"/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
 	! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
 	! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
 }