pool/webkit2gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 422485 from home:sreeves1:branches:GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/422485
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger 2016-08-26 08:20:40 +00:00 committed by Git OBS Bridge
parent e65e65f8a5
commit e7d3c6d37f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webkit2gtk3.changes
View File

@ -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 Thu Aug 25 07:13:38 UTC 2016 - zaitor@opensuse.org

16
webkitgtk-disable-gcc-version-checks.patch
View File

@ -11,11 +11,11 @@ process code.
Source/cmake/OptionsGTK.cmake | 7 ------- Source/cmake/OptionsGTK.cmake | 7 -------
1 file changed, 7 deletions(-) 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.4.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk-2.12.3/Source/cmake/OptionsGTK.cmake 2016-06-20 15:45:57.393089713 +0200 +++ webkitgtk-2.12.4/Source/cmake/OptionsGTK.cmake
@@ -6,13 +6,6 @@ @@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 4)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
set(WEBKITGTK_API_VERSION 4.0) 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. # Libtool library version, not to be confused with API version.
# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 9 13) CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 10 13)
Index: webkitgtk-2.12.3/Source/WTF/wtf/Compiler.h 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.4.orig/Source/WTF/wtf/Compiler.h
+++ webkitgtk-2.12.3/Source/WTF/wtf/Compiler.h 2016-06-20 15:45:57.393089713 +0200 +++ webkitgtk-2.12.4/Source/WTF/wtf/Compiler.h
@@ -70,8 +70,8 @@ @@ -70,8 +70,8 @@
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #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)) #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))