[Lunar-commits] <moonbase-other> Merge branch 'lightdm'

[v4hn]

commit 1b68b0442b3d62a35cc11b6a7e51bac35a562c4f
Author: v4hn <me at v4hn.de>
Date: Fri, 20 Sep 2013 15:51:25 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/1b68b0442b3d62a35cc11b6a7e51bac35a562c4f

Merge branch 'lightdm'
---
  x11-utils/lightdm-gtk-greeter/DETAILS | +3/-3     
  x11-utils/lightdm/BUILD               | +3/-0     
  x11-utils/lightdm/DEPENDS             | +9/-0     
  x11-utils/lightdm/DETAILS             | +5/-13    
  x11-utils/lightdm/PRE_BUILD           | +5/-3     
  5 files changed, 25 insertions(+), 19 deletions(-)

--- a/x11-utils/lightdm-gtk-greeter/DETAILS
+++ b/x11-utils/lightdm-gtk-greeter/DETAILS
@@ -1,12 +1,12 @@
           MODULE=lightdm-gtk-greeter
-         VERSION=1.5.1
+         VERSION=1.6.0
           SOURCE=${MODULE}-${VERSION}.tar.gz
       SOURCE_URL=https://launchpad.net/lightdm-gtk-greeter/1.6/${VERSION}/+download/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=md5:d40b61de2a1585fe6d17af70bc1a752f
+      SOURCE_VFY=sha1:372e3a041ace725aec0ecb92f83098f1b1e5b64b
         WEB_SITE="https://launchpad.net/lightdm-gtk-greeter"
          ENTERED=20121231
-         UPDATED=20130211
+         UPDATED=20130625
            SHORT="Reference GTK+ greeter for LightDM"
 cat <<EOF
 Reference GTK+ greeter for LightDM.
--- /dev/null
+++ b/x11-utils/lightdm/BUILD
@@ -0,0 +1,3 @@
+OPTS+=" --disable-tests --disable-static" &&
+
+default_build
--- a/x11-utils/lightdm/DEPENDS
+++ b/x11-utils/lightdm/DEPENDS
@@ -2,3 +2,12 @@ depends itstool
 depends Linux-PAM
 depends glib-2
 depends %X
+
+optional_depends "libxklavier" "--enable-liblightdm-gobject" "--disable-liblightdm-gobject" "Enable library for gobject based greeters"
+optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "Enable gobject-introspection (only if y to libxklavier)"
+
+optional_depends "qt4" "--enable-liblightdm-qt" "--disable-liblightdm-qt" "Enable library for qt4 based greeters"
+
+
+# lunar doesn't ship qt5 yet
+#optional_depends "qt5" "--enable-liblightdm-qt5" "--disable-liblightdm-qt5" "Enable library for qt5 based greeters"
--- a/x11-utils/lightdm/DETAILS
+++ b/x11-utils/lightdm/DETAILS
@@ -1,25 +1,17 @@
           MODULE=lightdm
-         VERSION=1.5.2
+         VERSION=1.7.16
           SOURCE=${MODULE}-${VERSION}.tar.xz
          SOURCE2=${MODULE}-1.5.0-pam.patch
-         SOURCE3=${MODULE}-1.5.0-systemd-logind.patch
-         SOURCE4=${MODULE}-1.5.0-makefile.patch
-         SOURCE5=${MODULE}-1.4.0-systemd_login1_power.patch
-      SOURCE_URL=https://launchpad.net/lightdm/1.6/${VERSION}/+download/
+      SOURCE_URL=https://launchpad.net/lightdm/${VERSION%.*}/${VERSION}/+download/
      SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
-     SOURCE4_URL=$PATCH_URL
-     SOURCE5_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=md5:8359d74c7ae1342d7c11ce3fba0862ca
+      SOURCE_VFY=sha1:fc91d53b42d217e5628e25be7e1c66befd6cd569
      SOURCE2_VFY=sha1:5fd2c5a6576eae23f14c695378edde401048f909
-     SOURCE3_VFY=sha1:9eb14c13fa4ce94eb5b5358ef97cb2765f7c3be5
-     SOURCE4_VFY=sha1:c22daab89358d8865bcf2fbaf25cf13cef1802b7
-     SOURCE5_VFY=md5:1aac33da4bb5d6c5bb2b8fa72ae922b9
         WEB_SITE="http://www.freedesktop.org/wiki/Software/LightDM"
          ENTERED=20121231
-         UPDATED=20130325
+         UPDATED=20130920
            SHORT="light, fast, extensible and multi-desktop display manager"
+
 cat <<EOF
 LightDM is a cross-desktop display manager that aims is to be the
 standard display manager for the X.org X server. The motivation for
--- a/x11-utils/lightdm/PRE_BUILD
+++ b/x11-utils/lightdm/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 patch_it $SOURCE2 1 &&
-patch_it $SOURCE3 1 &&
-patch_it $SOURCE4 1 &&
-patch_it $SOURCE5 1
+sedit 's/LIBLIGHTDM_GOBJECT/GLIB/g' liblightdm-qt/Makefile.in &&
+
+if ! in_depends $MODULE libxklavier; then
+  sedit '/-llightdm-gobject-1/ d' liblightdm-qt/Makefile.in
+fi