Patch for fixing left-click issue, thanks to Jonathan Thibault for bug report (Bug #522404). Also looks as if >=x11-libs/libfm-1.2.0 is a hard dependency now.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x39E7AB2E

4 files changed, 124 insertions, 17 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index f62437329fda..e4590d1af8ff 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.61 2014/09/06 09:03:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.62 2014/09/10 01:54:45 nullishzero Exp $
+
+*lxpanel-0.7.0-r1 (10 Sep 2014)
+
+  10 Sep 2014; Pavel Kazakov <nullishzero@gentoo.org>
+  +files/lxpanel-0.7.0-right-click-fix.patch, +lxpanel-0.7.0-r1.ebuild:
+  Patch for fixing left-click issue, thanks to Jonathan Thibault for bug report
+  (Bug #522404). Also looks as if >=x11-libs/libfm-1.2.0 is a hard dependency
+  now.
 
 *lxpanel-0.7.0 (06 Sep 2014)
 
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index c45207a630d9..5a184cb3ad2e 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -3,30 +3,30 @@ Hash: SHA256
 
 AUX lxpanel-0.5.9-libwnck-check.patch 413 SHA256 6b3c3d420284eccf0fa14e0a377a4d1f4c9141989bb7b76400081d8e55dd5817 SHA512 e8fef3865f303fb5ae6e76b458690d44b2f5f283da05937fc57caffd6d82997c97d36424acabdf005c22217d6ddb11204dd789f8093256e267348d283b25f5e3 WHIRLPOOL 3f3cc64c7286bdc41c9bfad82749010d60c2f7ea74679250dcca47b3e2cabfa1eaf918925c39b7b834e5a63d76728c1793e0f713fd79dfdf4e28e5bff484f6dc
 AUX lxpanel-0.5.9-sandbox.patch 1104 SHA256 7aeb18548f11910d4db781da219bbcbe36ac5eec0b21a6efc0fa4234221009ff SHA512 6e1287cccf3372ac207a934e45743d5b79292956112ab1a20c6700953c642e7cd4d8f1a62b25bb47c803647eca168122469db07c2aa988acbb906a9ebfaaa9ba WHIRLPOOL 49e35df303b834d1916737797c2cfecc2fa537bd5a922dbe80cd720bdfddec5f00a56e99c081a835ed71162d86de3ce9d3b86e5a9881f81e950616034da2cf7a
+AUX lxpanel-0.7.0-right-click-fix.patch 779 SHA256 03c46671baa2b1b6703856656b469e634757bafe9de79b269aa070fcabe708c6 SHA512 8f9ab121e79b50baa284fa82f8eea7615ea84e38c3bc371d7233056fd57fb81627c16791e86a0a38ee08f68eb21b4ff7c7ee41bd807a9afeb566c25cedc54617 WHIRLPOOL af2b1bff55b173697008ee4a9b3ef9590448dfe1d8450263f0f890431aa5ab35b136d310f5e4e1ee4e37d995c9427e6122fa6687b90e0b96efd49e0e43013a6a
 DIST lxpanel-0.5.12.tar.gz 2048801 SHA256 11cfe76f6241bbac556e57a6efc079b6e10dceea76a8bdaf4c749afdb81d15ab SHA512 ef491671d241c87039c402a7d7668f1108aec861a6b421ccdae3549ab576db1f79007b15787153445df4cef0cc86f1f0ddd35d14481d06de884df2bcdfa1d1bc WHIRLPOOL ce149c5f2167bdf1cf94bc04bae4a4b26334dcc8cdd39bbb12174effc34625dc32806f584806e9f2ff8ba65c51c4d137fc9ad1dd19748776c5b55c7333bea88d
 DIST lxpanel-0.6.1.tar.gz 2094946 SHA256 a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb SHA512 a0a67cad6899c286d69bc2b10b41bc277217b0452fea4e4be3bb8d68f524c6f4b878594961ad3acd187e90b3e96ff0aa0c97018c7bd5b198df64761c8378daa3 WHIRLPOOL 4ce95825f4cd647e4abeb3852192a1373a42a68cd30d50bde5bd810a48bf574b371d763a3d3a6c91d4a4c945eeec668ec56b42c6c8db5c26a3721eb21193725b
 DIST lxpanel-0.7.0.tar.xz 1479456 SHA256 bd010d13b1627335f45be1755f7f260dc439c2cfbce942bc36705fa2cffd0b53 SHA512 396147a24e852dd7288f99281116c797df4dbb1912925a6b4403ffe74bb8e3d821f7cd96965bedb2db9aff2d1ca3ae89be6e5712df04353a69a9cca5b03589aa WHIRLPOOL a5e4394e198b29bffa834b789bf34332e617837f0ebea0ea29bf595100c43aeb7d0a7698bbedb739dc058433462e1df661b41537f49904b77a4e7663360e45af
 EBUILD lxpanel-0.5.12.ebuild 1866 SHA256 cf67fa6ec3f9571a79f21e495174a52a7f19e74100bf972132004ea0030a593d SHA512 967f31ed8e38b5d95811c577a5e23403d031750fc43c6cce11221089c7da3e9a595fe4d8fcc4573b5a6f08d373f3dfa4d50bd1d2efd4d55988b845dae650e2dc WHIRLPOOL d340b824e1c8f4e07aaaaefac55f46e67c348e4e956de103cbd82158f9ba246afa47b96deb2b1866227c68bbd4f4219370f4104999663f43901e8eb3f7beb49c
 EBUILD lxpanel-0.6.1.ebuild 1934 SHA256 aaf9c042ed5686f70a14992b9d08ad63a172f1e0015d65dedd692a43f989220c SHA512 a6e43fad1b0836721842336649fb33141a39271b5dd7414b4b00274c3d8ea14d7708c9220732f0e3f813ddfbccfe4bbb99519a21656c7e3ffc2e9fba9d7aae85 WHIRLPOOL 332e9817e2d82310589d3499c600b35975821f5c7573fda6315ab98498f2f7f4cd8dcd937b65b8a5be478cdf191e4f3cadef91a11a20e9f6313c514242a052cf
+EBUILD lxpanel-0.7.0-r1.ebuild 2017 SHA256 01c6324a58ba17acc89800e7070330d7af8d03663d0aafd21eee86e5f1bdd027 SHA512 fd21b1a6535512e892f9e2d68ac54333837670df3559036b535a7210dd985810fbceaa5319de1e7e45773fc5e9077c953f92f611fbdb865509972b20738d05d2 WHIRLPOOL c7d3c9d95596795cb488e3d6e33586b589ba3a6060b41dd647063571697f476af250afd2e20c0642a7a57049211cb0e63d2260aa18614dc2a7fa81888acdacc1
 EBUILD lxpanel-0.7.0.ebuild 1917 SHA256 f074221715fc1b7ee9b598a72494873c156a89dfc0967453810c8bcc5433e028 SHA512 1dcb23c6c58da82b8c84d3ae30abfa8b3b8328fab87e62a8191222449727ecab28a0d51c18bf6a901e902d445752674d24f602c3618df011dcb2fda87f89c23f WHIRLPOOL d75c9b76ed97c0d0b999704b5ff0485c4a83aafe65c7b4376b3d87c2da63ad59b5fe15d311d160648a2745c7f85d02057fa9a727a39eb9de5ca1190658de515f
-MISC ChangeLog 9454 SHA256 74ef8dcbe23fce014cc8219fb5e8516b4b4035c8bc400e50bab91ea2d354b0d1 SHA512 449ae493d23cf6cc84afa7c1e260a808e486e34f064a73fbdb244192ae6aacdc24176aa246e0cc030c9cde6dca6df52f38a2a9414a39927e0397ecbef721950d WHIRLPOOL 013163473b15866c9a7922ca427d57ec4c942045115807d708a2f609f47e854c886f13f904d21a730f0780f74e8a7511cd20654829cbbf6a589b72e9ac67671f
+MISC ChangeLog 9782 SHA256 ea2abaa240370f2975336294a2fe156473f5e114b2e74dae40a49870d81ab3fe SHA512 afe30049b812525019444d874b1bb4e1a5fb2960b1b72d81bc1ab034c210f616f65e70e1b2334cdbd914de4a81da2d90a4e7fbb175a94e78886a8b416eef1293 WHIRLPOOL 3822894c85c9298f920d6f56e9e9e0ccfdedac8b2d64877cdb63c69eacb5de5e66de1cb1d5ee6b09b2b96345627b9abf6cf9f518641b9428f4ec7145694edf2d
 MISC metadata.xml 159 SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb SHA512 b4d06538d607c5ba81e0070475cd7d0a221b19e2adf740f479398a647c97350eb6d02b7db8bde107b0c369ce0058b8f0639468c0ca519ff585c555a0bfd4a381 WHIRLPOOL f5dfee2db356573e21cdb76ebcd11a61d2dc7f2b2b8458589cdabb1b2fd21f3261d0b40144b1417d433d1078a9c31a6b4562a914068719df66dfd4563714d9ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUCs3vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88mh8QALUf6C6oIRjy+2py+BNcBpvQ
-6PwQH+8LBQwld+xqQk+h67hBSd/dKJT/Ku14RxWam4iKLvXcyKZbWcv5vq6KFIkp
-DJcLgRpFpRUTv2ae36fPsJJyz6d/BMf0TGSOX1N38dZEpp/gH/SjiBfGYMUlwIHw
-nchIUMPkY52LtTUT1qd/Gd7b5qpH7QDEId1DXZso5tJ6UN8XrTZb59lzypUJ8FNu
-1lwOxnDaNA8Pwb3H0izwBZpZIV4n7Qj5C1TPHgjJVdvDwtXrMMvvf1i33JzXpmCl
-fyWs4Gfx29HgnNWnOx+ehWKQQvr2vqkdzgVOVPEspGEOqXt2Lp2kCpi3sjBmmnCU
-/eco/c70Rz5V4zeaxxNpdIic3g/1CX0gwxilaWiVCLNYn/BZjaH6oUxomdWNVZHm
-wCMloCIOHMleRIP8xsf2DWQYctkIwpdZHglSiPK6k55Mp+41XLOQV67EPrMseXyq
-PYqfrty6fM5IYMTVRltmAb+12aWXwJMgxcaIYcFACWneA2CFa+jWvRrtcUANsORb
-bbBqy+I6dLWyhfu5hG1d8cjNISmPt48UGLrv+pufnC5m7zPkHjqKGEauw3dEHHNE
-8rQxNu5LUfZETGAJw8UxRPaTX7lugEKtZK6xem/jn8GwV9Q75XGT1mvstNxAq42o
-4s3T+5gIv8PM262GetyL
-=Y/fL
+iQIcBAEBCAAGBQJUD69TAAoJENb1ecI556su+4QP/jWF5YUWMs6CMqkBqu1tgyUR
+zlh/kMHIJ9NXygS+Q89slhgta5rHjM/6Yq58RK7Ty6RgRepHmkkIMhZ4eXNjDxYK
+VKlIgtB3uiiIPG7B+ZQ3hMEmH/RFFmDMQG/eMDkCiHNedHvwTlTIryAS/2Hle+s5
+QuSK3YtTYuMXt3RxKbGjKt2TexjHqybBvjV7Xl+dU/r37ZCoUBEe2mPTZrF+KfnX
+hfhSMO1SJD/EUpw/C4bVT8rl6vRRC9C3Pan1pBChnsjdT3vy+RKogqp3vU0UECqh
+wPAntj2ynmRU/To2b7Fh+Z7hQUrAGOevhkWArTGkqvHO7V42jzJX4QIfalRlAQWI
+ti9/IZYFKVl8Apm64JYxcMqXoJCTGYJMaUFA84ZEK2cqME0AZRsSSvyhiS9/3dzQ
+FHYqMnUs9EKdSWmYgb2mpUaeC5a4eGRZ4Ka0UWFTLsWD90g+v6Y6c0W0/6mvWSmv
+xhvlLehW5IqLLCpKeZx6+dDN9WQk7Sh3BEl8YhAyE9wx4OEkoallCwWPLU5Z9WI1
+YEhLYjagTSIN8MVo63+Gv0qieI4P/Y38rMPC/XZ67WsWZP0dvSERoYSprbvv2lNg
+FxqnhCKCIYT/jEoaHJRV8QwcMdFza5fiIHBoCdR3RFCJ1Jne/Xs7gjYy4MgJwLUw
+LvnpofK4EZkade0eryg7
+=ycOz
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch b/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
new file mode 100644
index 000000000000..f6325b6f8c3f
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
@@ -0,0 +1,25 @@
+From d4943c80cded6325284be8b58003fe63dd6e8255 Mon Sep 17 00:00:00 2001
+From: Raimar <no@email.de>
+Date: Thu, 21 Aug 2014 23:21:28 +0200
+Subject: [PATCH 1/1] fix crash after click on empty part of panel
+
+---
+ src/panel.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/panel.c b/src/panel.c
+index 6b2ede6..87903d8 100644
+--- a/src/panel.c
++++ b/src/panel.c
+@@ -233,7 +233,7 @@ static gboolean lxpanel_button_press(GtkWidget *widget, GdkEventButton *event)
+         gtk_menu_popup(popup, NULL, NULL, NULL, NULL, event->button, event->time);
+         return TRUE;
+     }
+-    return GTK_WIDGET_CLASS(lxpanel_parent_class)->button_press_event(widget, event);
++    return FALSE;
+ }
+ 
+ static void lxpanel_class_init(PanelToplevelClass *klass)
+-- 
+1.7.10.4
+
diff --git a/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..4d157f3d935c
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild,v 1.1 2014/09/10 01:54:45 nullishzero Exp $
+
+EAPI="4"
+
+inherit autotools eutils readme.gentoo versionator
+
+MAJOR_VER="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${MAJOR_VER}.x/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE="+alsa wifi"
+RESTRICT="test"  # bug 249598
+
+RDEPEND="x11-libs/gtk+:2
+	>=x11-libs/libfm-1.2.0
+	x11-libs/libwnck:1
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/libX11
+	lxde-base/lxmenu-data
+	lxde-base/menu-cache
+	alsa? ( media-libs/alsa-lib )
+	wifi? ( net-wireless/wireless-tools )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+src_prepare() {
+	#bug #522404
+	epatch "${FILESDIR}"/${PN}-0.7.0-right-click-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.5.9-sandbox.patch
+	#bug #415595
+	sed -i "s:-Werror::" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local plugins="netstatus,volume,cpu,deskno,batt, \
+		kbled,xkb,thermal,cpufreq,monitors"
+
+	use wifi && plugins+=",netstat"
+	use alsa && plugins+=",volumealsa"
+	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
+	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+
+	# Get rid of the .la files.
+	find "${D}" -name '*.la' -delete
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}