diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2009-06-14 12:34:24 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2009-06-14 12:34:24 +0000 |
| commit | deac01e13c8b06796082c406dfc7a712d7db140e (patch) | |
| tree | 9f21e6cbc9c40f563426a00617e9b24491814fdc | |
| parent | [kde-base/kalyptus] Clean unneeded patches (diff) | |
| download | gentoo-2-deac01e13c8b06796082c406dfc7a712d7db140e.tar.gz gentoo-2-deac01e13c8b06796082c406dfc7a712d7db140e.tar.bz2 gentoo-2-deac01e13c8b06796082c406dfc7a712d7db140e.zip | |
[kde-base/kalzium] Clean unneeded patches
(Portage version: 2.2_rc33/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/kalzium/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kalzium/files/kalzium-4.2.1-include-order.patch | 26 | ||||
| -rw-r--r-- | kde-base/kalzium/files/kalzium-4.2.2-include-order.patch | 26 |
3 files changed, 6 insertions, 53 deletions
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog index 85b75e9352cd..9aea931e8015 100644 --- a/kde-base/kalzium/ChangeLog +++ b/kde-base/kalzium/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kalzium # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.129 2009/06/14 10:24:45 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.130 2009/06/14 12:34:24 alexxy Exp $ + + 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> + -files/kalzium-4.2.1-include-order.patch, + -files/kalzium-4.2.2-include-order.patch: + Clean unneeded patches 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -kalzium-4.2.3.ebuild: Drop KDE 4.2.3 diff --git a/kde-base/kalzium/files/kalzium-4.2.1-include-order.patch b/kde-base/kalzium/files/kalzium-4.2.1-include-order.patch deleted file mode 100644 index 1faffa2e3812..000000000000 --- a/kde-base/kalzium/files/kalzium-4.2.1-include-order.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- kalzium-4.2.1/work/kalzium-4.2.1/kalzium/libavogadro-kalzium/src/CMakeLists.txt 2009-02-26 09:17:16.000000000 -0500 -+++ /root/CMakeLists.txt 2009-03-11 18:19:48.000000000 -0400 -@@ -15,10 +15,12 @@ - ${CMAKE_CURRENT_BINARY_DIR}/config.h - ) - --include(${QT_USE_FILE}) -+# Ensure the Avogadro include directory is always first -+get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES) -+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES -+ "${libavogadro-kalzium_SOURCE_DIR}/include;${tmp_include_dirs}") - - include_directories( -- ${libavogadro-kalzium_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/.. -@@ -26,6 +28,8 @@ - ${EIGEN_INCLUDE_DIR} - ) - -+include(${QT_USE_FILE}) -+ - # Need to build with visibility enabled if KDE is - if(__KDE_HAVE_GCC_VISIBILITY) - add_definitions(-DHAVE_GCC_VISIBILITY) diff --git a/kde-base/kalzium/files/kalzium-4.2.2-include-order.patch b/kde-base/kalzium/files/kalzium-4.2.2-include-order.patch deleted file mode 100644 index 1faffa2e3812..000000000000 --- a/kde-base/kalzium/files/kalzium-4.2.2-include-order.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- kalzium-4.2.1/work/kalzium-4.2.1/kalzium/libavogadro-kalzium/src/CMakeLists.txt 2009-02-26 09:17:16.000000000 -0500 -+++ /root/CMakeLists.txt 2009-03-11 18:19:48.000000000 -0400 -@@ -15,10 +15,12 @@ - ${CMAKE_CURRENT_BINARY_DIR}/config.h - ) - --include(${QT_USE_FILE}) -+# Ensure the Avogadro include directory is always first -+get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES) -+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES -+ "${libavogadro-kalzium_SOURCE_DIR}/include;${tmp_include_dirs}") - - include_directories( -- ${libavogadro-kalzium_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/.. -@@ -26,6 +28,8 @@ - ${EIGEN_INCLUDE_DIR} - ) - -+include(${QT_USE_FILE}) -+ - # Need to build with visibility enabled if KDE is - if(__KDE_HAVE_GCC_VISIBILITY) - add_definitions(-DHAVE_GCC_VISIBILITY) |