Hello community, here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2015-05-07 09:22:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old) and /work/SRC/openSUSE:Factory/.webkitgtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkitgtk" Changes: -------- --- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2015-03-30 19:13:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2015-05-07 09:22:04.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 6 11:35:33 UTC 2015 - [email protected] + +- add webkitgtk-gcc5-fixes.patch: Fix build with GCC 5.x + +------------------------------------------------------------------- webkitgtk3.changes: same change New: ---- webkitgtk-gcc5-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkitgtk.spec ++++++ --- /var/tmp/diff_new_pack.NPZaPt/_old 2015-05-07 09:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.NPZaPt/_new 2015-05-07 09:22:04.000000000 +0200 @@ -75,6 +75,8 @@ Patch11: webkitgtk-compile-when-WK2-disabled.patch # PATCH-FIX-UPSTREAM webkitgtk-WTF-GMutexLocker.patch webkit#141381 [email protected] -- Fix build with GLib 2.43.4, solve conflict on GMutexLock name Patch12: webkitgtk-WTF-GMutexLocker.patch +# PATCH-FIX-OPENSUSE webkitgtk-gcc5-fixes.patch [email protected] -- Allow gcc 5.x +Patch13: webkitgtk-gcc5-fixes.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: chrpath @@ -336,6 +338,7 @@ %endif %patch11 -p1 %patch12 -p1 +%patch13 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore ++++++ webkitgtk3.spec ++++++ --- /var/tmp/diff_new_pack.NPZaPt/_old 2015-05-07 09:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.NPZaPt/_new 2015-05-07 09:22:04.000000000 +0200 @@ -75,6 +75,8 @@ Patch11: webkitgtk-compile-when-WK2-disabled.patch # PATCH-FIX-UPSTREAM webkitgtk-WTF-GMutexLocker.patch webkit#141381 [email protected] -- Fix build with GLib 2.43.4, solve conflict on GMutexLock name Patch12: webkitgtk-WTF-GMutexLocker.patch +# PATCH-FIX-OPENSUSE webkitgtk-gcc5-fixes.patch [email protected] -- Allow gcc 5.x +Patch13: webkitgtk-gcc5-fixes.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: chrpath @@ -336,6 +338,7 @@ %endif %patch11 -p1 %patch12 -p1 +%patch13 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir -p DerivedSources/webkit mkdir -p DerivedSources/WebCore ++++++ webkitgtk-gcc5-fixes.patch ++++++ --- webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 2015-01-07 10:45:43.000000000 +0100 +++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-02-18 13:09:57.359888184 +0100 @@ -87,12 +87,12 @@ AC_SYS_LARGEFILE c_compiler="unknown" AC_LANG_PUSH([C]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) +#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) #error Not a supported GCC compiler #endif ])], [c_compiler="gcc"], []) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) #error Not a supported Clang compiler #endif ])], [c_compiler="clang"], []) @@ -106,12 +106,12 @@ fi cxx_compiler="unknown" AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) +#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) #error Not a supported G++ compiler #endif ])], [cxx_compiler="g++"], []) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) #error Not a supported Clang++ compiler #endif ])], [cxx_compiler="clang++"], [])
