From 0b3612b0f2e4eea936f5c7058e8f1b870e25f9d3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 10 Feb 2016 09:31:13 +0100 Subject: lxdm: update to 0.5.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Signed-off-by: Martin Jansa --- .../lxdm/0002-let-autotools-create-lxdm.conf.patch | 29 +------- meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 78 +++++++++++++++++++++ meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 80 ---------------------- 3 files changed, 79 insertions(+), 108 deletions(-) create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb delete mode 100644 meta-oe/recipes-graphics/lxdm/lxdm_git.bb 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] Signed-off-by: Andreas Müller --- - configure.ac | 1 + - data/Makefile.am | 5 ----- 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 index d93f280..6206262 100644 --- a/data/lxdm.conf.in diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb new file mode 100644 index 000000000..227709251 --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -0,0 +1,78 @@ +SUMMARY = "LXDM is the lightweight display manager" +HOMEPAGE = "http://blog.lxde.org/?p=531" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ + file://lxdm.conf \ + ${@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)} \ + file://0002-let-autotools-create-lxdm.conf.patch \ +" +SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" +SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" + +PE = "1" + +DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" +DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" + +# combine oe-core way with angstrom DISTRO_TYPE +DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" + +inherit autotools pkgconfig gettext systemd distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " + +EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ + ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ +" + +do_configure_prepend() { + cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/ +} + +do_compile_append() { + # default background configured not available / no password field available / no default screensaver + sed -i -e 's,bg=,# bg=,g' \ + -e 's,# skip_password=,skip_password=,g' \ + -e 's,# arg=.*,arg=${bindir}/X -s 0,g' \ + ${S}/data/lxdm.conf.in + # add default configuration + oe_runmake -C ${B}/data lxdm.conf +} + +do_install_append() { + install -d ${D}${localstatedir}/lib/lxdm + install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm + if ${@base_contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + # ArchLinux version of pam config has the following advantages: + # * simple setup of passwordless login + # * in XFCE powerdown/restart enabled in logoff dialog + install -m 644 ${WORKDIR}/${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm + fi +} + +# make installed languages choosable +pkg_postinst_${PN} () { +langs="" +for lang in `find $D${libdir}/locale -maxdepth 1 | grep _ | sort`; do +lang=`basename $lang` +if [ "x$langs" = "x" ]; then + langs="$lang" +else + langs="$langs $lang" +fi +done +sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf +} + +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "lxdm.service" diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb deleted file mode 100644 index 29b8dc582..000000000 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "LXDM is the lightweight display manager" -HOMEPAGE = "http://blog.lxde.org/?p=531" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};branch=master \ - file://lxdm.conf \ - ${@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)} \ - file://0002-let-autotools-create-lxdm.conf.patch \ -" - -SRCREV = "bf90ec7df5ff6745f703500c5792c344fbaef301" -PV = "0.5.0+git${SRCPV}" -PE = "1" - -DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" -DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" - -# combine oe-core way with angstrom DISTRO_TYPE -DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" - -inherit autotools pkgconfig gettext systemd distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -S = "${WORKDIR}/git" - -CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " - -EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ - ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ -" - -do_configure_prepend() { - cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/ -} - -do_compile_append() { - # default background configured not available / no password field available / no default screensaver - sed -i -e 's,bg=,# bg=,g' \ - -e 's,# skip_password=,skip_password=,g' \ - -e 's,# arg=.*,arg=${bindir}/X -s 0,g' \ - ${S}/data/lxdm.conf.in - # add default configuration - oe_runmake -C ${B}/data lxdm.conf -} - -do_install_append() { - install -d ${D}${localstatedir}/lib/lxdm - install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm - if ${@base_contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then - # ArchLinux version of pam config has the following advantages: - # * simple setup of passwordless login - # * in XFCE powerdown/restart enabled in logoff dialog - install -m 644 ${WORKDIR}/${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm - fi -} - -# make installed languages choosable -pkg_postinst_${PN} () { -langs="" -for lang in `find $D${libdir}/locale -maxdepth 1 | grep _ | sort`; do -lang=`basename $lang` -if [ "x$langs" = "x" ]; then - langs="$lang" -else - langs="$langs $lang" -fi -done -sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf -} - -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "lxdm.service" -- cgit v1.2.3-54-g00ecf