[kde-base/smoke-4.4.1] Added webkit patch (sync from trunk)

4 files changed, 55 insertions, 43 deletions

diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 27616c74f9a..53f64c21668 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,6 +1,6 @@
-AUX smoke-webkit.patch 1168 RMD160 bafe8bde088200b43e9b5b466caece4d891fd811 SHA1 3de36270e7add2bc6c893396fd8541ed28760325 SHA256 952e5e947170f3783be668e40242fa424528b79db9200b3285d891cf7a03f426
+AUX smoke-4.4.1-webkit-cmake.patch 1939 RMD160 2c8edf4126a8b9c543c22c22712100bc35a4a85f SHA1 ba916a423838f85e378a0fc15bfb8fbbd4e46dc4 SHA256 d3845d12811c73cce9f22b9b6cddb3fcc289148d958041c7523255c09c7f06c5
 DIST kdebindings-4.4.1.tar.bz2 5048901 RMD160 683a2192510c89ca3ad66d82b432f4aeb915b85e SHA1 bc5fcf04c4721014fbe11ca5b876173530625bbe SHA256 818d9e5b76db4ca42adab4c348222ab2aeb415d4efab9059c9a00029bd35a9bf
-EBUILD smoke-4.4.1.ebuild 1517 RMD160 66a615ce1a1c31a32271e01e6fd04548f8e32a1f SHA1 fcf36da0e1da21a7d95c00f2771f7bcdee64f34e SHA256 1ec72bc1fdb1452d0a1fd120bd103ec548e08094fb09b3d563914c00acc15d9f
+EBUILD smoke-4.4.1.ebuild 1522 RMD160 8ba5c9f53a24adabebc886b42b61f5f151ba8d20 SHA1 43e3eebcf83707e0c5441c2e020af38db3ebf382 SHA256 f81593a7fc268db4de9295002b8d76565bcbf2617e30f4045e28ad400290928c
 EBUILD smoke-4.4.9999.ebuild 1442 RMD160 4967c588f4b8f07d478dc5bc9a6d9cdf74637b73 SHA1 5d9953e6722f293e0ba3cedc1ead5c992ffb4207 SHA256 a6bdcb6d409d6e895fad1b23a92b0e076045a2e133d927bd8d5c22efb967a9f3
 EBUILD smoke-9999.ebuild 1442 RMD160 4967c588f4b8f07d478dc5bc9a6d9cdf74637b73 SHA1 5d9953e6722f293e0ba3cedc1ead5c992ffb4207 SHA256 a6bdcb6d409d6e895fad1b23a92b0e076045a2e133d927bd8d5c22efb967a9f3
 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 00000000000..98331491ec6
--- /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-webkit.patch b/kde-base/smoke/files/smoke-webkit.patch
deleted file mode 100644
index 93bb71b238c..00000000000
--- a/kde-base/smoke/files/smoke-webkit.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r -u kdebindings-4.4.0.orig/smoke/plasma/CMakeLists.txt kdebindings-4.4.0/smoke/plasma/CMakeLists.txt
---- kdebindings-4.4.0.orig/smoke/plasma/CMakeLists.txt	2010-02-04 10:48:34.000000000 +0100
-+++ kdebindings-4.4.0/smoke/plasma/CMakeLists.txt	2010-02-20 01:01:49.000000000 +0100
-@@ -41,15 +41,27 @@
- 
- kde4_add_library(smokeplasma SHARED ${smokeplasma_LIB_SRCS})
- 
--target_link_libraries(smokeplasma 
--    ${KDE4_KDEUI_LIBS}
--    ${KDE4_PLASMA_LIBS}
--    smokeqtcore
--    smokeqtgui
--    smokeqtwebkit
--    smokekdecore
--    smokekdeui
--)
-+
-+if(ENABLE_QTWEBKIT_SMOKE)
-+    target_link_libraries(smokeplasma 
-+        ${KDE4_KDEUI_LIBS}
-+        ${KDE4_PLASMA_LIBS}
-+        smokeqtcore
-+        smokeqtgui
-+        smokeqtwebkit
-+        smokekdecore
-+        smokekdeui
-+    )
-+else(ENABLE_QTWEBKIT_SMOKE)
-+    target_link_libraries(smokeplasma 
-+        ${KDE4_KDEUI_LIBS}
-+        ${KDE4_PLASMA_LIBS}
-+        smokeqtcore
-+        smokeqtgui
-+        smokekdecore
-+        smokekdeui
-+    )
-+endif(ENABLE_QTWEBKIT_SMOKE)
- 
- set_target_properties(smokeplasma PROPERTIES VERSION 3.0.0 SOVERSION 3 )
- install(TARGETS smokeplasma DESTINATION ${LIB_INSTALL_DIR} )
diff --git a/kde-base/smoke/smoke-4.4.1.ebuild b/kde-base/smoke/smoke-4.4.1.ebuild
index 532a795c116..9449ae1177f 100644
--- a/kde-base/smoke/smoke-4.4.1.ebuild
+++ b/kde-base/smoke/smoke-4.4.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="${COMMON_DEPEND}"
 
 KMEXTRA="generator/"
 
-PATCHES=( "${FILESDIR}/${PN}-webkit.patch" )
+PATCHES=( "${FILESDIR}/${P}-webkit-cmake.patch" )
 
 src_configure() {
 	mycmakeargs=(