Fix libwnck check thanks to Rafał Mużyło <galtgendo@o2.pl>. Bug #415595

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

4 files changed, 37 insertions, 17 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index ba7231219a88..700df10d749a 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.41 2012/05/12 15:12:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.42 2012/05/12 17:53:22 hwoarang Exp $
+
+  12 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/lxpanel-0.5.9-libwnck-check.patch, lxpanel-0.5.9.ebuild:
+  Fix libwnck check thanks to Rafał Mużyło <galtgendo@o2.pl>. Bug #415595
 
   12 May 2012; Markos Chandras <hwoarang@gentoo.org> lxpanel-0.5.9.ebuild:
   disable wnckpager plugin. bug #415519
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 1bd8fb307d5a..d45d5ca9f0d7 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -9,6 +9,7 @@ AUX lxpanel-0.5.7-tooltip-netstatus.patch 1084 RMD160 323191b9177b50ff44ab61b91d
 AUX lxpanel-0.5.8-battery-meter.patch 939 RMD160 eaf55c514a433b8a62f27837b6d68f4523c3b9cd SHA1 34cc4fd3ee4ac867c463d97d3b703493224ba14d SHA256 c65b77e37b682b32a713904ff03b66e074c4d5ae701449e68310e075c3e2d4c3
 AUX lxpanel-0.5.8-dynamic-width.patch 1616 RMD160 e6c14456ea3451fc530f77d2d90f401bc4989138 SHA1 c7b20e50a21a26db5c0c5342b7b3d59dcc5d287c SHA256 4588d3c75f1c3e90e59a0ff686333581117910f8d8ab5b33917c6f0c4976efb1
 AUX lxpanel-0.5.8-thermal-plugin.patch 11680 RMD160 5421f7c92d9a3b23c98cbc7626099a37f8d03565 SHA1 b9f54c0d233febb08b7c804457d90f57b2434fda SHA256 959bb8d666a21d3b2aad3e22d7b5ed2d688978d64c74703ba098a9724d4595bd
+AUX lxpanel-0.5.9-libwnck-check.patch 413 RMD160 5d35b975af4b36dcb6a2e5531b857e695362fefa SHA1 26faab06fcb063e9a7f60e26e5d4d72ffa5b4eae SHA256 6b3c3d420284eccf0fa14e0a377a4d1f4c9141989bb7b76400081d8e55dd5817
 AUX lxpanel-0.5.9-sandbox.patch 1104 RMD160 52a0d94073e5138502a969a3811f9feaaf07c3e8 SHA1 c0413cc29f917244ded9b993667b377ffb4633c4 SHA256 7aeb18548f11910d4db781da219bbcbe36ac5eec0b21a6efc0fa4234221009ff
 DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7e SHA1 fc5483e6016ac52c38b38274cca7661f2aa828ab SHA256 9c04839e2d23feec8b107a1d76899aca645416862b4b6ca01f8db743944348e1
 DIST lxpanel-0.5.7.tar.gz 1166355 RMD160 489dc9515ab0f6bac5136a0c4c93fbcb26f48e97 SHA1 276168fb4560899e83a6a340448c961d63333717 SHA256 89d1b55b207e61b7b7433cb51302bdbee644fb78b5b57892d67cb19072f548a1
@@ -20,23 +21,23 @@ EBUILD lxpanel-0.5.8-r1.ebuild 1513 RMD160 6de6cfe7a008e41e586b6397b5aa1208f1b8d
 EBUILD lxpanel-0.5.8-r2.ebuild 1561 RMD160 0b232d211f70acec4a7967c4ed156dddf70e9edc SHA1 a4dc7772ab24b633aa6c25f69e3e5824561e638b SHA256 c56f1f2b13da5975ac6eb49b5d0d06ef08749548271713dd9d280b8c11658803
 EBUILD lxpanel-0.5.8-r3.ebuild 1610 RMD160 0f5a16ce57345ead5aea1360f73f205596b62f16 SHA1 8b860052cb13562dd615934c273d0ae6f765ba4f SHA256 35943affe69f782529cd0bcd4ecac445356488023068e0f9cf9cfd63e7fdbdc1
 EBUILD lxpanel-0.5.8.ebuild 1460 RMD160 54f36c6c715467e36f7b734ae296e2d02c59d0b5 SHA1 3360e0ccecc13158ce7527b2bcedfc74e12e732e SHA256 5c8b925361269c15e67e6748e28a2f66fc1558edd44b3d24d40c6a15324bbe9b
