summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kazakov <nullishzero@gentoo.org>2013-10-17 08:19:58 +0000
committerPavel Kazakov <nullishzero@gentoo.org>2013-10-17 08:19:58 +0000
commit4ff6152ea6d0c79aad0b54f9e7f08b54da4d98a1 (patch)
treec5f77f1e6c8d016ba429f8f7bc344a2996d0bad6 /lxde-base
parentVersion bump (bug #472524), also updated the following modules (thanks to jbe... (diff)
downloadgentoo-2-4ff6152ea6d0c79aad0b54f9e7f08b54da4d98a1.tar.gz
gentoo-2-4ff6152ea6d0c79aad0b54f9e7f08b54da4d98a1.tar.bz2
gentoo-2-4ff6152ea6d0c79aad0b54f9e7f08b54da4d98a1.zip
Add patch for bug #488082; patch thanks to Jacob Godserv.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x39E7AB2E)
Diffstat (limited to 'lxde-base')
-rw-r--r--lxde-base/lxsession/ChangeLog6
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch11
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2.ebuild11
3 files changed, 25 insertions, 3 deletions
diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog
index 1df2c950eddb..ad69de99a7b3 100644
--- a/lxde-base/lxsession/ChangeLog
+++ b/lxde-base/lxsession/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for lxde-base/lxsession
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.43 2013/10/08 18:32:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.44 2013/10/17 08:19:58 nullishzero Exp $
+
+ 17 Oct 2013; <paul@gentoo.org> +files/lxsession-0.4.9.2-makefile.patch,
+ lxsession-0.4.9.2.ebuild:
+ Add patch for bug #488082; patch thanks to Jacob Godserv.
08 Oct 2013; Markos Chandras <hwoarang@gentoo.org> lxsession-0.4.9.2.ebuild:
Add missing dev-libs/libgee:0 dependency thanks to Viktor Yu. Kovalskiy. Bug
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 000000000000..ea4de3350ae7
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
@@ -0,0 +1,11 @@
+--- 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.9.2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
index 3b3374f84cd2..f78cf09c9dd0 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2.ebuild,v 1.2 2013/10/08 18:32:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2.ebuild,v 1.3 2013/10/17 08:19:58 nullishzero Exp $
EAPI=5
VALA_MIN_API_VERSION="0.14"
VALA_MAX_API_VERSION="0.20"
-inherit vala
+inherit vala autotools
DESCRIPTION="LXDE session manager (lite version)"
HOMEPAGE="http://lxde.sf.net/"
@@ -37,6 +37,13 @@ DEPEND="${COMMON_DEPEND}
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 \