[arch-commits] Commit in lightdm-kde-greeter/trunk (PKGBUILD findlightdm.patch)

[Maxime Gauduin]

    Date: Friday, October 11, 2013 @ 21:20:53
  Author: alucryd
Revision: 98489

FS#37296: lightdm-kde-greeter 0.3.2.1-3

Added:
  lightdm-kde-greeter/trunk/findlightdm.patch
Modified:
  lightdm-kde-greeter/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   16 ++++++++++++----
 findlightdm.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-11 18:25:50 UTC (rev 98488)
+++ PKGBUILD	2013-10-11 19:20:53 UTC (rev 98489)
@@ -6,7 +6,7 @@
 
 pkgname=lightdm-kde-greeter
 pkgver=0.3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE greeter for LightDM"
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/playground/base/lightdm"
@@ -16,12 +16,20 @@
 backup=('etc/lightdm/lightdm-kde-greeter.conf'
         'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf')
 source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2"
+        'findlightdm.patch'
         'lightdm-kde-greeter.conf')
 sha256sums=('65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188'
+            '9a042204df841f93a817c0613284bb09006e5dc4af910648025e7ab1bb56e114'
             'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8')
 
+prepare() {
+  cd lightdm-${pkgver}
+
+  patch -Np1 -i ../findlightdm.patch
+}
+
 build() {
-  cd "${srcdir}"/lightdm-${pkgver}
+  cd lightdm-${pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -28,12 +36,12 @@
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
   make
 }
 
 package() {
-  cd "${srcdir}"/lightdm-${pkgver}/build
+  cd lightdm-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
   mv "${pkgdir}"/usr/{sbin,bin}

Added: findlightdm.patch
===================================================================
--- findlightdm.patch	                        (rev 0)
+++ findlightdm.patch	2013-10-11 19:20:53 UTC (rev 98489)
@@ -0,0 +1,33 @@
+--- a/cmake/modules/FindQLightDM.cmake
++++ b/cmake/modules/FindQLightDM.cmake
+@@ -19,10 +19,19 @@
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+     if (QLIGHTDM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
++        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION})
+     else (QLIGHTDM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
++        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3)
+     endif (QLIGHTDM_MIN_VERSION)
++    SET (QLIGHTDM_API 3)
++    if (NOT PC_QLIGHTDM_FOUND)
++        if (QLIGHTDM_MIN_VERSION)
++            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
++        else (QLIGHTDM_MIN_VERSION)
++            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
++        endif (QLIGHTDM_MIN_VERSION)
++        SET (QLIGHTDM_API 2)
++    endif (NOT PC_QLIGHTDM_FOUND)
+ endif(PKG_CONFIG_FOUND)
+ 
+ 
+@@ -34,7 +43,7 @@
+ )
+ 
+ find_library(QLIGHTDM_LIBRARIES
+-             NAMES lightdm-qt-2
++             NAMES lightdm-qt-${QLIGHTDM_API}
+              HINTS
+              ${PC_QLIGHTDM_LIBDIR}
+              ${PC_QLIGHTDM_LIBRARY_DIRS}