- up to 2.4.9

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index ed19398002a010b8d6975f12b30bd2fdb17fafd3..04503f649596689b4f627fa4d4e7fcc060443081 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -10,15 +10,14 @@ Summary:    Port of WebKit embeddable web component to GTK+ 3
 Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:          gtk-webkit3
 # note: for 2.6.x series see gtk-webkit4
-Version:       2.4.8
-Release:       3
+Version:       2.4.9
+Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: bcdcef8e1ba28dbd5bb05f86c79f76b8
+# Source0-md5: 312fd29eb7f5970660c6a64b8bf8420e
 Patch0:                atomic-ops.patch
-Patch1:                webkitgtk-redefined.patch
-Patch2:                x32.patch
+Patch1:                x32.patch
 URL:           http://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
@@ -141,7 +140,6 @@ Dokumentacja API WebKita.
 %patch0 -p1
 %endif
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}

diff --git a/webkitgtk-redefined.patch b/webkitgtk-redefined.patch
deleted file mode 100644 (file)
index 8d8c1ba..0000000
--- a/webkitgtk-redefined.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-@@ -, +, @@ 
-        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
-        https://bugs.webkit.org/show_bug.cgi?id=140241
-        Reviewed by NOBODY (OOPS!).
-        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
-        just when WebKit2 is enabled and we are not building for X11.
-        * GNUmakefile.list.am:
----
- Source/WebCore/ChangeLog           | 12 ++++++++++++
- Source/WebCore/GNUmakefile.list.am |  8 ++++++++
- 2 files changed, 20 insertions(+)
---- a/Source/WebCore/ChangeLog 
-+++ a/Source/WebCore/ChangeLog 
-@@ -1,3 +1,15 @@ 
-+2015-01-16  Tomas Popela  <tpopela@redhat.com>
-+
-+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
-+        https://bugs.webkit.org/show_bug.cgi?id=140241
-+
-+        Reviewed by NOBODY (OOPS!).
-+
-+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
-+        just when WebKit2 is enabled and we are not building for X11.
-+
-+        * GNUmakefile.list.am:
-+
- 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
- 
-         Crash in WebCore::Node::getFlag
---- a/Source/WebCore/GNUmakefile.list.am       
-+++ a/Source/WebCore/GNUmakefile.list.am       
-@@ -6254,9 +6254,13 @@ endif # END USE_GLX
- endif # END TARGET_X11
- 
- if TARGET_WAYLAND
-+if !TARGET_X11
-+if ENABLE_WEBKIT2
- webcore_sources += \
-       Source/WebCore/plugins/PluginPackageNone.cpp \
-       Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
-+endif # END !TARGET_X11
- endif # END TARGET_WAYLAND
- 
- if TARGET_X11_OR_WAYLAND
-@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
- endif # END TARGET_WIN32
- 
- if TARGET_QUARTZ
-+if !TARGET_X11
-+if ENABLE_WEBKIT2
- webcore_sources += \
-       Source/WebCore/plugins/PluginPackageNone.cpp \
-       Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
-+endif # END !TARGET_X11
- platformgtk_sources += \
-       Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
-       Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp