summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /lxde-base/lxsession
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'lxde-base/lxsession')
-rw-r--r--lxde-base/lxsession/Manifest2
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch13
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch111
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch13
-rw-r--r--lxde-base/lxsession/lxsession-0.4.6.1.ebuild38
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild54
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild57
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild60
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2.ebuild53
-rw-r--r--lxde-base/lxsession/metadata.xml8
10 files changed, 409 insertions, 0 deletions
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
new file mode 100644
index 00000000000..15760293916
--- /dev/null
+++ b/lxde-base/lxsession/Manifest
@@ -0,0 +1,2 @@
+DIST lxsession-0.4.6.1.tar.gz 407100 SHA256 bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1 SHA512 eea554ba70b3fd278b7ce0bb2d278241dff26eaccf74f2a4a0a9846515688fd5dd846c97f29c71139a0c3b95bc5e906efc4673f0cd79d8db427894dff5524f16 WHIRLPOOL 235d6c2e8a622a4460d767d5b6af22710f17060fffea18ac5cedaeb4dc9f70dc77872d486caa9d7256c379f160755ac7b8299e7836fd513675b65d1c979b900a
+DIST lxsession-0.4.9.2.tar.gz 745637 SHA256 eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 SHA512 cffcd15faab79ad165f969edf65b6b106c5b4405b78e6c102a74ab96da9cf61b781d0be7587849ce56672ae3015e8f63bc1b84465f5ec0084c299ec588992172 WHIRLPOOL 5a5c172cda30a4690d82a4a8acd3b983cbcc60ed71fefdfbfbb97e8b4363f4c26825267a0bd45c71589c2dd180f9699a2d05dd759fe23bcfdd5e9d3a10ccdda2
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
new file mode 100644
index 00000000000..36c7c5fabe4
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 66d041c..4d8a370 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ AC_INIT([lxsession],[0.4.9.2],[],[lxsession])
+
+ # Autotols programs
+-AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign])
++AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign subdir-objects])
+ AC_PREREQ([2.69])
+ IT_PROG_INTLTOOL([0.40.0],[no-xml])
+
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
new file mode 100644
index 00000000000..91d15836241
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
@@ -0,0 +1,111 @@
+Taken from:
+http://svnweb.mageia.org/packages/cauldron/lxsession/current/SOURCES/lxsession-0.4.9.2-fix-logind-dbus-calls.patch?revision=549605&view=co&pathrev=549606
+
+--- lxsession-0.4.9.2/lxsession-logout/dbus-interface.c.0000 2013-04-12 22:02:19.000000000 +0100
++++ lxsession-0.4.9.2/lxsession-logout/dbus-interface.c 2013-11-05 11:00:34.038965063 +0000
+@@ -244,10 +244,11 @@
+ return function_result;
+ }
+
+-static void
+-logind_call_function (const gchar *function, gboolean value, GError **error)
++static char *
++logind_call_function (const gchar *function)
+ {
+ GVariant *result;
++ GError *err = NULL;
+
+ if (!logind_proxy)
+ {
+@@ -258,20 +259,28 @@
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+ NULL,
+- error);
++ &err);
++ if (err != NULL)
++ g_error_free(err);
+ if (!logind_proxy)
+- return;
++ return NULL;
+ }
+
+ result = g_dbus_proxy_call_sync (logind_proxy,
+ function,
+- g_variant_new ("(b)", value),
++ g_variant_new ("(b)", TRUE),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+- error);
+- g_variant_unref (result);
+- return;
++ &err);
++ if (result)
++ g_variant_unref (result);
++ if (err != NULL) {
++ char *r = strdup(err->message);
++ g_error_free(err);
++ return r;
++ }
++ return NULL;
+ }
+
+ gboolean
+@@ -280,10 +289,10 @@
+ return logind_query ("CanPowerOff", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_PowerOff (GError **error)
++char *
++dbus_logind_PowerOff (void)
+ {
+- logind_call_function ("PowerOff", TRUE, error);
++ return logind_call_function ("PowerOff");
+ }
+
+ gboolean
+@@ -292,10 +301,10 @@
+ return logind_query ("CanReboot", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_Reboot (GError **error)
++char *
++dbus_logind_Reboot (void)
+ {
+- logind_call_function ("Reboot", TRUE, error);
++ return logind_call_function ("Reboot");
+ }
+
+ gboolean
+@@ -304,10 +313,10 @@
+ return logind_query ("CanSuspend", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_Suspend (GError **error)
++char *
++dbus_logind_Suspend (void)
+ {
+- logind_call_function ("Suspend", TRUE, error);
++ return logind_call_function ("Suspend");
+ }
+
+ gboolean
+@@ -316,10 +325,10 @@
+ return logind_query ("CanHibernate", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_Hibernate (GError **error)
++char *
++dbus_logind_Hibernate (void)
+ {
+- logind_call_function ("Hibernate", TRUE, error);
++ return logind_call_function ("Hibernate");
+ }
+
+ /*** ConsoleKit mechanism ***/
+
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
new file mode 100644
index 00000000000..8a51f0300be
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
@@ -0,0 +1,13 @@
+# upstream issue: https://sourceforge.net/tracker/?func=detail&aid=3615092&group_id=180858&atid=894869
+
+--- a/lxsession-edit/Makefile.am 2012-10-25 14:20:04.000000000 -0400
++++ b/lxsession-edit/Makefile.am 2013-10-14 21:30:56.627684026 -0400
+@@ -5,7 +5,7 @@
+ bin_PROGRAMS = lxsession-edit
+
+ lxsession_edit_CFLAGS = \
+- -I$(topsrcdir) \
++ -I$(top_srcdir) \
+ $(GTK_CFLAGS) \
+ $(ADDITIONAL_FLAGS) \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
diff --git a/lxde-base/lxsession/lxsession-0.4.6.1.ebuild b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
new file mode 100644
index 00000000000..e0a8c377766
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+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="+dbus nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+ lxde-base/lxde-common
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ dbus? ( sys-apps/dbus )"
+RDEPEND="${COMMON_DEPEND}
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto"
+REQUIRED_USE="upower? ( dbus )"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable dbus) \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild
new file mode 100644
index 00000000000..f66bfcbbf62
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.20"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm 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/libgee:0
+ dev-libs/dbus-glib
+ 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"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
new file mode 100644
index 00000000000..a9811c9e432
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.22"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~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/libgee:0
+ dev-libs/dbus-glib
+ 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"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ # bug #497100
+ epatch "${FILESDIR}"/${P}-configure.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
new file mode 100644
index 00000000000..27270a0ad8d
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.22"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm 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/libgee:0
+ dev-libs/dbus-glib
+ 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"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ # bug #497100
+ epatch "${FILESDIR}"/${P}-configure.patch
+
+ # bug #496880
+ epatch "${FILESDIR}"/${P}-fix-logind-dbus-calls.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
new file mode 100644
index 00000000000..b58c3ab3be1
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.20"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~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/libgee:0
+ dev-libs/dbus-glib
+ lxde-base/lxde-common
+ sys-auth/polkit
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ sys-apps/dbus"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxsession-edit
+ 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"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/metadata.xml b/lxde-base/lxsession/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxsession/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>