mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 20:49:13 +00:00
lxdm: update to 0.5.3
* we go back to released sources * parts of patch 0002.. were applied - have tried to discuss with project's maintainer without success Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
fd4180d6fa
commit
0b3612b0f2
@ -14,36 +14,9 @@ Upstream-Status: submitted [1]
|
|||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||||
---
|
---
|
||||||
configure.ac | 1 +
|
|
||||||
data/Makefile.am | 5 -----
|
|
||||||
data/lxdm.conf.in | 2 +-
|
data/lxdm.conf.in | 2 +-
|
||||||
3 files changed, 2 insertions(+), 6 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index f28c89a..a2fff5b 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -183,6 +183,7 @@ AC_CONFIG_FILES([
|
|
||||||
data/PreReboot
|
|
||||||
data/PreShutdown
|
|
||||||
data/LoginReady
|
|
||||||
+ data/lxdm.conf
|
|
||||||
])
|
|
||||||
AC_CONFIG_FILES([data/lxdm], [chmod +x data/lxdm])
|
|
||||||
AC_OUTPUT
|
|
||||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
|
||||||
index 9500da9..ad64b11 100644
|
|
||||||
--- a/data/Makefile.am
|
|
||||||
+++ b/data/Makefile.am
|
|
||||||
@@ -1,8 +1,3 @@
|
|
||||||
-FULL_LIBEXECDIR=$(libexecdir)
|
|
||||||
-
|
|
||||||
-lxdm.conf: lxdm.conf.in
|
|
||||||
- cat lxdm.conf.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@
|
|
||||||
-
|
|
||||||
NULL=
|
|
||||||
|
|
||||||
sbin_SCRIPTS = lxdm
|
|
||||||
diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
|
diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
|
||||||
index d93f280..6206262 100644
|
index d93f280..6206262 100644
|
||||||
--- a/data/lxdm.conf.in
|
--- a/data/lxdm.conf.in
|
||||||
|
|||||||
@ -3,15 +3,15 @@ HOMEPAGE = "http://blog.lxde.org/?p=531"
|
|||||||
LICENSE = "GPLv3"
|
LICENSE = "GPLv3"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};branch=master \
|
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \
|
||||||
file://lxdm.conf \
|
file://lxdm.conf \
|
||||||
${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \
|
${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \
|
||||||
${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
|
${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
|
||||||
file://0002-let-autotools-create-lxdm.conf.patch \
|
file://0002-let-autotools-create-lxdm.conf.patch \
|
||||||
"
|
"
|
||||||
|
SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0"
|
||||||
|
SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f"
|
||||||
|
|
||||||
SRCREV = "bf90ec7df5ff6745f703500c5792c344fbaef301"
|
|
||||||
PV = "0.5.0+git${SRCPV}"
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
|
DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
|
||||||
@ -24,8 +24,6 @@ inherit autotools pkgconfig gettext systemd distro_features_check
|
|||||||
# depends on virtual/libx11
|
# depends on virtual/libx11
|
||||||
REQUIRED_DISTRO_FEATURES = "x11"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
|
CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
|
||||||
|
|
||||||
EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \
|
EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \
|
||||||
Loading…
x
Reference in New Issue
Block a user