From 6bc0c00afb02dbb7db86809a42b832b108ab0336 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 19 Dec 2012 15:24:31 -0600 Subject: [PATCH] rebase parallel_devel, drop kmailservice hack --- ...tch => kdelibs-4.9.95-parallel_devel.patch | 60 +++++++++---------- kdelibs.spec | 8 +-- 2 files changed, 31 insertions(+), 37 deletions(-) rename kdelibs-4.5.80-parallel_devel.patch => kdelibs-4.9.95-parallel_devel.patch (82%) diff --git a/kdelibs-4.5.80-parallel_devel.patch b/kdelibs-4.9.95-parallel_devel.patch similarity index 82% rename from kdelibs-4.5.80-parallel_devel.patch rename to kdelibs-4.9.95-parallel_devel.patch index 3058de7..97979db 100644 --- a/kdelibs-4.5.80-parallel_devel.patch +++ b/kdelibs-4.9.95-parallel_devel.patch @@ -1,6 +1,6 @@ -diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake 2010-10-27 21:55:42.000000000 +0200 -+++ kdelibs-4.5.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2010-11-20 19:41:54.000000000 +0100 +diff -up kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2012-12-18 02:26:38.000000000 -0600 ++++ kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake 2012-12-19 15:21:37.963466601 -0600 @@ -38,10 +38,10 @@ # The following variables are defined for the various tools required to # compile KDE software: @@ -23,7 +23,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) -@@ -506,31 +506,31 @@ +@@ -509,31 +509,31 @@ if (_kdeBootStrapping) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC if (NOT WINCE) @@ -62,7 +62,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) -@@ -579,7 +579,8 @@ +@@ -582,7 +582,8 @@ else (_kdeBootStrapping) # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake, # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables @@ -72,7 +72,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} ) -@@ -593,18 +594,18 @@ +@@ -596,18 +597,18 @@ else (_kdeBootStrapping) # get the build CONFIGURATIONS which were exported in this file, and use just the first # of them to get the location of the installed executables @@ -95,7 +95,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -930,7 +931,8 @@ +@@ -934,7 +935,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} "${KDE4_BIN_INSTALL_DIR}" ) @@ -105,7 +105,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para "${KDE4_LIB_INSTALL_DIR}" ) # under Windows dlls may be also installed in bin/ -@@ -1360,9 +1362,9 @@ +@@ -1363,9 +1365,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) @@ -117,7 +117,7 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) -@@ -1381,7 +1383,7 @@ +@@ -1384,7 +1386,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K endif (NOT KDE4_INSTALLED_VERSION_OK) if (NOT KDE4_KCFGC_EXECUTABLE) @@ -126,9 +126,9 @@ diff -ur kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.5.80-para endif (NOT KDE4_KCFGC_EXECUTABLE) message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs") -diff -ur kdelibs-4.5.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.5.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh ---- kdelibs-4.5.80/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200 -+++ kdelibs-4.5.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2010-11-20 19:30:18.000000000 +0100 +diff -up kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh +--- kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh 2012-12-19 15:21:37.963466601 -0600 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # @@ -141,10 +141,10 @@ diff -ur kdelibs-4.5.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.5.80-parall exit 1; fi -diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl ---- kdelibs-4.5.80/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200 -+++ kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2010-11-20 19:30:18.000000000 +0100 -@@ -15,12 +15,12 @@ +diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl +--- kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl 2012-12-19 15:21:37.963466601 -0600 +@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; @@ -159,9 +159,9 @@ diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.5.80-par exit 1; } -diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt ---- kdelibs-4.5.80/kdecore/kconfig_compiler/CMakeLists.txt 2010-05-27 19:25:31.000000000 +0200 -+++ kdelibs-4.5.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2010-11-20 19:30:18.000000000 +0100 +diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600 @@ -11,13 +11,13 @@ set(kconfig_compiler_SRCS kconfig_compiler.cpp) @@ -179,10 +179,10 @@ diff -ur kdelibs-4.5.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.5.80-p # # export this binary for cross-compilation -diff -ur kdelibs-4.5.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.5.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt ---- kdelibs-4.5.80/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-08-12 12:00:20.000000000 +0200 -+++ kdelibs-4.5.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2010-11-20 19:30:18.000000000 +0100 -@@ -9,7 +9,7 @@ +diff -up kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600 +@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc @@ -191,10 +191,10 @@ diff -ur kdelibs-4.5.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.5. # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) -diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/kdewidgets/CMakeLists.txt ---- kdelibs-4.5.80/kdewidgets/CMakeLists.txt 2010-11-05 11:48:27.000000000 +0100 -+++ kdelibs-4.5.80-parallel_devel/kdewidgets/CMakeLists.txt 2010-11-20 19:34:43.000000000 +0100 -@@ -14,24 +14,24 @@ +diff -up kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdewidgets/CMakeLists.txt +--- kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdewidgets/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600 +@@ -14,24 +14,24 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) @@ -224,7 +224,7 @@ diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/ set(kdewidgets_PART_SRCS classpreviews.cpp -@@ -61,7 +61,7 @@ +@@ -61,7 +61,7 @@ if(QT_QTDESIGNER_FOUND) if(NOT KDE_NO_DEPRECATED) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdedeprecated.widgets @@ -233,7 +233,7 @@ diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/ set(kdedeprecated_PART_SRCS classpreviews.cpp -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ if(QT_QTDESIGNER_FOUND) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets @@ -242,7 +242,7 @@ diff -ur kdelibs-4.5.80/kdewidgets/CMakeLists.txt kdelibs-4.5.80-parallel_devel/ set(kdewebkitwidgets_PART_SRCS classpreviews.cpp -@@ -132,7 +132,7 @@ +@@ -132,7 +132,7 @@ if(QT_QTDESIGNER_FOUND) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets diff --git a/kdelibs.spec b/kdelibs.spec index 831ccaa..8185607 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -67,7 +67,7 @@ Requires: soprano%{?_isa} >= %{soprano_version} Requires: strigi-libs%{?_isa} >= %{strigi_version} # make kdelibs-devel parallel-installable with kdelibs3-devel -Patch0: kdelibs-4.5.80-parallel_devel.patch +Patch0: kdelibs-4.9.95-parallel_devel.patch # fix http://bugs.kde.org/149705 Patch2: kdelibs-4.2.85-kde149705.patch @@ -359,11 +359,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu -# kmailservice symlink -# Mailto not working in Firefox: can't find kmailservice -# http://bugzilla.redhat.com/773414 -ln -s %{_kde4_libexecdir}/kmailservice %{buildroot}%{_kde4_bindir}/kmailservice - # create/own stuff # see http://bugzilla.redhat.com/483318 mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin @@ -499,7 +494,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_kde4_libexecdir}/kio_http_cache_cleaner %{_kde4_libexecdir}/kioslave %{_kde4_libexecdir}/klauncher -%{_kde4_libexecdir}/kmailservice # see kio/misc/kpac/README.wpad %attr(4755,root,root) %{_kde4_libexecdir}/kpac_dhcp_helper %{_kde4_libexecdir}/ksendbugmail