Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2013-11-04 09:18:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2013-10-17 17:41:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2013-11-04 09:18:16.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Oct 23 17:11:55 UTC 2013 - [email protected] + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 +- Droped bison3.patch, included in this release + +------------------------------------------------------------------- +Fri Oct 18 12:16:15 UTC 2013 - [email protected] + +- Added 03_hide_std_symbols.diff, 04_enable_debug_information.diff, + aarch64-support.patch and reduce-link-optimization.diff -- those + resolve linking/build failures on arm/aarch64 + +------------------------------------------------------------------- Old: ---- bison3.patch qtwebkit-opensource-src-5.1.1.tar.xz New: ---- 03_hide_std_symbols.diff 04_enable_debug_information.diff aarch64-support.patch qtwebkit-opensource-src-5.2.0-beta1.tar.xz reduce-link-optimization.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.zR3Zww/_old 2013-11-04 09:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.zR3Zww/_new 2013-11-04 09:18:19.000000000 +0100 @@ -19,12 +19,15 @@ %define libname libQt5WebKitWidgets5 Name: libqt5-qtwebkit -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 BuildRequires: libQt5Quick-private-headers-devel >= %{version} +BuildRequires: pkgconfig(Qt5Multimedia) >= %{version} +BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) >= %{version} %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtwebkit-opensource-src-%{real_version} BuildRequires: libQt5Script-devel >= %{version} %if 0%{?suse_version} < 1320 @@ -48,8 +51,12 @@ Group: Development/Libraries/X11 Url: http://qt.digia.com Source: %{tar_version}.tar.xz -# PATCH-FIX-UPSTREAM bison3.patch -- fixes build with bison3 -Patch0: bison3.patch +Patch1: 04_enable_debug_information.diff +# PATCH-FIX-OPENSUSE 03_hide_std_symbols.diff [email protected] -- Do not make the std:: symbols in webkit public (taken from Ubuntu) +Patch2: 03_hide_std_symbols.diff +Patch3: reduce-link-optimization.diff +# PATCH-FIX-UPSTREAM aarch64-support.diff [email protected] -- add support for aarch64 +Patch4: aarch64-support.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch130: no-Werror-rpath.diff BuildRequires: bison @@ -61,6 +68,7 @@ BuildRequires: python-xml BuildRequires: ruby BuildRequires: xz +BuildRequires: pkgconfig(libwebp) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,7 +80,10 @@ %prep %setup -q -n qtwebkit-opensource-src-%{real_version} -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %patch130 -p1 %package -n %libname @@ -109,9 +120,10 @@ Group: Development/Libraries/X11 Requires: libQt5Quick-private-headers-devel >= %{version} Requires: libQt5Script-devel >= %{version} -Requires: libQt5WebKit5 = %{version} +Requires: libQt5WebKit5 = %version Requires: libicu-devel Requires: libxslt-devel +Requires: pkgconfig(libwebp) %if 0%{?suse_version} < 1320 Requires: pkgconfig(gstreamer-0.10) Requires: pkgconfig(gstreamer-app-0.10) @@ -172,9 +184,13 @@ %ifarch ppc64 RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory" +# runs out of memory otherwise +%ifarch %arm aarch64 +export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / /} +%endif +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--as-needed" qmake make ++++++ 03_hide_std_symbols.diff ++++++ From: Modestas Vainius <[email protected]> SUbject: Make hide_symbols to cover all QtWebKit portions Origin: vendor Author: Timo Jyrinki <[email protected]> Last-Update: 2013-01-28 (use a similar patch on Qt 5) Forwarded: no Almost everything in Source/WebCore/generated was not build with -fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol list in libQtWebKit.so. Therefore, move +hide_symbols configuration parameter upwards in order for it to cover everything including the offending Source/WebCore/CodeGenerators.pri --- a/Source/QtWebKit.pro 2012-12-18 19:04:43.000000000 +0000 +++ b/Source/QtWebKit.pro 2013-01-28 08:25:56.342911517 +0000 @@ -7,6 +7,11 @@ TEMPLATE = subdirs CONFIG += ordered +CONFIG(release):!CONFIG(standalone_package) { + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions +} + api.file = api.pri SUBDIRS += api ++++++ 04_enable_debug_information.diff ++++++ --- a/Source/WebKit/WebKit1.pri +++ b/Source/WebKit/WebKit1.pri @@ -7,6 +7,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit +equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) { + message("s390, armel, armhf, mipsel, i386 workaround for QtWebkit: do not build with -g, but with -gstabs") + QMAKE_CXXFLAGS -= -g + QMAKE_CXXFLAGS += -gstabs +} + INCLUDEPATH += \ $$SOURCE_DIR/qt/Api \ $$SOURCE_DIR/qt/WebCoreSupport \ --- a/Source/WebKit2/WebKit2.pri +++ b/Source/WebKit2/WebKit2.pri @@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR} +equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) { + message("s390, armel, armhf, mipsel, i686 workaround for QtWebkit: do not build with -g, but with -gstabs") + QMAKE_CXXFLAGS -= -g + QMAKE_CXXFLAGS += -gstabs +} + INCLUDEPATH += \ $$SOURCE_DIR \ $$SOURCE_DIR/Platform \ ++++++ aarch64-support.patch ++++++ Index: webkitgtk-2.0.1/Source/WTF/wtf/Platform.h =================================================================== --- webkitgtk-2.0.1.orig/Source/WTF/wtf/Platform.h +++ webkitgtk-2.0.1/Source/WTF/wtf/Platform.h @@ -318,6 +318,14 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif +/* CPU(AARCH64) - AArch64 */ +#if defined(__aarch64__) +#define WTF_CPU_AARCH64 1 +#if defined(__AARCH64BE__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +#endif + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ @@ -744,7 +752,8 @@ || CPU(ALPHA) \ || CPU(SPARC64) \ || CPU(S390X) \ - || CPU(PPC64) + || CPU(PPC64) \ + || CPU(AARCH64) #define WTF_USE_JSVALUE64 1 #else #define WTF_USE_JSVALUE32_64 1 Index: webkitgtk-2.0.1/Source/WTF/wtf/dtoa/utils.h =================================================================== --- webkitgtk-2.0.1.orig/Source/WTF/wtf/dtoa/utils.h +++ webkitgtk-2.0.1/Source/WTF/wtf/dtoa/utils.h @@ -49,7 +49,7 @@ defined(__ARMEL__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) +#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) ++++++ no-Werror-rpath.diff ++++++ --- /var/tmp/diff_new_pack.zR3Zww/_old 2013-11-04 09:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.zR3Zww/_new 2013-11-04 09:18:19.000000000 +0100 @@ -1,15 +1,16 @@ ---- qtwebkit/Tools/qmake/mkspecs/features/unix/default_post.prf 2012/12/06 19:59:43 1.1 -+++ qtwebkit/Tools/qmake/mkspecs/features/unix/default_post.prf 2012/12/06 20:00:17 -@@ -15,7 +15,7 @@ +diff -Naur qtwebkit-opensource-src-5.2.0-beta1.orig/Tools/qmake/mkspecs/features/unix/default_post.prf qtwebkit-opensource-src-5.2.0-beta1/Tools/qmake/mkspecs/features/unix/default_post.prf +--- qtwebkit-opensource-src-5.2.0-beta1.orig/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-22 10:49:32.000000000 +0200 ++++ qtwebkit-opensource-src-5.2.0-beta1/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-10-24 03:21:13.236166006 +0200 +@@ -19,7 +19,7 @@ linux-*g++* { !production_build { # Treat warnings as errors on x86/Linux/GCC - isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -+# isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror ++ #isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror } - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) { -@@ -32,7 +32,7 @@ + } + +@@ -39,7 +39,7 @@ QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions } ++++++ reduce-link-optimization.diff ++++++ Index: webkit-qtwebkit-23/Source/WebCore/WebCore.pri =================================================================== --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -345,6 +345,8 @@ mac { unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
