[kde-runtime] update webkit patch

Than Ngo than at fedoraproject.org
Fri Aug 3 22:38:14 UTC 2012 

commit 7e5ae917d17a85cbfd058278479a2d774720f24a
Author: Than Ngo <than at redhat.com>
Date:   Sat Aug 4 00:37:24 2012 +0200

    update webkit patch

 ...-webkit.patch => kde-runtime-4.9.0-webkit.patch |   67 ++++++++++---------
 kde-runtime.spec                                   |    7 ++-
 2 files changed, 40 insertions(+), 34 deletions(-)
---
diff --git a/kde-runtime-4.8.3-webkit.patch b/kde-runtime-4.9.0-webkit.patch
similarity index 57%
rename from kde-runtime-4.8.3-webkit.patch
rename to kde-runtime-4.9.0-webkit.patch
index 61ee3a5..96be4e7 100644
--- a/kde-runtime-4.8.3-webkit.patch
+++ b/kde-runtime-4.9.0-webkit.patch
@@ -1,23 +1,26 @@
-diff -up kde-runtime-4.8.3/drkonqi/CMakeLists.txt.webkit kde-runtime-4.8.3/drkonqi/CMakeLists.txt
---- kde-runtime-4.8.3/drkonqi/CMakeLists.txt.webkit	2011-11-04 15:33:26.000000000 +0100
-+++ kde-runtime-4.8.3/drkonqi/CMakeLists.txt	2012-05-04 18:29:03.233898477 +0200
-@@ -73,6 +73,13 @@ kde4_add_ui_files(drkonqi_SRCS
- 
- kde4_add_executable(drkonqi ${drkonqi_SRCS})
- 
+diff -up kde-runtime-4.9.0/drkonqi/CMakeLists.txt.webkit kde-runtime-4.9.0/drkonqi/CMakeLists.txt
+--- kde-runtime-4.9.0/drkonqi/CMakeLists.txt.webkit	2012-07-11 10:07:58.000000000 +0200
++++ kde-runtime-4.9.0/drkonqi/CMakeLists.txt	2012-08-02 15:40:31.759365741 +0200
+@@ -76,12 +76,14 @@ kde4_add_ui_files(drkonqi_SRCS
+ # Comment this out for release.
+ #add_definitions(-DBACKTRACE_PARSER_DEBUG)
+ 
++# no webkit
 +set (KDERUNTIME_NO_WEBKIT TRUE)
 +add_definitions(-DKDERUNTIME_NO_WEBKIT)
 +
-+if (KDERUNTIME_NO_WEBKIT)
-+target_link_libraries(drkonqi ${KDE4_KIO_LIBS} ${QT_QTWEBKIT_LIBRARY} drkonqi_backtrace_parser)
-+else (KDERUNTIME_NO_WEBKIT)
- target_link_libraries(drkonqi ${KDE4_KIO_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBRARY} drkonqi_backtrace_parser)
-+endif (KDERUNTIME_NO_WEBKIT)
- 
- install(TARGETS drkonqi DESTINATION ${LIBEXEC_INSTALL_DIR})
-diff -up kde-runtime-4.8.3/drkonqi/reportassistantpages_bugzilla.cpp.webkit kde-runtime-4.8.3/drkonqi/reportassistantpages_bugzilla.cpp
---- kde-runtime-4.8.3/drkonqi/reportassistantpages_bugzilla.cpp.webkit	2011-09-26 11:43:11.799919845 +0200
-+++ kde-runtime-4.8.3/drkonqi/reportassistantpages_bugzilla.cpp	2012-05-04 18:29:03.234898464 +0200
+ kde4_add_executable(drkonqi ${drkonqi_SRCS})
+ 
+ target_link_libraries(drkonqi
+     ${KDE4_KIO_LIBS}
+-    ${QT_QTWEBKIT_LIBRARY}
+-    ${KDE4_KDEWEBKIT_LIBRARY}
+     ${KDEPIMLIBS_KXMLRPCCLIENT_LIBRARY}
+     drkonqi_backtrace_parser
+ )
+diff -up kde-runtime-4.9.0/drkonqi/reportassistantpages_bugzilla.cpp.webkit kde-runtime-4.9.0/drkonqi/reportassistantpages_bugzilla.cpp
+--- kde-runtime-4.9.0/drkonqi/reportassistantpages_bugzilla.cpp.webkit	2012-05-23 01:57:38.000000000 +0200
++++ kde-runtime-4.9.0/drkonqi/reportassistantpages_bugzilla.cpp	2012-08-02 15:03:53.569314454 +0200
 @@ -46,7 +46,11 @@
  
  /* Unhandled error dialog includes */
@@ -43,9 +46,9 @@ diff -up kde-runtime-4.8.3/drkonqi/reportassistantpages_bugzilla.cpp.webkit kde-
      QLabel * iconLabel = new QLabel(this);
      iconLabel->setFixedSize(32, 32);
      iconLabel->setPixmap(KIcon("dialog-warning").pixmap(32, 32));
-diff -up kde-runtime-4.8.3/kioslave/thumbnail/CMakeLists.txt.webkit kde-runtime-4.8.3/kioslave/thumbnail/CMakeLists.txt
---- kde-runtime-4.8.3/kioslave/thumbnail/CMakeLists.txt.webkit	2012-05-04 18:52:02.943903551 +0200
-+++ kde-runtime-4.8.3/kioslave/thumbnail/CMakeLists.txt	2012-05-04 18:52:49.308298341 +0200
+diff -up kde-runtime-4.9.0/kioslave/thumbnail/CMakeLists.txt.webkit kde-runtime-4.9.0/kioslave/thumbnail/CMakeLists.txt
+--- kde-runtime-4.9.0/kioslave/thumbnail/CMakeLists.txt.webkit	2012-05-23 01:57:46.000000000 +0200
++++ kde-runtime-4.9.0/kioslave/thumbnail/CMakeLists.txt	2012-08-02 15:03:53.571314454 +0200
 @@ -76,18 +76,6 @@ install(TARGETS textthumbnail DESTINATIO
  
  ########### next target ###############
@@ -65,9 +68,9 @@ diff -up kde-runtime-4.8.3/kioslave/thumbnail/CMakeLists.txt.webkit kde-runtime-
  if(NOT WIN32)
  set(djvuthumbnail_PART_SRCS djvucreator.cpp)
  
-diff -up kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/CMakeLists.txt
---- kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit	2011-07-27 20:36:17.039265207 +0200
-+++ kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/CMakeLists.txt	2012-05-04 18:29:03.235898451 +0200
+diff -up kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/CMakeLists.txt
+--- kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit	2012-05-23 01:59:46.000000000 +0200
++++ kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/CMakeLists.txt	2012-08-02 15:03:53.572314454 +0200
 @@ -1,5 +1,8 @@
  project(graphicswidgetsbindings)
  
@@ -77,9 +80,9 @@ diff -up kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/CMakeLists.
  set(graphicswidgetsbindings_SRCS
      graphicswidgetsbindingsplugin.cpp
      declarativetabbar.cpp
-diff -up kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp
---- kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit	2011-07-27 20:36:17.039265207 +0200
-+++ kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp	2012-05-04 18:29:03.236898438 +0200
+diff -up kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp
+--- kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit	2012-05-23 01:59:46.000000000 +0200
++++ kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp	2012-08-02 15:03:53.573314454 +0200
 @@ -48,8 +48,9 @@
  #include <Plasma/ToolButton>
  #include <Plasma/TreeView>
@@ -101,9 +104,9 @@ diff -up kde-runtime-4.8.3/plasma/declarativeimports/graphicswidgets/graphicswid
  }
  
  
-diff -up kde-runtime-4.8.3/plasma/scriptengines/javascript/CMakeLists.txt.webkit kde-runtime-4.8.3/plasma/scriptengines/javascript/CMakeLists.txt
---- kde-runtime-4.8.3/plasma/scriptengines/javascript/CMakeLists.txt.webkit	2011-07-27 20:36:17.056265038 +0200
-+++ kde-runtime-4.8.3/plasma/scriptengines/javascript/CMakeLists.txt	2012-05-04 18:29:03.236898438 +0200
+diff -up kde-runtime-4.9.0/plasma/scriptengines/javascript/CMakeLists.txt.webkit kde-runtime-4.9.0/plasma/scriptengines/javascript/CMakeLists.txt
+--- kde-runtime-4.9.0/plasma/scriptengines/javascript/CMakeLists.txt.webkit	2012-05-23 01:59:52.000000000 +0200
++++ kde-runtime-4.9.0/plasma/scriptengines/javascript/CMakeLists.txt	2012-08-02 15:03:53.575314455 +0200
 @@ -7,6 +7,9 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
      set(PLASMA_NO_KIO TRUE)
  endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
@@ -114,9 +117,9 @@ diff -up kde-runtime-4.8.3/plasma/scriptengines/javascript/CMakeLists.txt.webkit
  set(simple_javascript_engine_SRCS
      common/extension_launchapp.cpp
      common/extension_io.cpp
-diff -up kde-runtime-4.8.3/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit kde-runtime-4.8.3/plasma/scriptengines/javascript/simplebindings/uiloader.cpp
---- kde-runtime-4.8.3/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit	2011-07-27 20:36:17.061264988 +0200
-+++ kde-runtime-4.8.3/plasma/scriptengines/javascript/simplebindings/uiloader.cpp	2012-05-04 18:29:03.237898425 +0200
+diff -up kde-runtime-4.9.0/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit kde-runtime-4.9.0/plasma/scriptengines/javascript/simplebindings/uiloader.cpp
+--- kde-runtime-4.9.0/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit	2012-05-23 01:59:52.000000000 +0200
++++ kde-runtime-4.9.0/plasma/scriptengines/javascript/simplebindings/uiloader.cpp	2012-08-02 15:03:53.576314456 +0200
 @@ -49,7 +49,9 @@
  #include <Plasma/TextEdit>
  #include <Plasma/ToolButton>
diff --git a/kde-runtime.spec b/kde-runtime.spec
index b5b1fed..41fe874 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -7,7 +7,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -44,7 +44,7 @@ Patch50: kde-runtime-4.7.90-nepomuk_onlyshowin_kde.patch
 ## upstream patches
 
 # rhel patches
-Patch300: kde-runtime-4.8.3-webkit.patch
+Patch300: kde-runtime-4.9.0-webkit.patch
 
 Obsoletes: kdebase-runtime < 4.7.97-10
 Provides:  kdebase-runtime = %{version}-%{release}
@@ -327,6 +327,9 @@ fi
 
 
 %changelog
+* Sat Aug 04 2012 Than Ngo <than at redhat.com> - 4.9.0-3
+- update webkit patch
+
 * Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.0-2
 - respin

More information about the scm-commits mailing list