Accepting request 378372 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/378372
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2016-03-23 13:08:31 +00:00 committed by Git OBS Bridge
parent c0061fcabd
commit 805e9b66fd
2 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 23 08:15:21 UTC 2016 - fcrozat@suse.com
- Refresh webkitgtk-disable-gcc-version-checks.patch for latest
version.
-------------------------------------------------------------------
Tue Mar 22 14:26:59 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.11.92/Source/cmake/OptionsGTK.cmake
Index: webkitgtk-2.12.0/Source/cmake/OptionsGTK.cmake
===================================================================
--- webkitgtk-2.11.92.orig/Source/cmake/OptionsGTK.cmake 2016-03-16 15:00:55.000000000 +0100
+++ webkitgtk-2.11.92/Source/cmake/OptionsGTK.cmake 2016-03-17 14:25:15.029217585 +0100
--- 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
@@ -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.11.92/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 5 13)
Index: webkitgtk-2.11.92/Source/WTF/wtf/Compiler.h
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 6 13)
Index: webkitgtk-2.12.0/Source/WTF/wtf/Compiler.h
===================================================================
--- webkitgtk-2.11.92.orig/Source/WTF/wtf/Compiler.h 2016-03-14 09:53:20.000000000 +0100
+++ webkitgtk-2.11.92/Source/WTF/wtf/Compiler.h 2016-03-17 14:25:15.029217585 +0100
--- 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
@@ -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))