Fixed bug 305677 - building with USE=-webkit

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 63 insertions, 59 deletions

diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index a91cdbfbdf79..9df7f21baff5 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/smoke
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.95 2010/03/02 19:45:37 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.96 2010/03/26 15:15:10 reavertm Exp $
+
+  26 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org> smoke-4.4.1.ebuild,
+  +files/smoke-4.4.1-webkit-cmake.patch, -files/smoke-phonon-fix.patch:
+  Fixed bug 305677 - building with USE=-webkit
 
 *smoke-4.4.1 (02 Mar 2010)
 
diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 06891a67f479..14992e105e0e 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,7 +1,7 @@
-AUX smoke-phonon-fix.patch 2551 RMD160 e87a06afa857c1a9df746e50f212df66b12c3ad8 SHA1 062f13d84d2f99ccc2b902bd89b62408161c152e SHA256 217c3aa3db4db312f87d76ad4e4b7ace919203587dd044abbabb3b54fe320512
+AUX smoke-4.4.1-webkit-cmake.patch 1939 RMD160 2c8edf4126a8b9c543c22c22712100bc35a4a85f SHA1 ba916a423838f85e378a0fc15bfb8fbbd4e46dc4 SHA256 d3845d12811c73cce9f22b9b6cddb3fcc289148d958041c7523255c09c7f06c5
 DIST kdebindings-4.4.0.tar.bz2 5004654 RMD160 5afaef8c4e71796baf0154528a1e8d96012cbd8c SHA1 232ca73567463a03ae3660afd66a6acfe3298e6f SHA256 6d4b415ef4f52674def98eddf49392d5b07b59690edf24111277bd68ade7c0fa
 DIST kdebindings-4.4.1.tar.bz2 5048901 RMD160 683a2192510c89ca3ad66d82b432f4aeb915b85e SHA1 bc5fcf04c4721014fbe11ca5b876173530625bbe SHA256 818d9e5b76db4ca42adab4c348222ab2aeb415d4efab9059c9a00029bd35a9bf
 EBUILD smoke-4.4.0.ebuild 1566 RMD160 4ba106ca8d384759df6ca163e03c46426bf54969 SHA1 3eb239a5437cc376b12fdc241c2a3912c31c60ea SHA256 327fa19f2def67ea59e1defa50d84260b4a2699f956dd75f178cd3ac7f9f0743
-EBUILD smoke-4.4.1.ebuild 1569 RMD160 b3023a5a80c68349d0f408e37664f69d995eae56 SHA1 a54750d44e402d135a9dd310d699f646c4031297 SHA256 edc066d358dfd9b7b4ad0072561661fbcb0a4c309c899c8fcb6a355361dceacc
-MISC ChangeLog 11528 RMD160 5267ad6dcbb20f35adf4887436595c7360df70ea SHA1 c396b5357bae80cbd5ae7062a663564d808c6a97 SHA256 55895a1862102b52e4807b18153713cf5c93c18e71782f6d289f2f9b2258d0b6
+EBUILD smoke-4.4.1.ebuild 1619 RMD160 afec16e9ce87da471eb8622e054a14338b10f481 SHA1 384e9c4abb3f4b37532b8c6c84d30910af06b59b SHA256 7e5a9cb3f32c17515c9231045593097f361f7bf7539cf56c885108c7cda805c8
+MISC ChangeLog 11721 RMD160 d784a8d675898401b5770402fa830c9d785e43af SHA1 6ac9c3941ef547c6a098564d88be99f3ddfeb5d3 SHA256 aa4547b91c41605fc012b9ec56f46a11533f86ea4216e81825400ac3008b209a
 MISC metadata.xml 904 RMD160 192db3d5e0a9a993f2bb8e92742de7fdb804fdcd SHA1 6bd4a4130c28586c84712146857787ff22d1d963 SHA256 af3fd16b338e5fde4eedc9ca72ccb785be1962eb6b7d212ba98766826b69a162
diff --git a/kde-base/smoke/files/smoke-4.4.1-webkit-cmake.patch b/kde-base/smoke/files/smoke-4.4.1-webkit-cmake.patch
new file mode 100644
index 000000000000..98331491ec69
--- /dev/null
+++ b/kde-base/smoke/files/smoke-4.4.1-webkit-cmake.patch
@@ -0,0 +1,52 @@
+Index: smoke/plasma/CMakeLists.txt
+===================================================================
+--- smoke/plasma/CMakeLists.txt	(revision 1107565)
++++ smoke/plasma/CMakeLists.txt	(working copy)
+@@ -3,14 +3,14 @@
+ 
+ ########### next target ###############
+ 
+-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp 
+-    ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp 
++add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
+@@ -22,8 +22,8 @@
+ 
+ macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
+ 
+-set(smokeplasma_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp  
+-                ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
++set(smokeplasma_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
++                ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+                 ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
+                 ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
+                 ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
+@@ -41,12 +41,11 @@
+ 
+ kde4_add_library(smokeplasma SHARED ${smokeplasma_LIB_SRCS})
+ 
+-target_link_libraries(smokeplasma 
++target_link_libraries(smokeplasma
+     ${KDE4_KDEUI_LIBS}
+     ${KDE4_PLASMA_LIBS}
+     smokeqtcore
+     smokeqtgui
+-    smokeqtwebkit
+     smokekdecore
+     smokekdeui
+ )
diff --git a/kde-base/smoke/files/smoke-phonon-fix.patch b/kde-base/smoke/files/smoke-phonon-fix.patch
deleted file mode 100644
index eb48264b8a74..000000000000
--- a/kde-base/smoke/files/smoke-phonon-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- kdebindings.orig/smoke/phonon/CMakeLists.txt
-+++ kdebindings/smoke/phononCMakeLists.txt
-@@ -12,25 +12,6 @@
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- 	${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
--                 ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp 
--                ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp 
--                ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp 
--                ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp 
--                ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp 
--                ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp 
--                ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
- 
- 	COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- 	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
-@@ -43,25 +24,6 @@
- 
- set(smokephonon_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- 	${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
--		${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
- )
- 
- IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
diff --git a/kde-base/smoke/smoke-4.4.1.ebuild b/kde-base/smoke/smoke-4.4.1.ebuild
index 846339e1765d..5243b298eff9 100644
--- a/kde-base/smoke/smoke-4.4.1.ebuild
+++ b/kde-base/smoke/smoke-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.1.ebuild,v 1.1 2010/03/02 19:45:37 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.1.ebuild,v 1.2 2010/03/26 15:15:10 reavertm Exp $
 
 EAPI="3"
 
@@ -28,6 +28,8 @@ RDEPEND="${COMMON_DEPEND}"
 
 KMEXTRA="generator/"
 
+PATCHES=( "${FILESDIR}/${P}-webkit-cmake.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_enable akonadi)