Hello community,

here is the log from the commit of package webkitgtk for openSUSE:Factory 
checked in at 2015-01-25 21:14:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old)
 and      /work/SRC/openSUSE:Factory/.webkitgtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "webkitgtk"

Changes:
--------
--- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes      2014-10-31 
12:32:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2015-01-25 
21:14:30.000000000 +0100
@@ -1,0 +2,18 @@
+Sun Jan 11 13:00:30 UTC 2015 - [email protected]
+
+- Update to version 2.4.8:
+  + Fix SSL connection issues with some websites after the POODLE
+    vulnerability fix.
+  + Fix a crash when loading flash plugins.
+  + Fix build on GNU Hurd - Fix build on OS X.
+  + Fix documentation of webkit_print_operation_get_page_setup().
+  + Security fixes: CVE-2014-1344, CVE-2014-1384, CVE-2014-1385,
+    CVE-2014-1386, CVE-2014-1387, CVE-2014-1388, CVE-2014-1389,
+    CVE-2014-1390.
+- Add webkitgtk-compile-when-WK2-disabled.patch: Fix build when WK2
+  is disabled.
+- Pass autoreconf and enable libtool BuildRequires: Needed for
+  above patch since it touches the buildsystem.
+- Bugs fixed: boo#871792, boo#879607 and boo#879607.
+
+-------------------------------------------------------------------
webkitgtk3.changes: same change

Old:
----
  webkitgtk-2.4.7.tar.xz

New:
----
  webkitgtk-2.4.8.tar.xz
  webkitgtk-compile-when-WK2-disabled.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ webkitgtk.spec ++++++
--- /var/tmp/diff_new_pack.0WTsvX/_old  2015-01-25 21:14:31.000000000 +0100
+++ /var/tmp/diff_new_pack.0WTsvX/_new  2015-01-25 21:14:31.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package webkitgtk
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -47,7 +47,7 @@
 Summary:        Library for rendering web content, GTK+ Port
 License:        LGPL-2.0+ and BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Version:        2.4.7
+Version:        2.4.8
 Release:        0
 # FIXME: at some point, figure out a way to remove the hack where we use -g0 
to have successful builds
 # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and 
gtk3 versions
@@ -71,6 +71,8 @@
 Patch9:         webkitgtk-protocall-endian-fix.patch
 # PATCH-FIX-UPSTREAM webkitgtk-ppc32.patch webkit#130837 [email protected] --  
Webkit2 doesnt build on powerpc 32 bits 
 Patch10:        webkitgtk-ppc32.patch  
+# PATCH-FIX-UPSTREAM webkitgtk-compile-when-WK2-disabled.patch webkit#140241 
[email protected] -- Cannot compile 2.4.8 when WK2 is disabled
+Patch11:        webkitgtk-compile-when-WK2-disabled.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -81,8 +83,8 @@
 BuildRequires:  gtk-doc
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
-# Needed for patch2
-# BuildRequires:  libtool
+# Needed for patch2 and patch 11
+BuildRequires:  libtool
 BuildRequires:  perl
 BuildRequires:  python
 BuildRequires:  ruby
@@ -330,6 +332,7 @@
 %patch9 -p1
 %patch10 -p1
 %endif
+%patch11 -p1
 # FIXME: workaround needed in > 1.7.90 to fix build
 mkdir -p DerivedSources/webkit
 mkdir -p DerivedSources/WebCore
@@ -355,6 +358,9 @@
 #Needed for patch2
 #autoreconf --verbose --install -I Source/autotools
 
+#Needed for patch11
+autoreconf --verbose --install
+
 # No debug builds.... We run out of about everything with -O2 -g (the .ar 
becomes > 4.3GB)
 export CFLAGS=" $RPM_OPT_FLAGS -g0"
 export CXXFLAGS=" $RPM_OPT_FLAGS -g0"

++++++ webkitgtk3.spec ++++++
--- /var/tmp/diff_new_pack.0WTsvX/_old  2015-01-25 21:14:31.000000000 +0100
+++ /var/tmp/diff_new_pack.0WTsvX/_new  2015-01-25 21:14:31.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package webkitgtk3
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -47,7 +47,7 @@
 Summary:        Library for rendering web content, GTK+ Port
 License:        LGPL-2.0+ and BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Version:        2.4.7
+Version:        2.4.8
 Release:        0
 # FIXME: at some point, figure out a way to remove the hack where we use -g0 
to have successful builds
 # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and 
gtk3 versions
@@ -71,6 +71,8 @@
 Patch9:         webkitgtk-protocall-endian-fix.patch
 # PATCH-FIX-UPSTREAM webkitgtk-ppc32.patch webkit#130837 [email protected] --  
Webkit2 doesnt build on powerpc 32 bits 
 Patch10:        webkitgtk-ppc32.patch  
+# PATCH-FIX-UPSTREAM webkitgtk-compile-when-WK2-disabled.patch webkit#140241 
[email protected] -- Cannot compile 2.4.8 when WK2 is disabled
+Patch11:        webkitgtk-compile-when-WK2-disabled.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -81,8 +83,8 @@
 BuildRequires:  gtk-doc
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
-# Needed for patch2
-# BuildRequires:  libtool
+# Needed for patch2 and patch 11
+BuildRequires:  libtool
 BuildRequires:  perl
 BuildRequires:  python
 BuildRequires:  ruby
@@ -330,6 +332,7 @@
 %patch9 -p1
 %patch10 -p1
 %endif
+%patch11 -p1
 # FIXME: workaround needed in > 1.7.90 to fix build
 mkdir -p DerivedSources/webkit
 mkdir -p DerivedSources/WebCore
@@ -355,6 +358,9 @@
 #Needed for patch2
 #autoreconf --verbose --install -I Source/autotools
 
+#Needed for patch11
+autoreconf --verbose --install
+
 # No debug builds.... We run out of about everything with -O2 -g (the .ar 
becomes > 4.3GB)
 export CFLAGS=" $RPM_OPT_FLAGS -g0"
 export CXXFLAGS=" $RPM_OPT_FLAGS -g0"

++++++ webkitgtk-2.4.7.tar.xz -> webkitgtk-2.4.8.tar.xz ++++++
/work/SRC/openSUSE:Factory/webkitgtk/webkitgtk-2.4.7.tar.xz 
/work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk-2.4.8.tar.xz differ: char 
26, line 1

++++++ webkitgtk-compile-when-WK2-disabled.patch ++++++
>From ea9a80ffb659f1b65cc4ccef1f092cfbf79d6ad5 Mon Sep 17 00:00:00 2001
From: Tomas Popela <[email protected]>
Date: Fri, 16 Jan 2015 12:29:48 +0100
Subject: [PATCH] 2015-01-16  Tomas Popela  <[email protected]>

        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(+)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 587a6c3..7e91646 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2015-01-16  Tomas Popela  <[email protected]>
+
+        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  <[email protected]>
 
         Crash in WebCore::Node::getFlag
diff --git a/Source/WebCore/GNUmakefile.list.am 
b/Source/WebCore/GNUmakefile.list.am
index 2f5cb19..22956c7 100644
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/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

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to