Backport patch from upstream to fix build with lightdm-1.7, wrt bug #479114.

(Portage version: 2.1.13.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 57 insertions, 2 deletions

diff --git a/x11-misc/lightdm-kde/ChangeLog b/x11-misc/lightdm-kde/ChangeLog
index e87555fff1f7..713b539a2571 100644
--- a/x11-misc/lightdm-kde/ChangeLog
+++ b/x11-misc/lightdm-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lightdm-kde
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-kde/ChangeLog,v 1.12 2013/07/31 01:15:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-kde/ChangeLog,v 1.13 2013/08/01 12:00:01 kensington Exp $
+
+  01 Aug 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/lightdm-kde-0.3.2.1-lightdm-1.7.patch, lightdm-kde-0.3.2.1.ebuild:
+  Backport patch from upstream to fix build with lightdm-1.7, wrt bug #479114.
 
 *lightdm-kde-0.3.2.1 (31 Jul 2013)
 
diff --git a/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch b/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch
new file mode 100644
index 000000000000..0e83db26166b
--- /dev/null
+++ b/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch
@@ -0,0 +1,49 @@
+From dacd25fc53ecfd8928464420c21ff52b660a0893 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.lane@canonical.com>
+Date: Thu, 1 Aug 2013 21:37:48 +1000
+Subject: [PATCH] FindQLightDM.cmake: Search for new liblightdm-qt-3 as well as
+ old liblightdm-qt-2
+
+BUG: 319480
+---
+ cmake/modules/FindQLightDM.cmake | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQLightDM.cmake b/cmake/modules/FindQLightDM.cmake
+index c055c61..f901cf6 100644
+--- a/cmake/modules/FindQLightDM.cmake
++++ b/cmake/modules/FindQLightDM.cmake
+@@ -19,10 +19,19 @@ set(QLIGHTDM_LIBRARIES_FIND_REQUIRED ${QLightDM_FIND_REQUIRED})
+ 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_path(QLIGHTDM_INCLUDE_DIR
+ )
+ 
+ find_library(QLIGHTDM_LIBRARIES
+-             NAMES lightdm-qt-2
++             NAMES lightdm-qt-${QLIGHTDM_API}
+              HINTS
+              ${PC_QLIGHTDM_LIBDIR}
+              ${PC_QLIGHTDM_LIBRARY_DIRS}
+-- 
+1.8.3.2
+
diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild
index e46cedc4eae6..e6df26fdfa44 100644
--- a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild
+++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild,v 1.1 2013/07/31 01:15:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild,v 1.2 2013/08/01 12:00:01 kensington Exp $
 
 EAPI=5
 
@@ -27,3 +27,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN/-kde}-${PV}
+
+PATCHES=( "${FILESDIR}/${P}-lightdm-1.7.patch" )