Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2013-03-22 11:50:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libQtWebKit4", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2013-02-11 15:04:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2013-03-22 11:50:47.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Mar 19 11:56:19 UTC 2013 - idon...@suse.com + +- Enable GStreamer 1.0 for also openSUSE 12.3 + +------------------------------------------------------------------- +Sat Mar 16 13:31:52 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to version 2.3.0 (bnc#769197) + * Lots of performance improvements and reduced memory usage. + * Incremental image loading by prefering WebKit image-decoders over + Qt image decoders + * Interface for automatic spell-checker + * Better support for "BLOB" URLs + * WebGL support + * CSS shaders/filters support + * CSS regions/exclusions support +- Add upstream patch for gstreamer 1.0 support, and enable it + for >= 13.1 +- Drop obsolete patches: avoid-rpath.diff, bison-26.diff, + build-with-glib-231.diff, fix_infinite_loop_bwo97258.diff, + 0001_fix_symbols_visibility_for_webcore.diff and + 01_lflags_as-needed.diff + +------------------------------------------------------------------- Old: ---- 0001_fix_symbols_visibility_for_webcore.diff 01_lflags_as-needed.diff QtWebKit-2.2.0.tar.bz2 avoid-rpath.diff bison-26.diff build-with-glib-231.diff fix_infinite_loop_bwo97258.diff New: ---- gstreamer-1.0.diff qtwebkit-2.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -18,7 +18,7 @@ Name: libQtWebKit4 -%define tar_version 2.2.0 +%define tar_version 2.3.0 %define qt_version 4.8.4 Version: %qt_version+%tar_version Release: 0 @@ -26,35 +26,25 @@ License: LGPL-2.1+ and BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://trac.webkit.org/wiki/QtWebKit -Source0: QtWebKit-%{tar_version}.tar.bz2 +Source0: qtwebkit-%{tar_version}.tar.gz Source1: qwebview-%qt_version.tar.bz2 Source99: baselibs.conf - # PATCH-FIX-OPENSUSE webkit-qtwebkit-2.2-tp1-pluginpath.patch asterios.dra...@gmail.com -- Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too (taken from Fedora) Patch0: webkit-qtwebkit-2.2-tp1-pluginpath.patch -# PATCH-FIX-OPENSUSE 0001_fix_symbols_visibility_for_webcore.diff asterios.dra...@gmail.com -- Corrects symbols visibility for WebCore (taken from Ubuntu) -Patch4: 0001_fix_symbols_visibility_for_webcore.diff -# PATCH-FIX-OPENSUSE 01_lflags_as-needed.diff asterios.dra...@gmail.com -- Set --as-needed linker flag to avoid useless linking (taken from Ubuntu) -Patch5: 01_lflags_as-needed.diff # PATCH-FIX-OPENSUSE 02_add_nostrip_for_debug_packages.diff asterios.dra...@gmail.com -- Set CONFIG += nostrip to avoid stripping (taken from Ubuntu) -Patch6: 02_add_nostrip_for_debug_packages.diff +Patch1: 02_add_nostrip_for_debug_packages.diff # PATCH-FIX-OPENSUSE 03_hide_std_symbols.diff asterios.dra...@gmail.com -- Do not make the std:: symbols in webkit public (taken from Ubuntu) -Patch7: 03_hide_std_symbols.diff -Patch8: 04_enable_debug_information.diff +Patch2: 03_hide_std_symbols.diff +Patch3: 04_enable_debug_information.diff # PATCH-FIX-OPENSUSE defines_qt_webkit.diff asterios.dra...@gmail.com -- Defines QT_WEBKIT to display correctly documentation in Qt Creator Help plugin (taken from Ubuntu) -Patch9: defines_qt_webkit.diff -Patch10: do-not-force-optimization-level.diff -Patch11: reduce-link-optimization.diff -Patch12: build-with-glib-231.diff -Patch13: avoid-rpath.diff -Patch14: qwebview-buildfixes.diff -# PATCH-FIX-OPENSUSE libQtWebKit4-gcc47.patch dims...@opensuse.org -- Do not use -WError... Patch taken from Fedora -Patch15: libQtWebKit4-gcc47.patch -Patch16: bison-26.diff -# PATCH-FIX-UPSTREAM fix_infinite_loop_bwo97258.diff -- taken from http://trac.webkit.org/changeset/131663 - see https://projects.kde.org/news/177 - fixes https://bugs.webkit.org/show_bug.cgi?id=97258 -Patch17: fix_infinite_loop_bwo97258.diff +Patch4: defines_qt_webkit.diff +Patch5: do-not-force-optimization-level.diff +Patch6: reduce-link-optimization.diff +Patch7: libQtWebKit4-gcc47.patch +Patch8: qwebview-buildfixes.diff +# PATCH-FEATURE-UPSTREAM +Patch9: gstreamer-1.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -65,10 +55,12 @@ BuildRequires: pcre-devel BuildRequires: perl BuildRequires: python-devel +BuildRequires: ruby %if 0%{?suse_version} > 1140 BuildRequires: perl-Switch %endif %if 0%{?suse_version} > 1120 +%if 0%{?suse_version} < 1230 BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-app-0.10) BuildRequires: pkgconfig(gstreamer-base-0.10) @@ -76,6 +68,14 @@ BuildRequires: pkgconfig(gstreamer-pbutils-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gstreamer-video-0.10) +%else +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-app-1.0) +BuildRequires: pkgconfig(gstreamer-base-1.0) +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-video-1.0) +%endif %endif BuildRequires: sqlite-devel %requires_ge libqt4-x11 @@ -97,22 +97,19 @@ This package contains development files for qtwebkit. %prep -%setup -q -n QtWebKit-%{tar_version} -a 1 -%patch0 -p1 -b .pluginpath +%setup -q -n webkit-qtwebkit-23 -a 1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 +%patch8 +%if 0%{?suse_version} >= 1230 %patch9 -p1 -%patch10 -%patch11 -p1 -%patch12 -%patch13 -%patch14 -%patch15 -p1 -%patch16 -%patch17 -p1 +%endif %build export QTDIR=%{_prefix} @@ -122,15 +119,15 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}" %endif -Tools/Scripts/build-webkit \ + Tools/Scripts/build-webkit --qt \ + --makeargs="%{?_smp_mflags}" \ + --prefix=/usr \ + --no-webkit2 \ --release \ - --qt \ -%ifarch %arm - --no-svg \ - --no-mathml \ +%ifarch %ix86 + --no-force-sse2 \ %endif - --makeargs="%{?_smp_mflags}" \ - --qmakearg="CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS}\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS}\" DEFINES+=USE_GSTREAMER=1" + --qmakearg="CONFIG+=production_build CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS}\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS}\" DEFINES+=USE_GSTREAMER=1" pushd tools/designer/src/plugins/qwebview/ qmake @@ -138,7 +135,7 @@ popd %install -make install INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release +make INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release install make install INSTALL_ROOT=%{buildroot} -C tools/designer/src/plugins/qwebview # find %{buildroot}%{_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \; @@ -168,6 +165,6 @@ %{_libdir}/libQtWebKit.prl %{_libdir}/libQtWebKit.so %dir %{_datadir}/qt4/mkspecs/modules -%{_datadir}/qt4/mkspecs/modules/qt_webkit_version.pri +%{_datadir}/qt4/mkspecs/modules/qt_webkit.pri %changelog ++++++ 02_add_nostrip_for_debug_packages.diff ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,19 +1,11 @@ -Description: set CONFIG += nostrip to avoid stripping and - let dh_strip do it to generate debug packages. -Author: Fathi Boudra <f...@debian.org> - ---- - WebKit.pri | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/Source/WebKit.pri -+++ b/Source/WebKit.pri -@@ -10,6 +10,8 @@ CONFIG += production - CONFIG += depend_includepath - DEPENDPATH += $$OUT_PWD +--- old.webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-02-15 16:46:12.000000000 +0100 ++++ webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-02-22 02:52:41.942043521 +0100 +@@ -16,6 +16,8 @@ INCLUDEPATH += \ + INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/WTF/wtf/qt/compat + } +CONFIG += nostrip + - DEFINES += BUILDING_QT__=1 - building-libs { - win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 + contains(DEFINES, ENABLE_VIDEO=1):contains(DEFINES, WTF_USE_QTKIT=1) { + LIBS += -framework Security -framework IOKit + ++++++ 03_hide_std_symbols.diff ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,27 +1,28 @@ -Description: do not make the std:: symbols in webkit public. - based on Mike Hommey work in the webkit package. -Author: Sune Vuorela <s...@debian.org> +From: Modestas Vainius <mo...@debian.org> +SUbject: Make hide_symbols to cover all QtWebKit portions +Origin: vendor +Author: Timo Jyrinki <t...@debian.org> +Last-Update: 2013-01-28 (use a similar patch on Qt 5) +Forwarded: no ---- - WebKit.pri | 1 + - symbols.filter | 5 +++++ - 2 files changed, 6 insertions(+) +Almost everything in Source/WebCore/generated was not build with +-fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol +list in libQtWebKit.so. ---- a/Source/WebKit.pri -+++ b/Source/WebKit.pri -@@ -71,6 +71,7 @@ CONFIG -= warn_on - *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self +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 - *-g++*:QMAKE_LFLAGS += -Wl,--as-needed -+*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter ++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 - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { ---- /dev/null -+++ b/Source/symbols.filter -@@ -0,0 +1,5 @@ -+{ -+local: -+_ZSt*; -+_ZNSt*; -+}; ++++++ 04_enable_debug_information.diff ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,31 +1,80 @@ -Description: on Qt >= 4.5, debug info are disabled for QtWebkit. - enable debug information in JavaScriptCore and WebCore. -author: Fathi Boudra <f...@debian.org> - ---- - JavaScriptCore/JavaScriptCore.pro | 2 -- - WebCore/WebCore.pro | 2 -- - 2 files changed, 4 deletions(-) - ---- a/Source/WebCore/WebCore.pri -+++ b/Source/WebCore/WebCore.pri -@@ -3160,8 +3160,6 @@ HEADERS += $$WEBKIT_API_HEADERS - - !CONFIG(webkit-debug):CONFIG(QTDIR_build) { - # Remove the following 2 lines if you want debug information in WebCore -- CONFIG -= separate_debug_info -- CONFIG += no_debug_info - } - - contains (CONFIG, text_breaking_with_icu) { ---- a/Source/JavaScriptCore/JavaScriptCore.pro -+++ b/Source/JavaScriptCore/JavaScriptCore.pro -@@ -38,8 +38,6 @@ unix:contains(QT_CONFIG, reduce_relocati - - CONFIG(QTDIR_build) { - # Remove the following 2 lines if you want debug information in JavaScriptCore -- CONFIG -= separate_debug_info -- CONFIG += no_debug_info - } +diff -up webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri +--- webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-21 22:28:57.786764106 -0600 +@@ -7,6 +7,12 @@ - *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR} + + INCLUDEPATH += \ +diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo webkit-qtwebkit-23/Source/WebCore/WebCore.pri +--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo 2013-02-21 22:28:57.791764043 -0600 ++++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 22:31:02.994198797 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore + ++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1") ++ QMAKE_CXXFLAGS_RELEASE -= -g ++ QMAKE_CXXFLAGS_RELEASE += -g1 ++} ++ + QT *= network + haveQt(5): QT *= core-private gui-private + +diff -up webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri.debuginfo webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri +--- webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600 ++++ webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri 2013-02-21 22:28:57.786764106 -0600 +@@ -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, x86_64) { ++# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR \ + $$SOURCE_DIR/Platform \ +diff -up webkit-qtwebkit-23/Source/WebKit/WebKit1.pri.debuginfo webkit-qtwebkit-23/Source/WebKit/WebKit1.pri +--- webkit-qtwebkit-23/Source/WebKit/WebKit1.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600 ++++ webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-02-21 22:28:57.787764093 -0600 +@@ -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, x86_64) { ++# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR/qt/Api \ + $$SOURCE_DIR/qt/WebCoreSupport \ +diff -up webkit-qtwebkit-23/Source/WTF/WTF.pri.debuginfo webkit-qtwebkit-23/Source/WTF/WTF.pri +--- webkit-qtwebkit-23/Source/WTF/WTF.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600 ++++ webkit-qtwebkit-23/Source/WTF/WTF.pri 2013-02-21 22:28:57.787764093 -0600 +@@ -8,6 +8,12 @@ + # All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>). + INCLUDEPATH += $$PWD + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WTF workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + haveQt(5) { + mac { + # Mac OS does ship libicu but not the associated header files. ++++++ defines_qt_webkit.diff ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,14 +1,7 @@ -Description: defines QT_WEBKIT to display correctly documentation in Qt Creator Help plugin. -Author: Fathi Boudra <f...@debian.org> -Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619443 -Bug: http://bugreports.qt.nokia.com/browse/QTBUG-13608 ---- - WebKit/qt/qt_webkit_version.pri | 1 + - 1 file changed, 1 insertion(+) - ---- a/Source/WebKit/qt/qt_webkit_version.pri -+++ b/Source/WebKit/qt/qt_webkit_version.pri -@@ -3,6 +3,7 @@ QT_WEBKIT_MAJOR_VERSION = 4 +diff -urNB orig.webkit-qtwebkit-23/Tools/qmake/qt_webkit.pri webkit-qtwebkit-23/Tools/qmake/qt_webkit.pri +--- orig.webkit-qtwebkit-23/Tools/qmake/qt_webkit.pri 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/Tools/qmake/qt_webkit.pri 2013-03-16 14:05:25.474814889 +0100 +@@ -16,6 +16,7 @@ !contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) { QT_CONFIG += webkit ++++++ do-not-force-optimization-level.diff ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,6 +1,7 @@ ---- configure.ac.orig 2011-12-05 22:57:09.451158463 +0100 -+++ configure.ac 2011-12-05 22:57:37.125587346 +0100 -@@ -942,15 +942,6 @@ +diff -urNB orig.webkit-qtwebkit-23/configure.ac webkit-qtwebkit-23/configure.ac +--- orig.webkit-qtwebkit-23/configure.ac 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/configure.ac 2013-03-16 13:32:51.310245308 +0100 +@@ -956,14 +956,6 @@ AC_DEFINE([NDEBUG], [1], [Define to disable debugging features]) fi @@ -12,33 +13,15 @@ - CXXFLAGS="$CXXFLAGS -O0" - CFLAGS="$CFLAGS -O0" -fi -- + PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) - AC_SUBST([LIBSOUP_CFLAGS]) ---- Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py.orig 2011-12-06 07:19:10.508957427 +0100 -+++ Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py 2011-12-06 07:19:19.155091506 +0100 -@@ -28,7 +28,6 @@ - - try: - PushEnv() -- os.environ['CXXFLAGS'] = '-O0' - test.run_gyp('cxxflags.gyp') - finally: - # We clear the environ after calling gyp. When the auto-regeneration happens, -@@ -47,7 +46,6 @@ +diff -urNB orig.webkit-qtwebkit-23/Source/JavaScriptCore/Target.pri webkit-qtwebkit-23/Source/JavaScriptCore/Target.pri +--- orig.webkit-qtwebkit-23/Source/JavaScriptCore/Target.pri 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/Target.pri 2013-03-16 13:35:24.812326268 +0100 +@@ -15,9 +15,6 @@ - try: - PushEnv() -- os.environ['CXXFLAGS'] = '-O2' - test.run_gyp('cxxflags.gyp') - finally: - # We clear the environ after calling gyp. When the auto-regeneration happens, ---- Source/JavaScriptCore/JavaScriptCore.pro.orig 2011-12-06 07:21:30.056120087 +0100 -+++ Source/JavaScriptCore/JavaScriptCore.pro 2011-12-06 07:21:38.125245164 +0100 -@@ -26,9 +26,6 @@ - # Remove the following 2 lines if you want debug information in JavaScriptCore - } + CONFIG += staticlib -*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 -*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3 @@ -46,40 +29,35 @@ # Rules when JIT enabled (not disabled) !contains(DEFINES, ENABLE_JIT=0) { linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { ---- Source/ThirdParty/gyp/test/cflags/gyptest-cflags.py.orig 2011-12-06 07:42:38.432776694 +0100 -+++ Source/ThirdParty/gyp/test/cflags/gyptest-cflags.py 2011-12-06 07:42:47.822922219 +0100 +diff -urNB orig.webkit-qtwebkit-23/Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py webkit-qtwebkit-23/Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py +--- orig.webkit-qtwebkit-23/Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py 2013-03-16 13:33:42.064610791 +0100 @@ -28,7 +28,6 @@ try: PushEnv() -- os.environ['CFLAGS'] = '-O0' - test.run_gyp('cflags.gyp') - finally: - # We clear the environ after calling gyp. When the auto-regeneration happens, -@@ -47,7 +47,7 @@ - - try: - PushEnv() -- os.environ['CFLAGS'] = '-O2' -+ os.environ['CFLAGS'] = '-O1' - test.run_gyp('cflags.gyp') +- os.environ['CXXFLAGS'] = '-O0' + test.run_gyp('cxxflags.gyp') finally: # We clear the environ after calling gyp. When the auto-regeneration happens, ---- Source/WebKit.pri -+++ Source/WebKit.pri -@@ -1,5 +1,9 @@ - # Include file to make it easy to include WebKit into Qt projects +diff -urNB orig.webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_pre.prf webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_pre.prf +--- orig.webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_pre.prf 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_pre.prf 2013-03-16 13:46:22.283106752 +0100 +@@ -12,6 +12,10 @@ + SBOX_CHECK = $$(_SBOX_DIR) + !isEmpty(SBOX_CHECK): CONFIG += scratchbox +QMAKE_CFLAGS_RELEASE = "" +QMAKE_CXXFLAGS_RELEASE = "" +QMAKE_LFLAGS_RELEASE = "" + + # If Qt is configured with embedded or QPA we set a convenience config + # flag that can be used to test for either of these situations. contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded - - # Detect that we are building as a standalone package by the presence of ---- Tools/Tools.pro.orig 2011-12-06 08:25:34.777703423 +0100 -+++ Tools/Tools.pro 2011-12-06 08:26:19.511396680 +0100 -@@ -2,6 +2,10 @@ +diff -urNB orig.webkit-qtwebkit-23/Tools/Tools.pro webkit-qtwebkit-23/Tools/Tools.pro +--- orig.webkit-qtwebkit-23/Tools/Tools.pro 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/Tools/Tools.pro 2013-03-16 13:47:01.811612578 +0100 +@@ -7,6 +7,10 @@ TEMPLATE = subdirs CONFIG += ordered @@ -87,6 +65,6 @@ +QMAKE_CXXFLAGS_RELEASE = "" +QMAKE_LFLAGS_RELEASE = "" + - include($$PWD/../Source/common.pri) - include($$PWD/../Source/WebCore/features.pri) - + !no_webkit1 { + SUBDIRS += QtTestBrowser/QtTestBrowser.pro + contains(DEFINES, HAVE_QTTESTLIB=1): SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro ++++++ gstreamer-1.0.diff ++++++ diff -urNB webkit-qtwebkit-23/Source/WebCore/WebCore.pri new/Source/WebCore/WebCore.pri --- webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-15 16:46:12.000000000 +0100 +++ new/Source/WebCore/WebCore.pri 2013-02-21 15:46:00.298855975 +0100 @@ -184,8 +184,10 @@ contains(DEFINES, WTF_USE_GSTREAMER=1) { DEFINES += ENABLE_GLIB_SUPPORT=1 - PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10 -} + DEFINES += GST_API_VERSION=1.0 + DEFINES += GST_API_VERSION_1 + PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 + } contains(DEFINES, ENABLE_VIDEO=1) { contains(DEFINES, WTF_USE_QTKIT=1) { @@ -220,7 +222,7 @@ contains(DEFINES, WTF_USE_GSTREAMER=1) { DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1 INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer - PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10 + PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0 } } diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h --- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-15 16:46:12.000000000 +0100 +++ new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-21 15:46:00.298855975 +0100 @@ -157,7 +157,7 @@ virtual void needTouchEvents(bool) { } #endif -#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT)) +#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT)) virtual bool supportsFullscreenForNode(const Node*); virtual void enterFullscreenForNode(Node*); virtual void exitFullscreenForNode(Node*); diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h --- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-15 16:46:12.000000000 +0100 +++ new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-21 15:52:57.400847675 +0100 @@ -106,10 +106,10 @@ private: ChromeClientQt* m_chromeClient; HTMLVideoElement* m_videoElement; -#if USE(QT_MULTIMEDIA) +#if USE(QT_MULTIMEDIA) && !defined(GST_API_VERSION_1) QWebFullScreenVideoHandler* m_FullScreenVideoHandler; #endif -#if USE(GSTREAMER) +#if USE(GSTREAMER) && !defined(GST_API_VERSION_1) GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer; #endif #if USE(QTKIT) diff -urNB webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf new/Tools/qmake/mkspecs/features/features.prf --- webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf 2013-02-15 16:46:12.000000000 +0100 +++ new/Tools/qmake/mkspecs/features/features.prf 2013-02-21 15:46:00.297855972 +0100 @@ -186,7 +186,7 @@ DEFINES += WTF_USE_QTKIT=1 } } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) { - !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): { + !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { DEFINES += ENABLE_VIDEO=1 DEFINES += WTF_USE_GSTREAMER=1 } else { ++++++ libQtWebKit4-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,25 +1,23 @@ -diff -up webkit-qtwebkit/Source/WebKit.pri.Werror webkit-qtwebkit/Source/WebKit.pri ---- webkit-qtwebkit/Source/WebKit.pri.Werror 2011-05-12 09:42:28.000000000 -0500 -+++ webkit-qtwebkit/Source/WebKit.pri 2011-05-13 12:42:09.956080365 -0500 -@@ -92,7 +92,7 @@ CONFIG -= warn_on - - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { -- isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -+ #isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror - +diff -urNB orig.webkit-qtwebkit-23/configure.ac webkit-qtwebkit-23/configure.ac +--- orig.webkit-qtwebkit-23/configure.ac 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/configure.ac 2013-03-16 18:37:28.146753408 +0100 +@@ -178,7 +178,6 @@ + # cleanly with that. + AC_LANG_PUSH(C++) + TMPCXXFLAGS=$CXXFLAGS +-CXXFLAGS="-Wall -Werror" + AC_MSG_CHECKING([if we have to disable C++0x compat warnings for GCC >= 4.6.0]) + AC_TRY_COMPILE([ + namespace std { +diff -urNB orig.webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_post.prf webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_post.prf +--- orig.webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-03-16 18:36:20.726596276 +0100 ++++ webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-03-16 18:37:58.117378724 +0100 +@@ -21,7 +21,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 + } greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { - -diff -up webkit-qtwebkit/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.me webkit-qtwebkit/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp ---- webkit-qtwebkit/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.me 2012-01-24 15:26:33.000000000 +0100 -+++ webkit-qtwebkit/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-01-24 15:27:01.000000000 +0100 -@@ -28,6 +28,7 @@ - #include "PluginObject.h" - #include <assert.h> - #include <string.h> -+#include <unistd.h> - - using namespace std; - extern NPNetscapeFuncs *browser; - + !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) { ++++++ reduce-link-optimization.diff ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,15 +1,13 @@ -diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri -index 82311d2..01a878d 100644 ---- a/Source/WebCore/WebCore.pri -+++ b/Source/WebCore/WebCore.pri -@@ -326,8 +326,8 @@ mac { +Index: webkit-qtwebkit-23/Source/WebCore/WebCore.pri +=================================================================== +--- webkit-qtwebkit-23.orig/Source/WebCore/WebCore.pri 2013-02-18 14:25:04.705311898 +0000 ++++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-18 14:25:04.701311898 +0000 +@@ -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 - unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections --unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections --linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -+#unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -+linux*-g++*:QMAKE_LFLAGS = -Wl,--reduce-memory-overheads -Wl,--no-keep-memory - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork - unix:!mac:!symbian:CONFIG += link_pkgconfig ++++++ webkit-qtwebkit-2.2-tp1-pluginpath.patch ++++++ --- /var/tmp/diff_new_pack.QGJcnJ/_old 2013-03-22 11:51:25.000000000 +0100 +++ /var/tmp/diff_new_pack.QGJcnJ/_new 2013-03-22 11:51:25.000000000 +0100 @@ -1,7 +1,7 @@ -diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp ---- webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-05-12 10:06:43.000000000 +0200 -+++ webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 2011-05-12 10:08:08.000000000 +0200 -@@ -380,6 +380,7 @@ Vector<String> PluginDatabase::defaultPl +diff -urNB orig.webkit-qtwebkit-23/Source/WebCore/plugins/PluginDatabase.cpp webkit-qtwebkit-23/Source/WebCore/plugins/PluginDatabase.cpp +--- orig.webkit-qtwebkit-23/Source/WebCore/plugins/PluginDatabase.cpp 2013-03-14 14:24:37.000000000 +0100 ++++ webkit-qtwebkit-23/Source/WebCore/plugins/PluginDatabase.cpp 2013-03-16 13:29:10.274008641 +0100 +@@ -384,6 +384,7 @@ paths.append("/usr/lib/firefox/plugins"); paths.append("/usr/lib64/browser-plugins"); paths.append("/usr/lib/browser-plugins"); @@ -9,7 +9,7 @@ paths.append("/usr/lib/mozilla/plugins"); paths.append("/usr/local/netscape/plugins"); paths.append("/opt/mozilla/plugins"); -@@ -389,6 +390,7 @@ Vector<String> PluginDatabase::defaultPl +@@ -393,6 +394,7 @@ paths.append("/usr/lib/netscape/plugins"); paths.append("/usr/lib/netscape/plugins-libc5"); paths.append("/usr/lib/netscape/plugins-libc6"); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
