Hello community, here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2013-12-23 22:21:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-24 13:34:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2013-12-23 22:21:35.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 23 08:43:41 UTC 2013 - [email protected] + +- Add webkitgtk-ppc64le.patch: Support powerpc64le-linux. +- Inject same C(PP)FLAGS as for ppc64. + +------------------------------------------------------------------- +Sat Dec 14 17:16:01 UTC 2013 - [email protected] + +- Add webkitgtk-use-recommended-freetype-include.patch: Freetype + upstream recommends using their macros together with ft2build + include. Positive sideeffect is that this patch makes it build + with both freetype2 2.5.1, and older versions. + +------------------------------------------------------------------- webkitgtk3.changes: same change New: ---- webkitgtk-ppc64le.patch webkitgtk-use-recommended-freetype-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkitgtk.spec ++++++ --- /var/tmp/diff_new_pack.HUnOf2/_old 2013-12-23 22:21:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HUnOf2/_new 2013-12-23 22:21:37.000000000 +0100 @@ -61,6 +61,10 @@ Patch2: webkit-ld-optimization.patch # PATCH-FIX-UPSTREAM aarch64-support.patch webkit#116030 [email protected] -- Support for aarch64 Patch3: webkitgtk-aarch64.patch +# PATCH-FIX-UPSTREAM webkitgtk-use-recommended-freetype-include.patch [email protected] -- Use freetype upstream recommended #include style +Patch4: webkitgtk-use-recommended-freetype-include.patch +# PATCH-FIX-UPSTREAM webkitgtk-ppc64le.patch [email protected] -- add support for ppc64le +Patch5: webkitgtk-ppc64le.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -294,6 +298,8 @@ # Disabled since version 2.0.0 - a _constraint file was added, asking for 2200MB HDD and 1400MB memory. #patch2 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir -p DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle @@ -303,14 +309,14 @@ mkdir DerivedSources/webkitdom %build -%ifarch ppc64 +%ifarch ppc64 ppc64le RPM_OPT_FLAGS+=" -mminimal-toc " %endif %ifarch %arm # we'll always want to remove the debug from the build on arm RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g / }" %endif -%ifarch %arm ppc ppc64 s390 s390x +%ifarch %arm ppc ppc64 ppc64le s390 s390x RPM_OPT_FLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads " %endif @@ -322,7 +328,7 @@ export CXXFLAGS=" $RPM_OPT_FLAGS -g0" # Use CPPFLAGS to disable jit, webkit#113638 -%ifarch %arm ppc ppc64 s390 s390x +%ifarch %arm ppc ppc64 ppc64le s390 s390x export CPPFLAGS="-DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0" %endif ++++++ webkitgtk3.spec ++++++ --- /var/tmp/diff_new_pack.HUnOf2/_old 2013-12-23 22:21:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HUnOf2/_new 2013-12-23 22:21:37.000000000 +0100 @@ -61,6 +61,10 @@ Patch2: webkit-ld-optimization.patch # PATCH-FIX-UPSTREAM aarch64-support.patch webkit#116030 [email protected] -- Support for aarch64 Patch3: webkitgtk-aarch64.patch +# PATCH-FIX-UPSTREAM webkitgtk-use-recommended-freetype-include.patch [email protected] -- Use freetype upstream recommended #include style +Patch4: webkitgtk-use-recommended-freetype-include.patch +# PATCH-FIX-UPSTREAM webkitgtk-ppc64le.patch [email protected] -- add support for ppc64le +Patch5: webkitgtk-ppc64le.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -294,6 +298,8 @@ # Disabled since version 2.0.0 - a _constraint file was added, asking for 2200MB HDD and 1400MB memory. #patch2 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir -p DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle @@ -303,14 +309,14 @@ mkdir DerivedSources/webkitdom %build -%ifarch ppc64 +%ifarch ppc64 ppc64le RPM_OPT_FLAGS+=" -mminimal-toc " %endif %ifarch %arm # we'll always want to remove the debug from the build on arm RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g / }" %endif -%ifarch %arm ppc ppc64 s390 s390x +%ifarch %arm ppc ppc64 ppc64le s390 s390x RPM_OPT_FLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads " %endif @@ -322,7 +328,7 @@ export CXXFLAGS=" $RPM_OPT_FLAGS -g0" # Use CPPFLAGS to disable jit, webkit#113638 -%ifarch %arm ppc ppc64 s390 s390x +%ifarch %arm ppc ppc64 ppc64le s390 s390x export CPPFLAGS="-DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0" %endif ++++++ webkitgtk-ppc64le.patch ++++++ Index: webkitgtk-2.2.2/Source/WTF/wtf/Platform.h =================================================================== --- webkitgtk-2.2.2.orig/Source/WTF/wtf/Platform.h +++ webkitgtk-2.2.2/Source/WTF/wtf/Platform.h @@ -109,16 +109,22 @@ || defined(__POWERPC__) \ || defined(_M_PPC) \ || defined(__PPC) +#if !defined(__ppc64__) && !defined(__PPC64__) #define WTF_CPU_PPC 1 +#endif +#if !defined(__LITTLE_ENDIAN__) #define WTF_CPU_BIG_ENDIAN 1 #endif +#endif /* CPU(PPC64) - PowerPC 64-bit */ #if defined(__ppc64__) \ || defined(__PPC64__) #define WTF_CPU_PPC64 1 +#if !defined(__LITTLE_ENDIAN__) #define WTF_CPU_BIG_ENDIAN 1 #endif +#endif /* CPU(SH4) - SuperH SH-4 */ #if defined(__SH4__) ++++++ webkitgtk-use-recommended-freetype-include.patch ++++++ diff -Naur webkitgtk-2.2.2.orig/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp webkitgtk-2.2.2/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp --- webkitgtk-2.2.2.orig/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-11-11 09:32:35.000000000 +0100 +++ webkitgtk-2.2.2/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-12-14 18:14:40.349037415 +0100 @@ -39,8 +39,9 @@ #include "TextEncoding.h" #include <cairo-ft.h> #include <cairo.h> -#include <freetype/freetype.h> -#include <freetype/tttables.h> +#include <ft2build.h> +#include FT_FREETYPE_H +#include FT_TRUETYPE_TABLES_H #include <hb.h> #include <wtf/text/CString.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
