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

Package-Manager: portage-2.1.11.11/cvs/Linux x86_64

5 files changed, 129 insertions, 24 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/Manifest b/x11-wm/openbox/Manifest
index e384149dbd2c..2743fc022eaf 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openbox-3.4.11.2-parallel-install.patch 366 SHA256 63f6e407461e071103009225a98ad0fb5d1b911ad28ea71a79c0b0e89efb5a8c SHA512 c9245dbff2917ce68c76e967b21d1b23e2c074a5923008371bbdaab8ed9e1f4ddea6870b0b6588499242362fcb4bebc32f9922712e37b4fa69feec1c98c8831b WHIRLPOOL e36fd6d4160b1196fa36e16e281c97aadf8f0623030b85aac38a2d60586b9d105270c6dbf173a1b0c975523eaf7ee72b000255216107d175df653ada3f2f6df4
 AUX openbox-3.5.0-configure-imlib2.patch 413 SHA256 a7d2f26033ae2424426c90a265db50d8349cc53d3d80eb6e7d3efa73fc28db36 SHA512 ababb000ae6b57dd2015ded6f2a1b735dc6fad6d874f636a9373dac7ae02d71a41a325e0ed58826d581b39c175c895e61b3cad995ce3cabed12aed737eaf9ccd WHIRLPOOL 571832c4352a42f81321272492e359824917a3212bde932bc760ad562385190ecaf4c5e977ce2a016aa65bb4b3b2f977cf72e3afb959894ed5e133423d6aa8df
+AUX openbox-3.5.0-fix-desktop-files.patch 2246 SHA256 64e54c2fed44a96ec4b36df70f2c5f2d0efe2654a801f704992255ae6cf3f9db SHA512 b67f75f0e95e4e0b6c019ba26a156a0c6a78dbeed7496db5bf1716a50ccb08e21da4d034f0b58c5c5f74cd21152e640de81141590c0394f080e6bd3f4185498d WHIRLPOOL 048131f01e226a63f323c9e0da53fd33390255ded05b87a98f9dc314ab6d97fd900c7a25600fb10a878c4cbae1eee089025cf1a9c55b56ce0d09eaf6fc7f7fab
 AUX openbox-3.5.0-gtk34.patch 1153 SHA256 c5497245539605a02b465aad228c16e44f4969ad55f67c89711a7565cd508d44 SHA512 bca42e03a656cf876f04f84e2c1a68c549aec6f1523016443c593795ae43ffb3cb96dcd5ae04830c0e04f6528d650335f70b1cf8c5aa167ea5a6fbf76dd2d493 WHIRLPOOL c40219fbff41c8d398e15546d20f095c7cccde30f2bddb8ff48a8c0c577cca0c13d52928db75ee3a548ca6cda55f77694c3aea2fd20c688d1a983e189a3e928d
 AUX openbox-as-needed.patch 413 SHA256 48f38ab155a15320fb4c9a447a58e27fac2b74eb4a5504cd0b7707ae5384703a SHA512 681b86b106674f47ed11cc2a68288b3c5ba78a148bd663d9861b904fa2cfc2f3d2f4bbc2e75e1fb28d7af40409818b1c123ddf1bfb67c4e62064d16506fe0621 WHIRLPOOL 12a2064a5c6a24318a3122ae4a3bcdd3c0c3721f654fb42f4d30ed4c824debfc9b129b2039bd20a253c6c7db72de002597e420ff7f103fd0073362176ff48696
 AUX openbox-gnome-session-3.4.9.patch 449 SHA256 0fbbf60ba8ce2503d307cf55b6467b3cf53e01d32deff1417e3afbf6397d9eb5 SHA512 03b828152ca6c38d2bf9962a254d911179248173642c0ddd3af0023ff93b6d3c479f12d411f7119fb1ca476b1ac03b807c0f83ef159e08ed4caa21269f7f0e87 WHIRLPOOL 172f2c5b031ed68918795feaf4464241cf55ee8064638e45bfebbfe4c684b6400ab609b1b034cc327be0fa8deedf79d17cc477d894c0b3fd5035c47046bf5bc5
