reinit the tree, so we can have metadata

7 files changed, 188 insertions, 0 deletions

diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
new file mode 100644
index 000000000000..d7e7acc64d36
--- /dev/null
+++ b/lxde-base/lxsession/Manifest
@@ -0,0 +1,9 @@
+AUX lxsession-0.5.2-fix-invalid-memcpy.patch 1010 SHA256 2caa16bd01a82fcef2abd4c687e5df48300b8dc6d223aed22853f5815e23d0ef SHA512 33a72b62b4fe82d1c7331d389333e24ee68fd1bc37fba96a7a73247cb4d63556429709361b9b6e35bd2e93db93f5571ef3a985b3dbcb9ea9b5f23a8e677a9932 WHIRLPOOL c0b4e92d496f3f7176cb4a23b07ea6dc5ab3dc272321e9ff06129c9074480d1454e1fb7234bbbffbbf43340051ed805cad168952bc19ffb35a2c04bbf9b87d6d
+AUX lxsession-0.5.2-key2-null.patch 1051 SHA256 414849cb964fcc02f4d7c15c57c6a95cbb30bcc578f3ba6856eddf3fc63fdc18 SHA512 87e5a264769bbb355e45875dfbf7bde46e355d2de28023000b1a69ff0a801da3e504d875ab5ae75c1c57c26050f40246a48e59f05430514f2deaf7a1ce90e324 WHIRLPOOL ee0aec4fb84515f9e0dcad3911e3d9612becb5c932ca9f70982fadc18426eb6eca5fff7dd4d30181b27ecd4b3a860c1ce919eb51371ede94054ec33d5d2e0587
+AUX lxsession-0.5.2-notify-daemon-default.patch 709 SHA256 89602254ed5c289b5f2b5493ec0f014cfcb412e1492dfccfacaad7092910f369 SHA512 17ff701e90cd11f077ab538cf6e2507e49e01ab8037eb0e52f4e4eb02b6ca72e118bcad2158c3500364c74c6aaafc39c64f5bac411ec4d0115c011e8a6bc289c WHIRLPOOL e9f486c1edfe9e6702149065a60c17e90ea82ea950f2a1a911ca1ddc451c7d5f96043c13c9952e0b2afaa5a0adae32149233be40a3c824457b6515258fb994ce
+AUX lxsession-0.5.2-reload.patch 1324 SHA256 73928ec9c2d41dd96d348731be7d70f5627ce517f1241ae5833aead8e295ee33 SHA512 b8eb606b915709172454bb610650dd358b492ab29608ea62c834356a707ddc70440e3215e8b639ec8ebcf459cb8753d6bb525ea8037064be1016201956b91cb1 WHIRLPOOL ea497594ef9e634e51b8dd3f8055ffb6ec3460912fd9345a7105334e4f83f7f4ca3a5ed41bc904f017065c631a984dafe33ea2a19535ced8615c7ba42ed19b54
+DIST lxsession-0.5.2.tar.xz 354092 SHA256 2d55e9ea80057fe5ffd68a91a15bb004ad7bf019e50807a8bb9b342115efaada SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1 WHIRLPOOL 720144b89c7719b283478427d5858ee0de8ca25dce77a19eef1646983c22927b3af079ec24f218b92141b77c414ebf7f85e4f863e47646b29fccb96d94586ce7
+EBUILD lxsession-0.5.2.ebuild 1783 SHA256 20d676bb0257558e6afc2a9081b0f9faf72eef053a0bee194501ff8ef3e43a06 SHA512 474c58c4e9d1b3262649c9cc313a211b1eb5f5edc4992ec838c5a0177bb1de0096c3a5820cada3a4fecceac97775f5694b124fb2ecb46f235c42ae815da84dbc WHIRLPOOL 1413bc3a6ee233d5d535f7c64a190e6474343073be6b58a4015d76ce581664252b9d70371911545ba3dc2f7ac3b1e1fb68f69029d3afffcc2f4a6036482df48c
+MISC ChangeLog 4441 SHA256 368bc52acf06816983b731cdf60157b8b628085a164efa5845cc66bbb04234fd SHA512 7ca8e466068467fa9ca5e4fd46f29e1343fc211041df9aeaba3bdd9edbc9ba7b541576f9d12696b686960de4f88139c18a92003b241271814c53ffc24faf11bf WHIRLPOOL 44fffb40f60cc129a25986dffcb5252fa9a8715c583d46fe9bfdaa487ce1581dc87a2ce7f2c464200c0fd3e7dc313479d10d71517fa348619ed95425bee8823c
+MISC ChangeLog-2015 8988 SHA256 4a7e846dc358fa50f83fc4bf8600a790f15a61e44d14e6df962f15eadf4f9fd1 SHA512 1db66aef8433749160ef43af6e52ea47373e39335efcfbb1a1bf3af7c97ec03d549bdee6c7718d4667211e5075cf46b388b49066eb0b70a620cb0822a4fed010 WHIRLPOOL f3008c2a49205e62759f0952ef3a3227c9f3edaab4bfa9b2b09726322bf7488b324dbc43071e4f4e82104420cd13ad4901e9419aa1c2d8bcc5f4d6cfe56e8418
+MISC metadata.xml 335 SHA256 b9490a0a3862026204370ed27f91c33c1bbe450e451c9b9538c3d7f2cf6d8330 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7 WHIRLPOOL 1200923674587a97d4240d60754092275090c9241c7805a9b92cda9d1c420987dba4712a6e4300a4f3554f390c25a3c8dc386303aafd91a68b46711a4f377abf
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch b/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch
new file mode 100644
index 000000000000..672889997688
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch
@@ -0,0 +1,20 @@
+--- lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c.memmove	2014-10-05 08:49:49.000000000 +0900
++++ lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c	2016-02-15 19:21:23.780783021 +0900
+@@ -216,7 +216,7 @@ void update_enable_state(GKeyFile* kf, g
+                 if( strcmp(list[i], session_name) == 0 )
+                 {
+                     g_free(list[i]);
+-                    memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
++                    memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
+                     --n;
+                     break;
+                 }
+@@ -259,7 +259,7 @@ void update_enable_state(GKeyFile* kf, g
+                 if( strcmp(list[i], session_name) == 0 )
+                 {
+                     g_free(list[i]);
+-                    memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
++                    memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
+                     --n;
+                     break;
+                 }
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch b/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch
new file mode 100644
index 000000000000..31c88a9caa66
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch
@@ -0,0 +1,20 @@
+--- lxsession-0.5.2/lxsession/settings.vala.key2	2014-10-18 01:54:57.000000000 +0900
++++ lxsession-0.5.2/lxsession/settings.vala	2015-07-13 14:56:00.830117779 +0900
+@@ -56,7 +56,7 @@ namespace Lxsession
+             return return_map;
+         }
+ 
+-        public void create_config_item (string categorie, string key1, string key2, string type, string? variable)
++        public void create_config_item (string categorie, string key1, string? key2, string type, string? variable)
+         {
+             /* only support string for now */
+             string item_key = categorie + ";" + key1 + ";" + key2 + ";";
+@@ -71,7 +71,7 @@ namespace Lxsession
+             update_support_keys (categorie, key1, key2);
+         }
+ 
+-        public void delete_config_item (string categorie, string key1, string key2, string type)
++        public void delete_config_item (string categorie, string key1, string? key2, string type)
+         {
+             /* only support string for now */
+             string item_key = categorie + ";" + key1 + ";" + key2 + ";";
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-notify-daemon-default.patch b/lxde-base/lxsession/files/lxsession-0.5.2-notify-daemon-default.patch
new file mode 100644
index 000000000000..ffca8227209a
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-notify-daemon-default.patch
@@ -0,0 +1,13 @@
+--- lxsession-0.5.2/lxsession/settings.vala.notify	2015-08-11 14:14:22.187535605 +0900
++++ lxsession-0.5.2/lxsession/settings.vala	2015-08-11 14:37:18.868694268 +0900
+@@ -258,6 +258,10 @@
+             set_generic_default("Session", "proxy_manager", "command", "string", "build-in");
+             set_generic_default("Session", "keyring", "command", "string", "ssh-agent");
+ 
++            set_generic_default("Session", "notification", "command", "string", "/usr/libexec/notification-daemon");
++            set_generic_default("Session", "notification", "autostart", "string", "true");
++
++
+             /* Set Xsettings default */
+ 
+             set_generic_default("GTK", "iXft", "Antialias", "string", "1");
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-reload.patch b/lxde-base/lxsession/files/lxsession-0.5.2-reload.patch
new file mode 100644
index 000000000000..d7e9164e7286
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.2-reload.patch
@@ -0,0 +1,43 @@
+--- lxsession-0.5.2/Makefile.am.debug	2014-11-29 23:50:05.000000000 +0900
++++ lxsession-0.5.2/Makefile.am	2015-06-17 11:08:14.510501437 +0900
+@@ -424,6 +424,7 @@
+     --pkg gio-2.0 \
+     --pkg posix \
+     --pkg lxsettings-daemon \
++    --pkg xevent \
+     $(buildinclip_VALAFLAGS) \
+     $(buildinpolkit_VALAFLAGS) \
+     $(NULL)
+--- lxsession-0.5.2/lxsession/main.vala.debug	2014-10-05 08:49:49.000000000 +0900
++++ lxsession-0.5.2/lxsession/main.vala	2015-06-17 11:19:54.979024117 +0900
+@@ -96,6 +96,17 @@
+             return -1;
+         }
+ 
++		if (xevent_init() == false)
++		{
++			return 1;
++		}
++
++		if (reload == true)
++		{
++			send_internal_command(LXS_CMD.RELOAD);
++			return 0;
++		}
++
+         message ("Session is %s",session);
+         message ("DE is %s", desktop_environnement);
+ 
+--- lxsession-0.5.2/vapi/xevent.vapi.debug	2015-06-17 11:08:14.520501444 +0900
++++ lxsession-0.5.2/vapi/xevent.vapi	2015-06-17 11:20:16.384040089 +0900
+@@ -0,0 +1,10 @@
++[CCode (cprefix = "LxsessionXEvent", cheader_filename = "lxsettings-daemon/xevent.h")]
++    public static void send_internal_command( int cmd );
++    public static bool xevent_init();
++
++[CCode (cname = "int", cprefix = "LXS_", cheader_filename = "lxsettings-daemon/xevent.h", has_type_id = false)]
++	public enum LXS_CMD {
++		RELOAD,
++		EXIT,
++		LAST_CMD
++	}
diff --git a/lxde-base/lxsession/lxsession-0.5.2.ebuild b/lxde-base/lxsession/lxsession-0.5.2.ebuild
new file mode 100644
index 000000000000..cbfa54102c4b
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libgee:0
+	dev-libs/libunique:1
+	lxde-base/lxde-common
+	sys-auth/polkit
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	sys-apps/dbus
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${P}-reload.patch
+	"${FILESDIR}"/${P}-key2-null.patch
+	"${FILESDIR}"/${P}-notify-daemon-default.patch
+	"${FILESDIR}"/${P}-fix-invalid-memcpy.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+
+	# Don't start in Xfce to avoid bugs like
+	# https://bugzilla.redhat.com/show_bug.cgi?id=616730
+	sed -i 's/^NotShowIn=GNOME;KDE;/NotShowIn=GNOME;KDE;XFCE;/g' data/lxpolkit.desktop.in.in || die
+
+	# fix icon in desktop file
+	# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxsession-edit;a=commit;h=3789a96691eadac9b8f3bf3034a97645860bd138
+	sed -i 's/^Icon=xfwm4/Icon=session-properties/g' data/lxsession-edit.desktop.in || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	# gtk3 looks to not be ready, follow what other distributions are
+	# doing
+	econf \
+		$(use_enable nls) \
+		--disable-gtk3
+}
diff --git a/lxde-base/lxsession/metadata.xml b/lxde-base/lxsession/metadata.xml
new file mode 100644
index 000000000000..b31e527de265
--- /dev/null
+++ b/lxde-base/lxsession/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">lxde</remote-id>
+  </upstream>
+</pkgmetadata>