[kdelibs] adapt webkit patch

[Than Ngo]

commit bebe7ed111b58f48dae09871dde694f871587bd0
Author: Than Ngo <than at redhat.com>
Date:   Thu Feb 28 11:56:46 2013 +0100

    adapt webkit patch

 ...8.3-webkit.patch => kdelibs-4.10.0-webkit.patch |   38 ++++++++++----------
 kdelibs.spec                                       |    7 +++-
 2 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/kdelibs-4.8.3-webkit.patch b/kdelibs-4.10.0-webkit.patch
similarity index 71%
rename from kdelibs-4.8.3-webkit.patch
rename to kdelibs-4.10.0-webkit.patch
index f986f5e..1aad529 100644
--- a/kdelibs-4.8.3-webkit.patch
+++ b/kdelibs-4.10.0-webkit.patch
@@ -1,7 +1,7 @@
-diff -up kdelibs-4.8.3/CMakeLists.txt.webkit kdelibs-4.8.3/CMakeLists.txt
---- kdelibs-4.8.3/CMakeLists.txt.webkit	2012-04-29 22:38:24.266748427 +0200
-+++ kdelibs-4.8.3/CMakeLists.txt	2012-05-04 12:35:38.086634268 +0200
-@@ -325,7 +325,6 @@ if(NOT WINCE)
+diff -up kdelibs-4.10.0/CMakeLists.txt.webkit kdelibs-4.10.0/CMakeLists.txt
+--- kdelibs-4.10.0/CMakeLists.txt.webkit	2013-01-29 22:55:26.000000000 +0100
++++ kdelibs-4.10.0/CMakeLists.txt	2013-02-28 11:43:57.653616989 +0100
+@@ -328,7 +328,6 @@ if(NOT WINCE)
  add_subdirectory( plasma )
  endif(NOT WINCE)
  add_subdirectory( kunitconversion )
@@ -9,9 +9,9 @@ diff -up kdelibs-4.8.3/CMakeLists.txt.webkit kdelibs-4.8.3/CMakeLists.txt
  add_subdirectory( includes )
  
  add_subdirectory( experimental )
-diff -up kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit kdelibs-4.8.3/kdewidgets/CMakeLists.txt
---- kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit	2012-05-04 12:35:38.000000000 +0200
-+++ kdelibs-4.8.3/kdewidgets/CMakeLists.txt	2012-05-04 12:37:23.482261882 +0200
+diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit kdelibs-4.10.0/kdewidgets/CMakeLists.txt
+--- kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit	2013-02-28 11:43:57.589617095 +0100
++++ kdelibs-4.10.0/kdewidgets/CMakeLists.txt	2013-02-28 11:43:57.654616988 +0100
 @@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
      install(TARGETS kdedeprecated  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
    endif(NOT KDE_NO_DEPRECATED)
@@ -54,27 +54,27 @@ diff -up kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit kdelibs-4.8.3/kdewidgets
    if (QT_QT3SUPPORT_FOUND)
  
       include_directories(
-diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLists.txt
---- kdelibs-4.8.3/plasma/CMakeLists.txt.webkit	2012-02-29 22:55:52.532149866 +0100
-+++ kdelibs-4.8.3/plasma/CMakeLists.txt	2012-05-04 12:35:38.088634242 +0200
-@@ -10,6 +10,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
+diff -up kdelibs-4.10.0/plasma/CMakeLists.txt.webkit kdelibs-4.10.0/plasma/CMakeLists.txt
+--- kdelibs-4.10.0/plasma/CMakeLists.txt.webkit	2013-02-28 11:43:57.600617077 +0100
++++ kdelibs-4.10.0/plasma/CMakeLists.txt	2013-02-28 11:47:28.121778200 +0100
+@@ -11,6 +11,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
      set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
  endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
  
 +set(PLASMA_NO_KDEWEBKIT TRUE)
 +
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                     ${KDE4_KDECORE_INCLUDES}
-                     ${KDE4_KDEUI_INCLUDES}
-@@ -114,7 +116,6 @@ set(plasma_LIB_SRCS
+ if(NOT Q_WS_X11)
+     set(PLASMA_NO_PACKAGEKIT TRUE)
+ endif(NOT Q_WS_X11)
+@@ -124,7 +126,6 @@ set(plasma_LIB_SRCS
      framesvg.cpp
      plasma.cpp
      popupapplet.cpp
 -    private/animablegraphicswebview.cpp
      private/applethandle.cpp
      private/associatedapplicationmanager.cpp
-     private/datacontainer_p.cpp
-@@ -202,7 +203,6 @@ set(plasma_LIB_SRCS
+     private/componentinstaller.cpp
+@@ -214,7 +215,6 @@ set(plasma_LIB_SRCS
      widgets/textbrowser.cpp
      widgets/treeview.cpp
      widgets/textedit.cpp
@@ -82,7 +82,7 @@ diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLi
  
      #Temporary QtJolie branch
      private/qtjolie-branch/qtjolie/abstractadaptor.cpp
-@@ -266,7 +266,7 @@ endif(PHONON_FOUND)
+@@ -278,7 +278,7 @@ endif(PHONON_FOUND)
  
  kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
  
@@ -91,7 +91,7 @@ diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLi
                               ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
                               ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
  
-@@ -406,7 +406,6 @@ install(FILES
+@@ -430,7 +430,6 @@ install(FILES
      widgets/textbrowser.h
      widgets/treeview.h
      widgets/textedit.h
diff --git a/kdelibs.spec b/kdelibs.spec
index e4c0fb8..8a6e9c4 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -23,7 +23,7 @@
 
 Summary: KDE Libraries
 Version: 4.10.0
-Release: 3%{?dist}
+Release: 4444dist}
 
 Name: kdelibs
 Epoch: 6
@@ -151,7 +151,7 @@ Patch60: kdelibs-udisks2_2_stage.patch
 Patch200: kdelibs-4.10.0-CVE-2009-2702.patch
 
 # rhel patches
-Patch300: kdelibs-4.8.3-webkit.patch
+Patch300: kdelibs-4.10.0-webkit.patch
 
 # kmailservice/ktelnetservice moved here
 Conflicts: kdelibs3 < 3.5.10-42
@@ -555,6 +555,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Feb 28 2013 Than Ngo <than at redhat.com> - 6:4.10.0-3
+- adapt webkit patch
+
 * Thu Feb 07 2013 Lukáš Tinkl <ltinkl at redhat.com> 6:4.10.0-3
 - complete kdelibs-udisks2_2_stage.patch