@@ -7,8 +11,25 @@ DIST openbox-3.5.0.tar.gz 911834 SHA256 6fa90016530b3aa6102e25407946197743939853
 DIST openbox-3.5.0_p20111019.tar.gz 475441 SHA256 de9af320f67e46d6ee2d09cb577e4fde954b35733497d08fd3e6f188accba408 SHA512 d20a5ce0e69c6a6be95b451a254f4d3c03f6c746d1f0365d261962a31ef6ca0aa8f6f6b404deef0ea8f1737d96983c1e04123a561b26e740de854c93ab29666f WHIRLPOOL 2b561957e31154b65e128a3659980d45895ca09508253c0178a70c4305dc42de30413e4ce3cb6b014fdd894a346be04ca77dd74a3fae8b078f7e3e9c85a9cae8
 DIST surreal-gentoo.tar.gz 13410 SHA256 f478c58b2b6cd7a2a2ebe53fa261adb2d1fddf188f059d238b1b69ecc8701626 SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e WHIRLPOOL c9b406f4d822c8ce250bf8f30c9ad6bab75a0c1889a5b60061b83e44c06fd386f60c69ace176672d1a9658f4aa82fc82daaef205630c15c4711019cb48cca7ad
 EBUILD openbox-3.5.0-r1.ebuild 1817 SHA256 d256b1026aec70f890810767721dba9e04897c8bbb38cef14c7e4bd7c4137bd5 SHA512 acbc316fa6c1e650aa0058b6bac4ed611126e8778b9ececc2cec59422544d1c8c28b6c6425799f39ff595bd4072b77223f25d743c55d70f00f6ac22513f749a5 WHIRLPOOL 0fe19b114a009262fd3f3e2a74b5f1cdb7c36dce29f9947a3130de45484f3a13ae9615f9f611ea1c4ac0ce8b52fcd303a10751af3c682c8385f7ae6d935dab07
-EBUILD openbox-3.5.0_p20111019-r1.ebuild 2331 SHA256 7cb6f8525c2950c8416b6a8d74d469c2eaead7cb341bd27120ae2d7e7fa6c352 SHA512 2f7747d9962a420dc2e1db4727645aee83a98c5a379967c7adee0ef65a0848af3466422c4fae0412ae5f28a3130dd765221b1be030397585f629f76e5f92a5a7 WHIRLPOOL 117ebfa6500d9c2e57d6a13c6e1dda67affb550f104b671174f4c9c0f885c81749d4c1eff64e4a6a1e5bef5d0e462f84f26418cdc38c381a75c6b49dfaff5518
+EBUILD openbox-3.5.0_p20111019-r2.ebuild 2335 SHA256 026552dfc6c9348f73b7ede532007d5fd356cdd5a4aa00ea1982e3c1565612b4 SHA512 222f5d2fe21ad8e5cba6b7af5ae88b896247f13b0645a7ca209dbdc9920b07dc186d8718a021726d47c159a0713e2926e952f3b14d9769a1a8b7132bcef1583b WHIRLPOOL c8ee40d6b9f22c6383554fd0bea6f791c271ebba13ed8a1ed92525d49543568bf7f1671d83c22c76f726daa8973f8fc14a3b246bafa2cc6596f4a9651767b287
 EBUILD openbox-3.5.0_p20111019.ebuild 1837 SHA256 f2f2cc2f0fa43144f2067bf034f343aad61162759abbed64b50df02dd4d2b18a SHA512 a2c105cbb3f321a33855493b821be02fc08afea7b5c61dfef906f20e80ab4ae12d3f43baefd970909211cd76a4ea9205067fd1b95807a2a200e25087c7cb33a7 WHIRLPOOL c464bf8dd8fd198622fbb9c096207c8899de7001f7da73d06e8fa2261d5c4ae01dfb575a6d7778720bec92d9779ce4e7799b953d609963014420872e623385ea
