diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-02-10 09:31:13 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-25 17:45:43 +0100 |
commit | 0b3612b0f2e4eea936f5c7058e8f1b870e25f9d3 (patch) | |
tree | e592fb459f741ec47d318a990c7009e05d7de29a | |
parent | fd4180d6fa59a711e1ee602357fae144e66ad216 (diff) | |
download | meta-openembedded-0b3612b0f2e4eea936f5c7058e8f1b870e25f9d3.tar.gz |
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>
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb (renamed from meta-oe/recipes-graphics/lxdm/lxdm_git.bb) | 8 |
2 files changed, 4 insertions, 33 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch index 43f542a31..75dc10c97 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch | |||
@@ -14,36 +14,9 @@ Upstream-Status: submitted [1] | |||
14 | 14 | ||
15 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 15 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
16 | --- | 16 | --- |
17 | configure.ac | 1 + | ||
18 | data/Makefile.am | 5 ----- | ||
19 | data/lxdm.conf.in | 2 +- | 17 | data/lxdm.conf.in | 2 +- |
20 | 3 files changed, 2 insertions(+), 6 deletions(-) | 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 19 | ||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index f28c89a..a2fff5b 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -183,6 +183,7 @@ AC_CONFIG_FILES([ | ||
27 | data/PreReboot | ||
28 | data/PreShutdown | ||
29 | data/LoginReady | ||
30 | + data/lxdm.conf | ||
31 | ]) | ||
32 | AC_CONFIG_FILES([data/lxdm], [chmod +x data/lxdm]) | ||
33 | AC_OUTPUT | ||
34 | diff --git a/data/Makefile.am b/data/Makefile.am | ||
35 | index 9500da9..ad64b11 100644 | ||
36 | --- a/data/Makefile.am | ||
37 | +++ b/data/Makefile.am | ||
38 | @@ -1,8 +1,3 @@ | ||
39 | -FULL_LIBEXECDIR=$(libexecdir) | ||
40 | - | ||
41 | -lxdm.conf: lxdm.conf.in | ||
42 | - cat lxdm.conf.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ | ||
43 | - | ||
44 | NULL= | ||
45 | |||
46 | sbin_SCRIPTS = lxdm | ||
47 | diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in | 20 | diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in |
48 | index d93f280..6206262 100644 | 21 | index d93f280..6206262 100644 |
49 | --- a/data/lxdm.conf.in | 22 | --- a/data/lxdm.conf.in |
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 29b8dc582..227709251 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | |||
@@ -3,15 +3,15 @@ HOMEPAGE = "http://blog.lxde.org/?p=531" | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
6 | git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};branch=master \ | 6 | ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ |
7 | file://lxdm.conf \ | 7 | file://lxdm.conf \ |
8 | ${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ | 8 | ${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ |
9 | ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ | 9 | ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ |
10 | file://0002-let-autotools-create-lxdm.conf.patch \ | 10 | file://0002-let-autotools-create-lxdm.conf.patch \ |
11 | " | 11 | " |
12 | SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" | ||
13 | SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" | ||
12 | 14 | ||
13 | SRCREV = "bf90ec7df5ff6745f703500c5792c344fbaef301" | ||
14 | PV = "0.5.0+git${SRCPV}" | ||
15 | PE = "1" | 15 | PE = "1" |
16 | 16 | ||
17 | DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" | 17 | 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 | |||
24 | # depends on virtual/libx11 | 24 | # depends on virtual/libx11 |
25 | REQUIRED_DISTRO_FEATURES = "x11" | 25 | REQUIRED_DISTRO_FEATURES = "x11" |
26 | 26 | ||
27 | S = "${WORKDIR}/git" | ||
28 | |||
29 | CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " | 27 | CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " |
30 | 28 | ||
31 | EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ | 29 | EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ |