summaryrefslogtreecommitdiff
path: root/kde-base
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>2012-12-24 11:37:11 +0100
committerAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>2012-12-24 11:37:11 +0100
commitd28d3f29648203738e716930c1e920b6e1d60c41 (patch)
treecfe01c5fe3a1621267ed74205f39ce467c2e6532 /kde-base
parentcf78de9bd608fc717055997a76aba8c9dd3a0146 (diff)
downloadkde-d28d3f29648203738e716930c1e920b6e1d60c41.tar.gz
kde-d28d3f29648203738e716930c1e920b6e1d60c41.tar.bz2
kde-d28d3f29648203738e716930c1e920b6e1d60c41.zip
[kde-base/ksplash] Better Fix for file collisions
Package-Manager: portage-2.2.0_alpha149
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/ksplash/files/ksplash-4.9.95-removetheme.patch11
-rw-r--r--kde-base/ksplash/ksplash-4.9.95.ebuild2
2 files changed, 13 insertions, 0 deletions
diff --git a/kde-base/ksplash/files/ksplash-4.9.95-removetheme.patch b/kde-base/ksplash/files/ksplash-4.9.95-removetheme.patch
new file mode 100644
index 00000000000..ba092d52e78
--- /dev/null
+++ b/kde-base/ksplash/files/ksplash-4.9.95-removetheme.patch
@@ -0,0 +1,11 @@
+diff -ruN ksplash-4.9.95.orig/ksplash/ksplashx/CMakeLists.txt ksplash-4.9.95/ksplash/ksplashx/CMakeLists.txt
+--- ksplash-4.9.95.orig/ksplash/ksplashx/CMakeLists.txt 2012-12-24 11:33:22.326087112 +0100
++++ ksplash-4.9.95/ksplash/ksplashx/CMakeLists.txt 2012-12-24 11:34:53.649089265 +0100
+@@ -2,7 +2,6 @@
+
+ add_subdirectory( scale )
+ add_subdirectory( utils )
+-add_subdirectory( themes )
+
+ include_directories(${PNG_INCLUDE_DIR} # Deprecated in CMake 2.8.7
+ ${PNG_INCLUDE_DIRS} # Added in CMake 2.8.7
diff --git a/kde-base/ksplash/ksplash-4.9.95.ebuild b/kde-base/ksplash/ksplash-4.9.95.ebuild
index e3795556a9e..83a57658524 100644
--- a/kde-base/ksplash/ksplash-4.9.95.ebuild
+++ b/kde-base/ksplash/ksplash-4.9.95.ebuild
@@ -20,6 +20,8 @@ DEPEND="${COMMONDEPEND}
"
RDEPEND="${COMMONDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-removetheme.patch" )
+
src_configure() {
mycmakeargs=(
$(cmake-utils_use_has 3dnow X86_3DNOW)