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
This commit is contained in:
Bjørn Lie 2016-06-23 08:22:29 +00:00 committed by Git OBS Bridge
parent 85da048233
commit 2a2078e2af
2 changed files with 13 additions and 7 deletions

View File

@ -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

View File

@ -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))