diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 73ba8bb..2e78103 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 25 23:14:56 UTC 2016 - sreeves@suse.com + +- Rebase webkitgtk-disable-gcc-version-checks.patch for 2.12.4 + ------------------------------------------------------------------- Thu Aug 25 07:13:38 UTC 2016 - zaitor@opensuse.org diff --git a/webkitgtk-disable-gcc-version-checks.patch b/webkitgtk-disable-gcc-version-checks.patch index e88b26a..8679de1 100644 --- a/webkitgtk-disable-gcc-version-checks.patch +++ b/webkitgtk-disable-gcc-version-checks.patch @@ -11,11 +11,11 @@ process code. Source/cmake/OptionsGTK.cmake | 7 ------- 1 file changed, 7 deletions(-) -Index: webkitgtk-2.12.3/Source/cmake/OptionsGTK.cmake +Index: webkitgtk-2.12.4/Source/cmake/OptionsGTK.cmake =================================================================== ---- 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 @@ +--- webkitgtk-2.12.4.orig/Source/cmake/OptionsGTK.cmake ++++ webkitgtk-2.12.4/Source/cmake/OptionsGTK.cmake +@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 4) 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.3/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 9 13) -Index: webkitgtk-2.12.3/Source/WTF/wtf/Compiler.h + CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 10 13) +Index: webkitgtk-2.12.4/Source/WTF/wtf/Compiler.h =================================================================== ---- 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 +--- webkitgtk-2.12.4.orig/Source/WTF/wtf/Compiler.h ++++ webkitgtk-2.12.4/Source/WTF/wtf/Compiler.h @@ -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))