← Back to branch summary

~ubuntu-branches/ubuntu/vivid/lightdm-kde/vivid

« back to all changes in this revision

Viewing changes to debian/patches/search-for-liblightdm-qt-2-or-3.patch

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2015-02-26 23:49:42 UTC
  • mfrom: (1.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20150226234942-g82kw55ap9ane79h
Tags: 0.3.2.2-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control:
    + Drop Recommends desktop-base. It contains Debian
      branding that we don't need nor want.
  - debian/*lightdm-kde-greeter.*:
    + Don't install lightdm-kde-greeter.conf.
    + Add 40-lightdm-kde-greeter.conf.
    + Remove postinst and preinst for doing settings.
* Drop search-for-liblightdm-qt-2-or-3.patch, already fixed by
  0001-FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/search-for-liblightdm-qt-2-or-3.patch
1
 
Description: Search for liblightdm-qt-2 and liblightdm-qt-3.
2
 
Author: Iain Lane <iain.lane@canonical.com>
3
 
 
4
 
Index: b/cmake/modules/FindQLightDM.cmake
5
 
===================================================================
6
 
--- a/cmake/modules/FindQLightDM.cmake
7
 
+++ b/cmake/modules/FindQLightDM.cmake
8
 
@@ -19,10 +19,19 @@
9
 
 find_package(PkgConfig)
10
 
 if(PKG_CONFIG_FOUND)
11
 
     if (QLIGHTDM_MIN_VERSION)
12
 
-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
13
 
+        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION})
14
 
     else (QLIGHTDM_MIN_VERSION)
15
 
-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
16
 
+        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3)
17
 
     endif (QLIGHTDM_MIN_VERSION)
18
 
+    SET (QLIGHTDM_API 3)
19
 
+    if (NOT PC_QLIGHTDM_FOUND)
20
 
+        if (QLIGHTDM_MIN_VERSION)
21
 
+            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
22
 
+        else (QLIGHTDM_MIN_VERSION)
23
 
+            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
24
 
+        endif (QLIGHTDM_MIN_VERSION)
25
 
+        SET (QLIGHTDM_API 2)
26
 
+    endif (NOT PC_QLIGHTDM_FOUND)
27
 
 endif(PKG_CONFIG_FOUND)
28
 
 
29
 
 
30
 
@@ -34,7 +43,7 @@
31
 
 )
32
 
 
33
 
 find_library(QLIGHTDM_LIBRARIES
34
 
-             NAMES lightdm-qt-2
35
 
+             NAMES lightdm-qt-${QLIGHTDM_API}
36
 
              HINTS
37
 
              ${PC_QLIGHTDM_LIBDIR}
38
 
              ${PC_QLIGHTDM_LIBRARY_DIRS}