| 1 |
kensington 13/08/01 12:00:01 |
| 2 |
|
| 3 |
Added: lightdm-kde-0.3.2.1-lightdm-1.7.patch |
| 4 |
Log: |
| 5 |
Backport patch from upstream to fix build with lightdm-1.7, wrt bug #479114. |
| 6 |
|
| 7 |
(Portage version: 2.1.13.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lightdm-kde-0.3.2.1-lightdm-1.7.patch |
| 16 |
=================================================================== |
| 17 |
From dacd25fc53ecfd8928464420c21ff52b660a0893 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Iain Lane <iain.lane@×××××××××.com> |
| 19 |
Date: Thu, 1 Aug 2013 21:37:48 +1000 |
| 20 |
Subject: [PATCH] FindQLightDM.cmake: Search for new liblightdm-qt-3 as well as |
| 21 |
old liblightdm-qt-2 |
| 22 |
|
| 23 |
BUG: 319480 |
| 24 |
--- |
| 25 |
cmake/modules/FindQLightDM.cmake | 15 ++++++++++++--- |
| 26 |
1 file changed, 12 insertions(+), 3 deletions(-) |
| 27 |
|
| 28 |
diff --git a/cmake/modules/FindQLightDM.cmake b/cmake/modules/FindQLightDM.cmake |
| 29 |
index c055c61..f901cf6 100644 |
| 30 |
--- a/cmake/modules/FindQLightDM.cmake |
| 31 |
+++ b/cmake/modules/FindQLightDM.cmake |
| 32 |
@@ -19,10 +19,19 @@ set(QLIGHTDM_LIBRARIES_FIND_REQUIRED ${QLightDM_FIND_REQUIRED}) |
| 33 |
find_package(PkgConfig) |
| 34 |
if(PKG_CONFIG_FOUND) |
| 35 |
if (QLIGHTDM_MIN_VERSION) |
| 36 |
- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) |
| 37 |
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION}) |
| 38 |
else (QLIGHTDM_MIN_VERSION) |
| 39 |
- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) |
| 40 |
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3) |
| 41 |
endif (QLIGHTDM_MIN_VERSION) |
| 42 |
+ SET (QLIGHTDM_API 3) |
| 43 |
+ if (NOT PC_QLIGHTDM_FOUND) |
| 44 |
+ if (QLIGHTDM_MIN_VERSION) |
| 45 |
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) |
| 46 |
+ else (QLIGHTDM_MIN_VERSION) |
| 47 |
+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) |
| 48 |
+ endif (QLIGHTDM_MIN_VERSION) |
| 49 |
+ SET (QLIGHTDM_API 2) |
| 50 |
+ endif (NOT PC_QLIGHTDM_FOUND) |
| 51 |
endif(PKG_CONFIG_FOUND) |
| 52 |
|
| 53 |
|
| 54 |
@@ -34,7 +43,7 @@ find_path(QLIGHTDM_INCLUDE_DIR |
| 55 |
) |
| 56 |
|
| 57 |
find_library(QLIGHTDM_LIBRARIES |
| 58 |
- NAMES lightdm-qt-2 |
| 59 |
+ NAMES lightdm-qt-${QLIGHTDM_API} |
| 60 |
HINTS |
| 61 |
${PC_QLIGHTDM_LIBDIR} |
| 62 |
${PC_QLIGHTDM_LIBRARY_DIRS} |
| 63 |
-- |
| 64 |
1.8.3.2 |
Archives