diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-01-27 19:59:37 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-01-27 19:59:37 +0000 |
| commit | f7fab9fd0da36c7579943bf69d58a9d0ad15a7f5 (patch) | |
| tree | 122f8f959cac0633ff022015655d647bb7dd452c /kde-base/kdebase | |
| parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
| download | gentoo-2-f7fab9fd0da36c7579943bf69d58a9d0ad15a7f5.tar.gz gentoo-2-f7fab9fd0da36c7579943bf69d58a9d0ad15a7f5.tar.bz2 gentoo-2-f7fab9fd0da36c7579943bf69d58a9d0ad15a7f5.zip | |
Fix compilation with USE=-opengl. For bug #206517.
(Portage version: 2.1.4)
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/kdebase-4.0.0-opengl.patch | 33 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-4.0.0.ebuild | 5 |
3 files changed, 41 insertions, 3 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 83d0dfabfa5d..6c35ee7e8a09 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.420 2008/01/25 19:40:49 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.421 2008/01/27 19:59:36 zlin Exp $ + + 27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org> + +files/kdebase-4.0.0-opengl.patch, kdebase-4.0.0.ebuild: + Fix compilation with USE=-opengl. For bug #206517. 25 Jan 2008; Markus Rothe <corsair@gentoo.org> kdebase-3.5.7-r6.ebuild: Stable on ppc64; bug #207203 diff --git a/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch b/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch new file mode 100644 index 000000000000..76d5c4ed6439 --- /dev/null +++ b/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch @@ -0,0 +1,33 @@ +--- workspace/CMakeLists.txt (revision 767202) ++++ 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 ) +--- workspace/kcontrol/screensaver/CMakeLists.txt (revision 766878) ++++ workspace/kcontrol/screensaver/CMakeLists.txt (working copy) +@@ -1,5 +1,7 @@ + ++if(WITH_OpenGL) + check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL) ++endif(WITH_OpenGL) + configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h ) + + add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) +--- workspace/krunner/lock/CMakeLists.txt (revision 766878) ++++ workspace/krunner/lock/CMakeLists.txt (working copy) +@@ -5,7 +5,9 @@ + ########### next target ############### + + check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE) ++if(WITH_OpenGL) + check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL) ++endif(WITH_OpenGL) + + configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h) + diff --git a/kde-base/kdebase/kdebase-4.0.0.ebuild b/kde-base/kdebase/kdebase-4.0.0.ebuild index eca7321e5e9f..85aba24d8704 100644 --- a/kde-base/kdebase/kdebase-4.0.0.ebuild +++ b/kde-base/kdebase/kdebase-4.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.0.ebuild,v 1.4 2008/01/22 04:16:08 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.0.ebuild,v 1.5 2008/01/27 19:59:36 zlin Exp $ EAPI="1" @@ -115,7 +115,8 @@ PDEPEND=" PATCHES="${FILESDIR}/gentoo-startkde.patch ${FILESDIR}/kdm-${PV}-genkdmconf.patch - ${FILESDIR}/${P}-pam-optional.patch" + ${FILESDIR}/${P}-pam-optional.patch + ${FILESDIR}/${P}-opengl.patch" pkg_setup() { KDE4_BUILT_WITH_USE_CHECK="--missing false kde-base/kdelibs:${SLOT} alsa semantic-desktop |