-EBUILD openbox-9999.ebuild 2360 SHA256 fe7b2768b68880525cbb389ad59c0703f16a901099514041697817e6668cb940 SHA512 56e4524e8927089a3f3baf6c601c5aeedc5f84229b9bda85ce20562f2782ea42acc1140120203a4cfa8b45ca74943319f297e799fc54c9080a29234a3c843240 WHIRLPOOL d3f9cf3efe78f36d6d9f9b8b3befb23fcde0f6a9e1b2d6fe0700b8a5b687b132ad74285da7a159e41d55db73fd75800438ba923c9d76195617b154767fc06fa3
-MISC ChangeLog 38692 SHA256 5d61c54740450939121be4b23a8e4c220293a3366c6d85adb2861ee23a39ec68 SHA512 427b296ecadf56d338c59e50c44de64107d96bef6350477088f992ed5db7e34b0f5e18202be79952b29da9d9cfd39880c033f403c07a910f8e2d7d87b8fbf5e7 WHIRLPOOL e64497badec216a43360cbde8baea484f408eba490516a7673c38b0561e5658c65505db33ee3061b87adfc04f12d4e15d2d13ffa9779cee715edfc53ecf01d36
+EBUILD openbox-9999.ebuild 2303 SHA256 bff2cd5ca027a07e16e4c87c176c5dde26795eafdaad931d5116ec24fb51d95b SHA512 a217ed2c5ff94c5943282874b7290f1c0703655d1e9040cc70d1f97aeb6fe350801e390118e1d681058899c69394339a5d33085258460fd28bde120a0af4b44b WHIRLPOOL 49fb2e6c79ed81250cced0b4800cd46cf0af157f638cb824bdfa0706748371569756aff29eaaaf8e7165d9550aea192220610e2b725326050662a25b9dae9366
+MISC ChangeLog 39068 SHA256 ad765308361c6002c148b822018076c4fa23dc2bf3908a29429dc2c8bfcb0624 SHA512 4149a681a87d21268067784c690053a3715b850ab68b7291ede6c822b38f83032e8ec3311e5274448ea37bae5739aa031510f08da059b0f4809fe096b6e4eac3 WHIRLPOOL 1158d6802f87d909ab263ec3bc8c7ea2a807f9317781ad937bfdc82e34ab533af530b2e19eed33b9764d37499f12a95eb6fcda9f2597b52356217a1808661b57
 MISC metadata.xml 700 SHA256 42ce3ab980f8cf6077d16381a147008ddaede31d04cac6847359ac38c69a88c6 SHA512 5051524c6f8067718d456417df39edc6265c3007866bbe524b450c6343aca5029c9a1a1eef22996d383aec6d9c668f034e59b198bf2d5b70960c246cf188ddcc WHIRLPOOL 8206ff8ff85d048e6922e3f23c8d855593f0a16d76ab8070e9b95dece672bb97b834bbf32dd1cc5f042e20f2655d21316e104e5269a774001a94c5613d8b1f78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQO0wNAAoJEPqDWhW0r/LC0LAP+gPnuZGVSyi3UthI0H77taH1
+CEr3L6TMtkQsCwB0jsinGwXJHRoMNheg/4/5yMvjXFoYUmTxakrpg2M5DFLo0DF3
+9cbkCq7RQVbqqjLlz0VJgnh5IAIa+x9xJodzPNKIgU7ztdUlhhuAMUPe96w/VdLs
+VpOULIMVdeR4PThSg6Pjsz4w+ZKzrsjvtzmqINdtYSSwpYuG8Z6PS8vKB2hOkuHe
+phGcPvgwvMCm3ZyKwLVeykQ3/2u4dqKe2maDpE/4XIhC2RdS+X8rapZDpoDMLwG7
+nbtP11exT0N2AbW+zfm5ESntBH0r+gnvzP8B3zk0obGtK6+Zt7/KpzJQp7Pksj4J
+dAyJrsX4AjS+ad+zzy5LYmnkRxrZEhkpUYUYT+NnW9v+T/CGWn6823D2zJiT4GFa
+Cjyf/tVtqhpr13Y3r+Dww2U5+QL6MFWTjl3wH67EGWGAEasbkBBlHK7zKZ51zc7v
+jX1AfedkGi7kwolLGvquKtc82be1KPpjBFZGGKMKtmLk2ciUXXk5kq5GhwPDpnEE
+A3ivO8op4kdTfMmz3UjJkur5xs1rj8U5I3n7qwuFOVb5Eo6tloY21tF1MsGNL2fx
+UBQN3HFJIQ2a2/FP+tBezaHNXdm8pOoHgcqoBIO0mHuV4zZcXzxjKhHS7P/+R1mt
+ltHfjzfIAoaviMd5KvPZ
+=SKN/
+-----END PGP SIGNATURE-----
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
 }