From e1f4f0ca8075097b6c5d9238d728ced84ca3d9dfb16bdfe77222e222a44b9e87 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 7 Jun 2016 09:33:37 +0000 Subject: [PATCH 1/4] Accepting request 400407 from GNOME:Next - Also apply webkitgtk-disable-gcc-version-checks.patch on Leap and use GCC 4.8. Plus SLE SYNC OBS-URL: https://build.opensuse.org/request/show/400407 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=68 --- webkit2gtk3.changes | 21 ++++++++++++++++++--- webkit2gtk3.spec | 4 ++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 028e9a0..1a3a332 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,7 +1,23 @@ ------------------------------------------------------------------- -Thu May 5 18:02:14 CEST 2016 - ro@suse.de +Tue Jun 7 09:12:46 UTC 2016 - dimstar@opensuse.org -- handle s390 like s390x +- Also apply webkitgtk-disable-gcc-version-checks.patch on Leap + and use GCC 4.8. + +------------------------------------------------------------------- +Fri May 27 11:59:29 UTC 2016 - idonmez@suse.com + +- Update to GNOME 3.20.2 FATE#318572 + +------------------------------------------------------------------- +Thu May 5 23:34:03 CEST 2016 - ro@suse.de + +- add -DUSE_SYSTEM_MALLOC=ON as in factory on ppc/s390 + +------------------------------------------------------------------- +Wed May 4 15:07:26 CEST 2016 - ro@suse.de + +- handle s390 like s390x to fix build ------------------------------------------------------------------- Mon May 2 14:05:38 CEST 2016 - fcrozat@suse.com @@ -735,7 +751,6 @@ Fri Jan 23 22:20:28 UTC 2015 - zaitor@opensuse.org + Fix documentation of webkit_print_operation_get_page_setup(). ------------------------------------------------------------------- - Fri Jan 23 19:16:29 UTC 2015 - zaitor@opensuse.org - Update to version 2.6.5: diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 4831529..756239d 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -43,7 +43,7 @@ BuildRequires: binutils-gold %endif BuildRequires: bison >= 2.3 BuildRequires: cmake -%if 0%{?is_opensuse} +%if %{?suse_version} > 1315 BuildRequires: gcc-c++ >= 4.9 %else BuildRequires: gcc-c++ >= 4.8 @@ -217,7 +217,7 @@ more. %prep %setup -q -n webkitgtk-%{version} %patch0 -p1 -%if !0%{?is_opensuse} +%if %{?suse_version} == 1315 %patch1 -p1 %endif From 44efd7ba349a5e88ed18050a45382b79e1c01345bf7b2945b427a49f4d4c9bd3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 7 Jun 2016 10:00:59 +0000 Subject: [PATCH 2/4] - Change condition to pass -DENABLE_DATABASE_PROCESS=OFF, -DENABLE_INDEXED_DATABASE=OFF and -DENABLE_FTL_JIT=OFF to cmake: newly on all SLE12 based systems (incl. Leap). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=69 --- webkit2gtk3.changes | 3 +++ webkit2gtk3.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 1a3a332..f432c9f 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -3,6 +3,9 @@ Tue Jun 7 09:12:46 UTC 2016 - dimstar@opensuse.org - Also apply webkitgtk-disable-gcc-version-checks.patch on Leap and use GCC 4.8. +- Change condition to pass -DENABLE_DATABASE_PROCESS=OFF, + -DENABLE_INDEXED_DATABASE=OFF and -DENABLE_FTL_JIT=OFF to cmake: + newly on all SLE12 based systems (incl. Leap). ------------------------------------------------------------------- Fri May 27 11:59:29 UTC 2016 - idonmez@suse.com diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 756239d..88fb710 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -235,7 +235,7 @@ more. # Disable FTL JIT on SLE until we get llvm >= 3.7 or until # upstream switches from LLVM to B3 (requires gcc >= 4.9). %cmake \ -%if !0%{?is_opensuse} +%if 0%{?suse_version} == 1315 -DENABLE_DATABASE_PROCESS=OFF \ -DENABLE_INDEXED_DATABASE=OFF \ -DENABLE_FTL_JIT=OFF \ From 85da0482335d3bc5cf5780138642a89a84bac3eac2daed2d0fb2d1761af6f02f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 18 Jun 2016 09:42:01 +0000 Subject: [PATCH 3/4] Accepting request 402873 from GNOME:Next New stable release, how did we miss this for almost a month... OBS-URL: https://build.opensuse.org/request/show/402873 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=70 --- webkit2gtk3.changes | 14 ++++++++++++++ webkit2gtk3.spec | 2 +- webkitgtk-2.12.2.tar.xz | 3 --- webkitgtk-2.12.3.tar.xz | 3 +++ 4 files changed, 18 insertions(+), 4 deletions(-) delete mode 100644 webkitgtk-2.12.2.tar.xz create mode 100644 webkitgtk-2.12.3.tar.xz diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index f432c9f..680a85f 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jun 17 08:38:10 UTC 2016 - zaitor@opensuse.org + +- Update to version 2.12.3: + + Security fixes: CVE-2016-1857, CVE-2016-1856. + + Improved the detection of supported MIME types supported by the + media player. + + Fix web process crash when playing adaptive streaming media. + + Change the volume while thumb slider is dragged, not only when + released. + + Fix leaked thread in network process. + + Fix several crashes and rendering issues. + + Updated translations. + ------------------------------------------------------------------- Tue Jun 7 09:12:46 UTC 2016 - dimstar@opensuse.org diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 88fb710..8aa4a50 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -26,7 +26,7 @@ %define _pkgconfig_suffix gtk-3.0 %define _name webkitgtk Name: webkit2gtk3 -Version: 2.12.2 +Version: 2.12.3 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ and BSD-3-Clause diff --git a/webkitgtk-2.12.2.tar.xz b/webkitgtk-2.12.2.tar.xz deleted file mode 100644 index 268bc39..0000000 --- a/webkitgtk-2.12.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dc49b908b1c37da739703e1402a7f07c4ea9093b8ecfb34f20e8f74e328f124 -size 11703584 diff --git a/webkitgtk-2.12.3.tar.xz b/webkitgtk-2.12.3.tar.xz new file mode 100644 index 0000000..84e46c4 --- /dev/null +++ b/webkitgtk-2.12.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307 +size 11706664 From 2a2078e2af139b7fa82271f02295f7b070ba97e0fd9284634e8db663c7278583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 23 Jun 2016 08:22:29 +0000 Subject: [PATCH 4/4] Accepting request 403717 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/403717 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=71 --- webkit2gtk3.changes | 6 ++++++ webkitgtk-disable-gcc-version-checks.patch | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 680a85f..c882163 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 20 13:46:09 UTC 2016 - fcrozat@suse.com + +- Refresh webkitgtk-disable-gcc-version-checks.patch for latest + version. + ------------------------------------------------------------------- Fri Jun 17 08:38:10 UTC 2016 - zaitor@opensuse.org diff --git a/webkitgtk-disable-gcc-version-checks.patch b/webkitgtk-disable-gcc-version-checks.patch index 5f5f1d1..e88b26a 100644 --- a/webkitgtk-disable-gcc-version-checks.patch +++ b/webkitgtk-disable-gcc-version-checks.patch @@ -11,10 +11,10 @@ process code. Source/cmake/OptionsGTK.cmake | 7 ------- 1 file changed, 7 deletions(-) -Index: webkitgtk-2.12.2/Source/cmake/OptionsGTK.cmake +Index: webkitgtk-2.12.3/Source/cmake/OptionsGTK.cmake =================================================================== ---- webkitgtk-2.12.2.orig/Source/cmake/OptionsGTK.cmake 2016-04-28 08:49:27.000000000 +0200 -+++ webkitgtk-2.12.2/Source/cmake/OptionsGTK.cmake 2016-05-02 14:06:42.166231056 +0200 +--- webkitgtk-2.12.3.orig/Source/cmake/OptionsGTK.cmake 2016-05-24 10:06:23.000000000 +0200 ++++ webkitgtk-2.12.3/Source/cmake/OptionsGTK.cmake 2016-06-20 15:45:57.393089713 +0200 @@ -6,13 +6,6 @@ set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) set(WEBKITGTK_API_VERSION 4.0) @@ -28,11 +28,11 @@ Index: webkitgtk-2.12.2/Source/cmake/OptionsGTK.cmake - # Libtool library version, not to be confused with API version. # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html - CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 8 13) -Index: webkitgtk-2.12.2/Source/WTF/wtf/Compiler.h + CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 9 13) +Index: webkitgtk-2.12.3/Source/WTF/wtf/Compiler.h =================================================================== ---- webkitgtk-2.12.2.orig/Source/WTF/wtf/Compiler.h 2016-04-11 08:18:43.000000000 +0200 -+++ webkitgtk-2.12.2/Source/WTF/wtf/Compiler.h 2016-05-02 14:06:42.166231056 +0200 +--- webkitgtk-2.12.3.orig/Source/WTF/wtf/Compiler.h 2016-04-11 08:18:43.000000000 +0200 ++++ webkitgtk-2.12.3/Source/WTF/wtf/Compiler.h 2016-06-20 15:45:57.393089713 +0200 @@ -70,8 +70,8 @@ #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))