Archives
Archives
| From: | "Wulf Krueger (philantrop)" <philantrop@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in kde-base/krunner/files: krunner-4.0.1-opengl.patch krunner-4.0.1-linkage.patch |
| Date: | Thu, 07 Feb 2008 00:13:03 |
| Message-Id: | E1JMuNw-0000Qd-CF@stork.gentoo.org |
| 1 | philantrop 08/02/07 00:13:00 |
| 2 | |
| 3 | Added: krunner-4.0.1-opengl.patch |
| 4 | krunner-4.0.1-linkage.patch |
| 5 | Log: |
| 6 | Version bump to KDE 4.0.1. |
| 7 | (Portage version: 2.1.4.1) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 kde-base/krunner/files/krunner-4.0.1-opengl.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/krunner/files/krunner-4.0.1-opengl.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/krunner/files/krunner-4.0.1-opengl.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: krunner-4.0.1-opengl.patch |
| 16 | =================================================================== |
| 17 | --- workspace/CMakeLists.txt (revision 767202) |
| 18 | +++ workspace/CMakeLists.txt (working copy) |
| 19 | @@ -16,8 +16,6 @@ |
| 20 | include (MacroLibrary) |
| 21 | include (KDE4Defaults) |
| 22 | |
| 23 | -macro_optional_find_package(OpenGL) |
| 24 | - |
| 25 | include(ConfigureChecks.cmake) |
| 26 | configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) |
| 27 | configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) |
| 28 | --- workspace/krunner/lock/CMakeLists.txt (revision 766878) |
| 29 | +++ workspace/krunner/lock/CMakeLists.txt (working copy) |
| 30 | @@ -5,7 +5,9 @@ |
| 31 | ########### next target ############### |
| 32 | |
| 33 | check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE) |
| 34 | +if(OPENGL_FOUND) |
| 35 | check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL) |
| 36 | +endif(OPENGL_FOUND) |
| 37 | |
| 38 | configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h) |
| 39 | |
| 40 | |
| 41 | |
| 42 | |
| 43 | 1.1 kde-base/krunner/files/krunner-4.0.1-linkage.patch |
| 44 | |
| 45 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/krunner/files/krunner-4.0.1-linkage.patch?rev=1.1&view=markup |
| 46 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/krunner/files/krunner-4.0.1-linkage.patch?rev=1.1&content-type=text/plain |
| 47 | |
| 48 | Index: krunner-4.0.1-linkage.patch |
| 49 | =================================================================== |
| 50 | commit 4f68e8ffcb5adfc2f020f2cc58cbf0aa92e8be18 |
| 51 | Author: Ingmar Vanhassel <ingmar.vanhassel@×××××.com> |
| 52 | Date: Wed Jan 9 23:35:56 2008 +0100 |
| 53 | |
| 54 | Fix linkage in krunner. |
| 55 | --- |
| 56 | kdebase/workspace/krunner/CMakeLists.txt | 2 +- |
| 57 | 1 files changed, 1 insertions(+), 1 deletions(-) |
| 58 | |
| 59 | diff --git a/kdebase/workspace/krunner/CMakeLists.txt b/kdebase/workspace/krunner/CMakeLists.txt |
| 60 | index 732496e..422bea8 100644 |
| 61 | --- a/kdebase/workspace/krunner/CMakeLists.txt |
| 62 | +++ b/kdebase/workspace/krunner/CMakeLists.txt |
| 63 | @@ -40,7 +40,7 @@ kde4_add_ui_files(krunner_SRCS runners/shell/shellOptions.ui) |
| 64 | kde4_add_kdeinit_executable(krunner ${krunner_SRCS}) |
| 65 | # needs qt3support for Q3ListView in lockdlg |
| 66 | target_link_libraries(kdeinit_krunner plasma kworkspace processui ${KDE4_THREADWEAVER_LIBRARIES} ${X11_Xrender_LIB} ${KDE4_KDEUI_LIBS} |
| 67 | -${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} ) |
| 68 | +${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KIO_LIBS} ) |
| 69 | if(X11_Xss_LIB) |
| 70 | target_link_libraries(kdeinit_krunner ${X11_Xss_LIB}) |
| 71 | endif(X11_Xss_LIB) |
| 72 | |
| 73 | |
| 74 | |
| 75 | -- |
| 76 | gentoo-commits@l.g.o mailing list |