public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused patches, fix pykde4 patch

Browse Source 
svn path=/nixpkgs/trunk/; revision=31712
This commit is contained in:
Yury G. Kudryashov 2012-01-19 20:27:59 +00:00
parent 087af1bfe7
commit 8899e60693
5 changed files with 21 additions and 143 deletions

40
pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
View File

@ -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)

18
pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch Normal file
View File

@ -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)

7
pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
View File

@ -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 = {

60
pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
View File

@ -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})

39
pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff
View File

@ -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)