-EBUILD lxpanel-0.5.9.ebuild 1732 RMD160 2b028f8648aec173e546f473f3bc03bfaf5f9181 SHA1 cbb363a3e27f4fb866a7d423e38d4527cb0778b2 SHA256 8350472f1cc1809ce62038b9a42448622978a2d8d6a1d340a8f9eaab20f73320
-MISC ChangeLog 6376 RMD160 e34c6ff36d51f49c66a2d4cd0ca32cfd79c004b4 SHA1 9dae0158a0027b3c2ce9b668dafe70f99f164083 SHA256 495b4ff8cb1ebb4c7f3becb51c6b6c436fde55013bed78ec07d9379df569555f
+EBUILD lxpanel-0.5.9.ebuild 1793 RMD160 a433d6d601f9aa19b0937aa95dfc6d9ce05accc8 SHA1 1f42d8768bbe27d809ae2d81f0546b288244ee6e SHA256 6c7ac1a896ce2ee19d69fbf8819fd04bd7acfd335d3b78f90b3d55be6aad25c7
+MISC ChangeLog 6573 RMD160 52eb971d4aef383aed142f3d4f819314eeca7f04 SHA1 77adbb809577849eb2242f73bc1ad2433a39ab97 SHA256 e4c774345905cb0e25aad17af3aef762211504db5b1185b4a86baac6e36e2778
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPrn3aAAoJEPqDWhW0r/LCBKAQAJYwyoJiIURsz77xnxrqgDcM
-5eSZGRln+WkqkVVNqOTM1McMHWFvbM7mylXk+z+EV4xf8s1v7eseyCZYXdqvhaXq
-r9Y1aeS+znkg4AusrNSVKitymR8WDKG9kTYliaw8Se8maA02pEmB71WGIynbp3CJ
-wIwZidStJFSBNqwH/RmNcBn2c7Cl03JaNMOBHpqKUtYAAsr7p6dkLmQNglfln8OR
-cEIWk3MgH0VrHQj/g6UB5b86LCRoNmt4xeIQnv4TGPlPHjr3MN/UgaV2heUgsW2R
-h7rdBGDosBGPYz+UkQLFKkc2t6M7v8E/GUWrbz3FqsU7cO+RGGH4ohcQ5RYyeE0M
-KZpWmnWCSxUZpCe55hfnuVv4KYyDZ7NSeAcqAqvCWJ6b9kjmRpiSPMXNwX5crDVk
-g19EWOdRCQX5wW4BTNmuxjIfCFcESjIONtuA4TGpvLchbup6dGg2IN78Lmyxseuh
-KCnD79hP14WtiVt3pXFmvAFQXYHy36VsGWHjfK8OcM0hL4XijBA6orKJJdgoKdxu
-AACAatwBahQQmyA2vXztg2vtygsPC36Zp01wNla7za9Y1DFKmWHeu/wqv7tS1sEu
-SKBWwvKclnWhA7JsX7qeJlNng6Coroop3f5TaO47gYK5B7/N724/SV5wyAQY4eoV
-GoHtv/z5UtSLHZfWpcG7
-=CcWQ
+iQIcBAEBCgAGBQJPrqOWAAoJEPqDWhW0r/LC6IsP/20wBL3EZX9xw7YGT2cnTnl/
+lg7F/iqwfC/sEJ850veaheeUKAamHmX10dHdlQmg6TclC5PJjNs1SmPplCZSObgH
+GtxuBwZUe/nPD1dZOqErHzb9X0JrK0QesGeMGXGhgYqVGu2N0YBMQupN8C7OeVwC
+GbO7cl2cXLeGJC1KizmMBwwPgkYHiMcHzbEWuConCwswvxMorXtqbZmrQRWcoUCr
+3pGSy1WDsjv0DRVogTfWODantvrK+1kq3RFM+Oc2y02gFne1XqQe/U9C0xLerXX+
+Qflx8TWU5xtvw7AaVkKIwiDSbeyEbUBwnhUFyeFcVCHLAypjvlad8XXuQZvcub1q
+uaVGLsMpiNxdU5m6lney8ZQeGide5e1m78q4aDyL91uE2F9C14FlS7ZmWZD26hkM
+ryys83vFAZK5AayTYT6pquGjarhFPgDtbpa/JmYXAkQJMYWyLQJshsG4DWOc9GRp
+CyzeHW0KGn7zyEJ95KRFq+DGBCehMLbIOKP81euttekh2p2IQgbTt3gcjPONu9Fw
+qmBoVIDBVWGJ1BQ2SdB3bPLw/+o9/R1Tb3PH19Thq0WGyf6m3ynk5ANRwa+IUnBH
+rpMADvzyq8qMV1iAcNIiuZQssCTMyAPSVjqklglibYG5peXbn8609wwfyPTJ3mW9
+vcZxudqkerJ1XXZ0Qa/4
+=6LPG
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.9-libwnck-check.patch b/lxde-base/lxpanel/files/lxpanel-0.5.9-libwnck-check.patch
new file mode 100644
index 000000000000..29fb81a31152
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.9-libwnck-check.patch
@@ -0,0 +1,13 @@
+Index: lxpanel-0.5.9/configure.ac
+===================================================================
+--- lxpanel-0.5.9.orig/configure.ac
++++ lxpanel-0.5.9/configure.ac
+@@ -79,7 +79,7 @@ PKG_CHECK_MODULES(X11, [$pkg_modules])
+ AC_SUBST(X11_LIBS)
+ 
+ pkg_modules="libwnck-1.0"
+-PKG_CHECK_MODULES(WNCK, [$pkg_modules])
++PKG_CHECK_MODULES(WNCK, [$pkg_modules], [:], [:])
+ AC_SUBST(WNCK_CFLAGS)
+ AC_SUBST(WNCK_LIBS)
+ 
diff --git a/lxde-base/lxpanel/lxpanel-0.5.9.ebuild b/lxde-base/lxpanel/lxpanel-0.5.9.ebuild
index b573501d2f23..5531a2fb3fa9 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.9.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.9.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/lxde-base/lxpanel/lxpanel-0.5.9.ebuild,v 1.2 2012/05/12 15:12:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.9.ebuild,v 1.3 2012/05/12 17:53:22 hwoarang Exp $
 
 EAPI="4"
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.5.8-dynamic-width.patch
 	epatch "${FILESDIR}"/${P}-sandbox.patch
+	#bug #415595
+	epatch "${FILESDIR}"/${P}-libwnck-check.patch
 	eautoreconf
 }