From 83b004c2e245fbc0b121858f43ca90820f2d2952ccaa4be4ce3a151b05de18b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 May 2016 12:26:04 +0000 Subject: [PATCH] Accepting request 393288 from home:fcrozat:branches:GNOME:Factory - Refresh webkitgtk-disable-gcc-version-checks.patch for latest version. OBS-URL: https://build.opensuse.org/request/show/393288 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=64 --- 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 5881347..8138239 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 2 14:05:38 CEST 2016 - fcrozat@suse.com + +- Refresh webkitgtk-disable-gcc-version-checks.patch for latest + version. + ------------------------------------------------------------------- Thu Apr 28 08:30:17 UTC 2016 - zaitor@opensuse.org diff --git a/webkitgtk-disable-gcc-version-checks.patch b/webkitgtk-disable-gcc-version-checks.patch index 47c5131..5f5f1d1 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.0/Source/cmake/OptionsGTK.cmake +Index: webkitgtk-2.12.2/Source/cmake/OptionsGTK.cmake =================================================================== ---- webkitgtk-2.12.0.orig/Source/cmake/OptionsGTK.cmake 2016-03-22 09:40:16.000000000 +0100 -+++ webkitgtk-2.12.0/Source/cmake/OptionsGTK.cmake 2016-03-23 09:15:11.358417558 +0100 +--- 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 @@ -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.0/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 6 13) -Index: webkitgtk-2.12.0/Source/WTF/wtf/Compiler.h + CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 8 13) +Index: webkitgtk-2.12.2/Source/WTF/wtf/Compiler.h =================================================================== ---- webkitgtk-2.12.0.orig/Source/WTF/wtf/Compiler.h 2016-03-17 08:51:05.000000000 +0100 -+++ webkitgtk-2.12.0/Source/WTF/wtf/Compiler.h 2016-03-23 09:15:11.358417558 +0100 +--- 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 @@ -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))