adjust default lxqt menu, do not mix categories, put entries where they belong

3 files changed, 127 insertions, 0 deletions

diff --git a/lxqt-base/lxqt-common/Manifest b/lxqt-base/lxqt-common/Manifest
new file mode 100644
index 00000000..735770cd
--- /dev/null
+++ b/lxqt-base/lxqt-common/Manifest
@@ -0,0 +1 @@
+DIST lxqt-common-0.11.0.tar.xz 3216520 SHA256 3a34a2105a49545d2695cccaf6310d261a7e760455e583efa2d80b3ab54d6053 SHA512 5eeaa6ead263a93b58ab9ec536c287fe383b5abade722dd3c7232840bc12c56e2208904bfbbc5ee9092c340d14d939a2ac0dcd37cf2175a0f601bbe050f00a2c WHIRLPOOL 7c889291741a729ea642eeb14cdf0aa7fb4bb78aa2a0d6ede64ff8bae9ca6091649ab39642d3477fbc498e35ec021b4bf255db536e5c88a8da21681b039639e3
diff --git a/lxqt-base/lxqt-common/files/lxqt-applications-menu-cleanup.patch b/lxqt-base/lxqt-common/files/lxqt-applications-menu-cleanup.patch
new file mode 100644
index 00000000..991d2f89
--- /dev/null
+++ b/lxqt-base/lxqt-common/files/lxqt-applications-menu-cleanup.patch
@@ -0,0 +1,87 @@
+diff -Nur a/menu/lxqt-applications.menu b/menu/lxqt-applications.menu
+--- a/menu/lxqt-applications.menu	2016-09-23 23:44:22.000000000 +0100
++++ b/menu/lxqt-applications.menu	2016-11-29 19:12:49.779191588 +0000
+@@ -20,12 +20,13 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Utility</Category>
+-			 <!-- Accessibility spec must have either the Utility or Settings
++	<!-- Accessibility spec must have either the Utility or Settings
+ 			 category, and we display an accessibility submenu already for
+ 			 the ones that do not have Settings, so don't display accessibility
+ 			 applications here -->
+ 				<Not><Category>Accessibility</Category></Not>
+ 				<Not><Category>System</Category></Not>
++				<Not><Category>Graphics</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu> <!-- End Accessories -->
+@@ -61,6 +62,7 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Education</Category>
++				<Not><Category>Office</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu> <!-- End Education -->
+@@ -83,7 +85,7 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Graphics</Category>
+-				<Not><Category>Utility</Category></Not>
++				<Not><Category>Office</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu> <!-- End Graphics -->
+@@ -95,6 +97,7 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Network</Category>
++				<Not><Category>Game</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu>	 <!-- End Internet -->
+@@ -125,6 +128,7 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Office</Category>
++				<Not><Category>Network</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu> <!-- End Office -->
+@@ -140,26 +144,10 @@
+ 				<Not><Category>PackageManager</Category></Not>
+ 				<Not><Category>X-Leave</Category></Not>
+ 				<Not><Category>Screensaver</Category></Not>
+-				<Not><Filename>lxqt-about.desktop</Filename></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu>	 <!-- End System Tools -->
+ 
+-	<!-- Other -->
+-	<Menu>
+-		<Name>Other</Name>
+-		<Directory>lxde-other.directory</Directory>
+-		<OnlyUnallocated/>
+-		<Include>
+-			<And>
+-				<Not><Category>Core</Category></Not>
+-				<Not><Category>Settings</Category></Not>
+-				<Not><Category>Screensaver</Category></Not>
+-			</And>
+-		</Include>
+-		</Menu> <!-- End Other -->
+-
+-	<!-- Settings -->
+ 	<Menu>
+ 		<Name>DesktopSettings</Name>
+ 		<Directory>lxde-settings.directory</Directory>
+@@ -204,7 +192,7 @@
+ 		</Layout>
+ 	</Menu> <!-- End Settings -->
+ 
+-	<!-- Leave -->
++		<!-- Leave -->
+ 	<Menu>
+ 		<Name>X-Leave</Name>
+ 		<Directory>lxqt-leave.directory</Directory>
diff --git a/lxqt-base/lxqt-common/lxqt-common-0.11.0-r1.ebuild b/lxqt-base/lxqt-common/lxqt-common-0.11.0-r1.ebuild
new file mode 100644
index 00000000..86f847ed
--- /dev/null
+++ b/lxqt-base/lxqt-common/lxqt-common-0.11.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="LXQt common resources"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+DEPEND=">=lxqt-base/liblxqt-0.11.0"
+RDEPEND="${DEPEND}"
+PDEPEND=">=lxqt-base/lxqt-session-0.11.0"
+
+src_prepare() {
+	epatch "${FILESDIR}"/lxqt-applications-menu-cleanup.patch
+}
+
+src_configure() {
+	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodir "/etc/X11/Sessions"
+	dosym  "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt"
+}