From 8899e606931e92741161a77de9f112459a00fbd6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 19 Jan 2012 20:27:59 +0000 Subject: [PATCH] Remove unused patches, fix pykde4 patch svn path=/nixpkgs/trunk/; revision=31712 --- .../kde-4.8/kdebindings/pykde-purity.patch | 40 ------------- .../pykde4-hardcode-lib-python.patch | 18 ++++++ pkgs/desktops/kde-4.8/kdebindings/pykde4.nix | 7 +-- .../kde-4.8/kdenetwork/log-feature.diff | 60 ------------------- .../kde-4.8/kdesdk/optional-docs.diff | 39 ------------ 5 files changed, 21 insertions(+), 143 deletions(-) delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch create mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch deleted file mode 100644 index 2f6e078f256..00000000000 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c853e38..5df3253 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -232,7 +232,7 @@ _pkg_config = { - 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', - 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', - 'pykde_modules': '${PYKDE_MODULES}', -- 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4', -+ 'pykde_sip_dir': '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4', - 'pykde_version': kde_version_hex, - 'pykde_version_str': '${KDE_VERSION}' - } -@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES - - # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. - # (Don't forget the / at the end of sip/.) --INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4 -+INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4 - PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want? - PATTERN ".svn" EXCLUDE - PATTERN "*.in" EXCLUDE) -diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt -index 41fa0fe..642d867 100644 ---- a/kpythonpluginfactory/CMakeLists.txt -+++ b/kpythonpluginfactory/CMakeLists.txt -@@ -3,7 +3,12 @@ - set(kpythonpluginfactory_SRCS - kpythonpluginfactory.cpp) - --GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME) -+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF) -+if(HARDCODE_LIB_PYTHON_PATH) -+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH) -+else(HARDCODE_LIB_PYTHON_PATH) -+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME) -+endif(HARDCODE_LIB_PYTHON_PATH) - ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\") - ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) - diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch new file mode 100644 index 00000000000..e7a7cb4c661 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch @@ -0,0 +1,18 @@ +diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt +index 41fa0fe..642d867 100644 +--- a/kpythonpluginfactory/CMakeLists.txt ++++ b/kpythonpluginfactory/CMakeLists.txt +@@ -3,7 +3,12 @@ + set(kpythonpluginfactory_SRCS + kpythonpluginfactory.cpp) + +-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME) ++option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF) ++if(HARDCODE_LIB_PYTHON_PATH) ++ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH) ++else(HARDCODE_LIB_PYTHON_PATH) ++ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME) ++endif(HARDCODE_LIB_PYTHON_PATH) + ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\") + ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) + diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix index 1ca6efe3b92..e32b7447aea 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix @@ -8,11 +8,9 @@ kde { propagatedBuildInputs = [ pyqt4 sip ]; -#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon"; + patches = [ ./pykde4-hardcode-lib-python.patch ]; - patches = [ ./pykde-purity.patch ]; - - cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON"; + cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; preConfigure = '' @@ -21,6 +19,7 @@ kde { # needs to install a plugin. mkdir -pv $out/${pydir} ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} + cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" ) ''; meta = { diff --git a/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff b/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff deleted file mode 100644 index 6770dd399e3..00000000000 --- a/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- a/kget/CMakeLists.txt 2010-08-16 19:08:36.000000000 +0400 -+++ b/kget/CMakeLists.txt 2010-08-16 22:04:24.000000000 +0400 -@@ -53,21 +53,20 @@ - add_subdirectory(desktop) - add_subdirectory(plasma) - --# find kworkspace library to allow the shutdown after downloads completed option --find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) --if(KDE4_KWORKSPACE_LIBRARY) -- set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY}) -+macro_optional_find_package(KDE4Workspace) -+macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget") -+if(KDE4WORKSPACE_FOUND) - add_definitions(-DHAVE_KWORKSPACE) -- set(KWORKSPACE_FOUND true) --endif(KDE4_KWORKSPACE_LIBRARY) -+ include_directories(${KDE4WORKSPACE_INCLUDE_DIR}) -+endif(KDE4WORKSPACE_FOUND) - - # find libkonq to allow actions and open with options in the context menu of a transfer --find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) --if(KDE4_KONQUEROR_LIBRARY) -- set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY}) -+macro_optional_find_package(LibKonq) -+macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer") -+if(LIBKONQ_FOUND) - add_definitions(-DHAVE_KONQUEROR) -- set(KONQUEROR_FOUND true) --endif(KDE4_KONQUEROR_LIBRARY) -+ include_directories(${LIBKONQ_INCLUDE_DIR}) -+endif(LIBKONQ_FOUND) - - - include_directories( -@@ -142,9 +141,9 @@ - - target_link_libraries(kgetcore ${KDE4_KIO_LIBS}) - --if (KWORKSPACE_FOUND) -- target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS}) --endif (KWORKSPACE_FOUND) -+if (KDE4WORKSPACE_FOUND) -+ target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS}) -+endif (KDE4WORKSPACE_FOUND) - - if (HAVE_NEPOMUK) - target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) -@@ -294,9 +293,9 @@ - target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) - endif (HAVE_NEPOMUK) - --if (KONQUEROR_FOUND) -- target_link_libraries(kget ${KDE4_KONQUEROR_LIBS}) --endif (KONQUEROR_FOUND) -+if (LIBKONQ_FOUND) -+ target_link_libraries(kget ${LIBKONQ_LIBRARY}) -+endif (LIBKONQ_FOUND) - - if (QGPGME_FOUND) - target_link_libraries(kget ${QGPGME_LIBRARIES}) diff --git a/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff b/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff deleted file mode 100644 index f67e1f4cdd8..00000000000 --- a/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 63cdef8..0c5b50a 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -3,22 +3,30 @@ if( UNIX ) - add_subdirectory(cervisia) - endif() - endif( UNIX ) --add_subdirectory(kapptemplate) -+if(BUILD_kapptemplate) -+ add_subdirectory(kapptemplate) -+endif() - if(BUILD_kbugbuster) - add_subdirectory(kbugbuster) - endif() - if(BUILD_kcachegrind) - add_subdirectory(kcachegrind) - endif() --add_subdirectory(kmtrace) -+if(BUILD_kmtrace) -+ add_subdirectory(kmtrace) -+endif() - if(BUILD_kompare) - add_subdirectory(kompare) - endif() - if(BUILD_lokalize) - add_subdirectory(lokalize) - endif() --add_subdirectory(poxml) --add_subdirectory(scripts) -+if(BUILD_poxml) -+ add_subdirectory(poxml) -+endif() -+if(BUILD_scripts) -+ add_subdirectory(scripts) -+endif() - - if(LIBXSLT_FOUND AND LIBXML2_FOUND) - if(BUILD_umbrello)