[kde-runtime] update webkit patch

Tue Oct 23 13:03:31 UTC 2012

commit f55c28074e350f21eff14aba96fbdadb635c72fa
Author: Than Ngo <than at redhat.com>
Date:   Tue Oct 23 15:03:23 2012 +0200

    update webkit patch

 ...-webkit.patch => kde-runtime-4.9.2-webkit.patch |   48 ++++++++++----------
 kde-runtime.spec                                   |    7 ++-
 2 files changed, 29 insertions(+), 26 deletions(-)
---

diff --git a/kde-runtime-4.9.0-webkit.patch b/kde-runtime-4.9.2-webkit.patch
similarity index 61%
rename from kde-runtime-4.9.0-webkit.patch
rename to kde-runtime-4.9.2-webkit.patch
index 96be4e7..5f88a9d 100644
--- a/kde-runtime-4.9.0-webkit.patch
+++ b/kde-runtime-4.9.2-webkit.patch
@@ -1,6 +1,6 @@
-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
+diff -up kde-runtime-4.9.2/drkonqi/CMakeLists.txt.webkit kde-runtime-4.9.2/drkonqi/CMakeLists.txt
+--- kde-runtime-4.9.2/drkonqi/CMakeLists.txt.webkit	2012-09-28 02:16:14.000000000 +0200
++++ kde-runtime-4.9.2/drkonqi/CMakeLists.txt	2012-10-11 15:28:21.060908131 +0200
 @@ -76,12 +76,14 @@ kde4_add_ui_files(drkonqi_SRCS
  # Comment this out for release.
  #add_definitions(-DBACKTRACE_PARSER_DEBUG)
@@ -18,9 +18,9 @@ diff -up kde-runtime-4.9.0/drkonqi/CMakeLists.txt.webkit kde-runtime-4.9.0/drkon
      ${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
+diff -up kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp.webkit kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp
+--- kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp.webkit	2012-09-28 02:16:14.000000000 +0200
++++ kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp	2012-10-11 15:28:21.061908093 +0200
 @@ -46,7 +46,11 @@
  
  /* Unhandled error dialog includes */
@@ -46,9 +46,9 @@ diff -up kde-runtime-4.9.0/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.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
+diff -up kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt.webkit kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt
+--- kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt.webkit	2012-09-28 02:16:14.000000000 +0200
++++ kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt	2012-10-11 15:28:21.061908093 +0200
 @@ -76,18 +76,6 @@ install(TARGETS textthumbnail DESTINATIO
  
  ########### next target ###############
@@ -68,9 +68,9 @@ diff -up kde-runtime-4.9.0/kioslave/thumbnail/CMakeLists.txt.webkit kde-runtime-
  if(NOT WIN32)
  set(djvuthumbnail_PART_SRCS djvucreator.cpp)
  
-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
+diff -up kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt
+--- kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit	2012-09-28 02:16:15.000000000 +0200
++++ kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt	2012-10-11 15:28:21.062908056 +0200
 @@ -1,5 +1,8 @@
  project(graphicswidgetsbindings)
  
@@ -80,10 +80,10 @@ diff -up kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/CMakeLists.
  set(graphicswidgetsbindings_SRCS
      graphicswidgetsbindingsplugin.cpp
      declarativetabbar.cpp
-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 @@
+diff -up kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp
+--- kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit	2012-09-28 02:16:15.000000000 +0200
++++ kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp	2012-10-11 15:30:57.913033942 +0200
+@@ -47,8 +47,9 @@
  #include <Plasma/ToolButton>
  #include <Plasma/TreeView>
  #include <Plasma/VideoWidget>
@@ -93,8 +93,8 @@ diff -up kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/graphicswid
 +#endif
  #include "declarativetabbar.h"
  
- 
-@@ -83,7 +84,9 @@ void GraphicsWidgetsBindingsPlugin::regi
+ SignalPlotter::SignalPlotter(QGraphicsItem *parent)
+@@ -99,7 +100,9 @@ void GraphicsWidgetsBindingsPlugin::regi
      qmlRegisterType<Plasma::ToolButton>(uri, 0, 1, "ToolButton");
      qmlRegisterType<Plasma::TreeView>(uri, 0, 1, "TreeView");
      qmlRegisterType<Plasma::VideoWidget>(uri, 0, 1, "VideoWidget");
@@ -104,9 +104,9 @@ diff -up kde-runtime-4.9.0/plasma/declarativeimports/graphicswidgets/graphicswid
  }
  
  
-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
+diff -up kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt.webkit kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt
+--- kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt.webkit	2012-09-28 02:16:15.000000000 +0200
++++ kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt	2012-10-11 15:28:21.062908056 +0200
 @@ -7,6 +7,9 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
      set(PLASMA_NO_KIO TRUE)
  endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
@@ -117,9 +117,9 @@ diff -up kde-runtime-4.9.0/plasma/scriptengines/javascript/CMakeLists.txt.webkit
  set(simple_javascript_engine_SRCS
      common/extension_launchapp.cpp
      common/extension_io.cpp
-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
+diff -up kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp
+--- kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit	2012-09-28 02:16:15.000000000 +0200
++++ kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp	2012-10-11 15:28:21.063908019 +0200
 @@ -49,7 +49,9 @@
  #include <Plasma/TextEdit>
  #include <Plasma/ToolButton>
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 36c2eac..f9157cf 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -6,7 +6,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -47,7 +47,7 @@ Patch51: kde-runtime-4.9.0-installdbgsymbols.patch
 ## upstream patches
 
 # rhel patches
-Patch300: kde-runtime-4.9.0-webkit.patch
+Patch300: kde-runtime-4.9.2-webkit.patch
 
 Obsoletes: kdebase-runtime < 4.7.97-10
 Provides:  kdebase-runtime = %{version}-%{release}
@@ -335,6 +335,9 @@ fi
 
 
 %changelog
+* Thu Oct 11 2012 Than Ngo <than at redhat.com> - 4.9.2-3
+- update webkit patch
+
 * Tue Oct 02 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.2-2
 - kde-runtime-4.9.2 is missing kio_smb (#862169) 
 
