summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-01-18 00:15:14 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-01-18 00:15:14 +0000
commit380796c32a0868d032e63504026529a75039aea0 (patch)
tree3abd925e575d4201efdf16a96da73eb721b4ba06 /kde-base/kcheckpass
parentAdded KDE 4.0.0's kopete. (diff)
downloadhistorical-380796c32a0868d032e63504026529a75039aea0.tar.gz
historical-380796c32a0868d032e63504026529a75039aea0.tar.bz2
historical-380796c32a0868d032e63504026529a75039aea0.zip
Added patches.
Package-Manager: portage-2.1.4
Diffstat (limited to 'kde-base/kcheckpass')
-rw-r--r--kde-base/kcheckpass/ChangeLog6
-rw-r--r--kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch29
2 files changed, 34 insertions, 1 deletions
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 25e88ef4a43f..43221ed0f207 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kcheckpass
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.72 2008/01/17 23:36:20 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.73 2008/01/18 00:10:55 philantrop Exp $
+
+ 18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/kdebase-4.0.0-pam-optional.patch:
+ Added patches.
*kcheckpass-4.0.0 (17 Jan 2008)
diff --git a/kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch
new file mode 100644
index 000000000000..6fb54f05c547
--- /dev/null
+++ b/kde-base/kcheckpass/files/kdebase-4.0.0-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ # PAM_INCLUDE_DIR - the pam include directory
+ # PAM_LIBRARIES - libpam library
+
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ # Already in cache, be silent
+ set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)