Date: Tuesday, November 22, 2011 @ 14:52:16 Author: andrea Revision: 143102
Backport KDE BUG#287212 Added: kdebase-workspace/trunk/fix-wrong-files-location.patch Modified: kdebase-workspace/trunk/PKGBUILD --------------------------------+ PKGBUILD | 9 +++++++-- fix-wrong-files-location.patch | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-11-22 19:34:09 UTC (rev 143101) +++ PKGBUILD 2011-11-22 19:52:16 UTC (rev 143102) @@ -32,7 +32,8 @@ options=('emptydirs') source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-wrong-files-location.patch') sha1sums=('e9cceb61d41a35edd3bc0c1f77d516f5197b13b1' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -41,7 +42,8 @@ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'f7a12af77b5ff48148e2b6a3c271f0bf4755d172') build() { cd "${srcdir}"/${_pkgname}-${pkgver} @@ -50,6 +52,9 @@ patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch + # Already fixed upstream + patch -p1 -i "${srcdir}"/fix-wrong-files-location.patch + cd "${srcdir}" mkdir build cd build Added: fix-wrong-files-location.patch =================================================================== --- fix-wrong-files-location.patch (rev 0) +++ fix-wrong-files-location.patch 2011-11-22 19:52:16 UTC (rev 143102) @@ -0,0 +1,22 @@ +commit ecb88c2d999b5a69eda67b72b8e2a74cb56ee331 +Author: Christophe Giboudeaux <cgiboude...@gmx.com> +Date: Tue Nov 22 02:53:26 2011 +0100 + + Don't install files in the build dir. + BUG: 287212 + +diff --git a/kcontrol/keyboard/tests/CMakeLists.txt b/kcontrol/keyboard/tests/CMakeLists.txt +index 4be6b30..420773d 100644 +--- a/kcontrol/keyboard/tests/CMakeLists.txt ++++ b/kcontrol/keyboard/tests/CMakeLists.txt +@@ -17,7 +17,9 @@ KEYBOARD_DAEMON_UNIT_TESTS(iso_codes) + kde4_add_unit_test(flags_test NOGUI flags_test.cpp ../flags.cpp ../x11_helper.cpp ../keyboard_config.cpp ../xkb_rules.cpp) + target_link_libraries(flags_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB}) + +-install( DIRECTORY config DESTINATION ${CMAKE_CURRENT_BINARY_DIR} ) ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.1.1.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.1.1.xml COPYONLY) ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.bad.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.bad.xml COPYONLY) ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.xml COPYONLY) + + if( X11_XTest_FOUND ) + kde4_add_unit_test(keyboard_daemon_test NOGUI keyboard_daemon_test.cpp ../keyboard_daemon.cpp ../layout_memory.cpp ../layout_memory_persister.cpp ../flags.cpp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp ../bindings.cpp ../layouts_menu.cpp ../numlockx.c)