Permalink
Browse files

lightdm: fix compile without libxklavier & cleanup

  • Loading branch information...
1 parent 3315d58 commit 55a77254c955c1d941b137d39c1d638ca9a794e6 @v4hn v4hn committed Sep 20, 2013
Showing with 15 additions and 3 deletions.
  1. +3 −0 x11-utils/lightdm/BUILD
  2. +6 −2 x11-utils/lightdm/DEPENDS
  3. +1 −0 x11-utils/lightdm/DETAILS
  4. +5 −1 x11-utils/lightdm/PRE_BUILD
View
@@ -0,0 +1,3 @@
+OPTS+=" --disable-tests --disable-static" &&
+
+default_build
@@ -4,6 +4,10 @@ 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"
-optional_depends "qt5" "--enable-liblightdm-qt5" "--disable-liblightdm-qt5" "Enable library for qt5 based greeters"
-optional_depends "gobject-interospection" "--enable-introspection" "--disable-introspection" "Enable library for qt5 based greeters"
+
+
+# lunar doesn't ship qt5 yet
+#optional_depends "qt5" "--enable-liblightdm-qt5" "--disable-liblightdm-qt5" "Enable library for qt5 based greeters"
@@ -11,6 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
ENTERED=20121231
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
@@ -1,4 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch_it $SOURCE2 1 &&
-sedit 's/LIBLIGHTDM_GOBJECT/GLIB/g' liblightdm-qt/Makefile.in
+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

0 comments on commit 55a7725

Please sign in to comment.