* [gentoo-commits] gentoo-x86 commit in kde-base/kdebase/files: kdebase-4.0.1-pam-optional.patch kdebase-4.0.1-opengl.patch
@ 2008-03-10 23:23 Wulf Krueger (philantrop)
0 siblings, 0 replies; only message in thread
From: Wulf Krueger (philantrop) @ 2008-03-10 23:23 UTC (permalink / raw
To: gentoo-commits
philantrop 08/03/10 23:23:35
Added: kdebase-4.0.1-pam-optional.patch
kdebase-4.0.1-opengl.patch
Log:
Version bump to KDE 4.0.2.
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 kde-base/kdebase/files/kdebase-4.0.1-pam-optional.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/kdebase-4.0.1-pam-optional.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/kdebase-4.0.1-pam-optional.patch?rev=1.1&content-type=text/plain
Index: kdebase-4.0.1-pam-optional.patch
===================================================================
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)
1.1 kde-base/kdebase/files/kdebase-4.0.1-opengl.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/kdebase-4.0.1-opengl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/files/kdebase-4.0.1-opengl.patch?rev=1.1&content-type=text/plain
Index: kdebase-4.0.1-opengl.patch
===================================================================
Index: workspace/kcontrol/screensaver/CMakeLists.txt
===================================================================
--- workspace/kcontrol/screensaver/CMakeLists.txt (revision 769817)
+++ workspace/kcontrol/screensaver/CMakeLists.txt (working copy)
@@ -1,5 +1,7 @@
+if(OPENGL_FOUND)
check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
+endif(OPENGL_FOUND)
configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
Index: workspace/CMakeLists.txt
===================================================================
--- workspace/CMakeLists.txt (revision 769817)
+++ workspace/CMakeLists.txt (working copy)
@@ -16,8 +16,6 @@
include (MacroLibrary)
include (KDE4Defaults)
-macro_optional_find_package(OpenGL)
-
include(ConfigureChecks.cmake)
configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
Index: workspace/krunner/lock/CMakeLists.txt
===================================================================
--- workspace/krunner/lock/CMakeLists.txt (revision 769817)
+++ workspace/krunner/lock/CMakeLists.txt (working copy)
@@ -5,7 +5,9 @@
########### next target ###############
check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
+if(OPENGL_FOUND)
check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
+endif(OPENGL_FOUND)
configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-11 2:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-10 23:23 [gentoo-commits] gentoo-x86 commit in kde-base/kdebase/files: kdebase-4.0.1-pam-optional.patch kdebase-4.0.1-opengl.patch Wulf Krueger (philantrop)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox