Hello community,
here is the log from the commit of package libQtWebKit4.1967 for openSUSE:12.3:Update checked in at 2013-09-03 13:26:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/libQtWebKit4.1967 (Old)
and /work/SRC/openSUSE:12.3:Update/.libQtWebKit4.1967.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libQtWebKit4.1967"
Changes:
--------
New Changes file:
--- /dev/null 2013-07-23 23:44:04.804033756 +0200
+++ /work/SRC/openSUSE:12.3:Update/.libQtWebKit4.1967.new/libQtWebKit4.changes 2013-09-03 13:26:47.000000000 +0200
@@ -0,0 +1,199 @@
+-------------------------------------------------------------------
+Wed Feb 6 16:02:59 UTC 2013 - cornelis@solcon.nl
+
+- Removed webkit-qtwebkit-2.2tp1-qt46.patch to solve bnc#776525
+
+-------------------------------------------------------------------
+Wed Dec 19 16:56:33 UTC 2012 - nico.kruber@gmail.com
+
+- added patch to fix infinite loop with certain svg files
+ see https://bugs.webkit.org/show_bug.cgi?id=97258
+
+-------------------------------------------------------------------
+Wed Dec 5 11:58:30 UTC 2012 - stephan.binner@basyskom.com
+
+- Sync with Qt 4.8.4
+
+-------------------------------------------------------------------
+Mon Nov 19 22:01:33 UTC 2012 - cgiboudeaux@gmx.com
+
+- Rediff reduce-link-optimization.diff. Needed by SLES
+
+-------------------------------------------------------------------
+Mon Nov 5 18:30:36 UTC 2012 - dmueller@suse.com
+
+- fix build against bison 2.6
+
+-------------------------------------------------------------------
+Wed Sep 19 02:24:00 UTC 2012 - dmueller@suse.com
+
+- Sync with Qt 4.8.3
+
+-------------------------------------------------------------------
+Mon Aug 13 16:32:27 UTC 2012 - dmueller@suse.com
+
+- reduce memory usage for arm
+
+-------------------------------------------------------------------
+Thu Jun 7 16:58:17 UTC 2012 - dmueller@suse.com
+
+- Sync with Qt 4.8.2
+
+-------------------------------------------------------------------
+Sat Apr 14 14:54:28 UTC 2012 - dimstar@opensuse.org
+
+- Add libQtWebKit4-gcc47.patch: Fix build with gcc 4.7. Patch taken
+ from Fedora.
+
+-------------------------------------------------------------------
+Thu Apr 5 09:40:35 UTC 2012 - dmueller@suse.com
+
+- add back designer plugin (bnc#743937)
+
+-------------------------------------------------------------------
+Fri Mar 30 10:17:43 UTC 2012 - idonmez@suse.com
+
+- Sync with Qt 4.8.1
+
+-------------------------------------------------------------------
+Thu Feb 9 12:53:36 CET 2012 - dmueller@suse.de
+
+- install qt_webkit_version.pri (bnc#746117)
+
+-------------------------------------------------------------------
+Fri Jan 20 15:34:57 CET 2012 - dmueller@suse.de
+
+- fix build
+
+-------------------------------------------------------------------
+Mon Jan 2 22:49:39 CET 2012 - dmueller@suse.de
+
+- fix license tags
+- fix build with glib >= 2.31
+
+-------------------------------------------------------------------
+Fri Dec 16 16:00:39 UTC 2011 - idonmez@suse.com
+
+- Sync version with libqt4
+
+-------------------------------------------------------------------
+Wed Dec 14 14:03:42 UTC 2011 - adrian@suse.de
+
+- add patch to reduce memory usage during linking (ARM only)
+
+-------------------------------------------------------------------
+Mon Dec 5 21:59:30 UTC 2011 - adrian@suse.de
+
+- do not force fixed optimization level
+
+-------------------------------------------------------------------
+Mon Dec 5 00:34:29 UTC 2011 - agraf@suse.com
+
+- compile with -O1 on armv7 because of compiler bug
+
+-------------------------------------------------------------------
+Wed Nov 23 11:57:38 UTC 2011 - cgiboudeaux@gmx.com
+
+- Bump version to match the libqt4 one. Fixes the libqt4-devel-doc build
+
+-------------------------------------------------------------------
+Fri Oct 7 08:15:22 UTC 2011 - coolo@suse.com
+
+- remove self provides
+
+-------------------------------------------------------------------
+Thu Sep 29 16:08:41 UTC 2011 - tittiatcoke@gmail.com
+
+- Update to version 2.2.0
+ See for more information:
+ http://trac.webkit.org/wiki/QtWebKitRelease22
+
+-------------------------------------------------------------------
+Mon Sep 19 20:17:00 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.2.0-rc1 (2.1.90).
+- Removed kubuntu_fix_jit_warnings_i386.diff patch (fixed upstream).
+
+-------------------------------------------------------------------
+Mon Sep 12 17:47:08 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.1.80.week35.
+- Spec file updates:
+ * Changed License: to LGPL-2.0 with exceptions or GPL-3.0 with exceptions.
+ * Use "--release" istead of "--debug" for compilation.
+ * Minor other updates.
+- Removed the following patches:
+ webkit-qtwebkit-type-casting.patch
+ webkit-qtwebkit-2.2-javascriptcore_debuginfo.patch
+ webkit-qtwebkit-2.2-shared.patch
+- Added the following patches (from Fedora and Ubuntu):
+ webkit-qtwebkit-2.2-debuginfo.patch (disabled for now)
+ 0001_fix_symbols_visibility_for_webcore.diff
+ 01_lflags_as-needed.diff
+ 02_add_nostrip_for_debug_packages.diff
+ 03_hide_std_symbols.diff
+ 04_enable_debug_information.diff
+ defines_qt_webkit.diff
+ kubuntu_fix_jit_warnings_i386.diff
+- Disabled (for now) the following patch:
+ webkit-qtwebkit-2.2-no_Werror.patch
+
+-------------------------------------------------------------------
+Sun Sep 4 11:28:09 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.1.80.week34.
+
+-------------------------------------------------------------------
+Wed Aug 24 18:27:26 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.1.80.week33.
+
+-------------------------------------------------------------------
+Tue Aug 9 13:08:31 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.1.80.week31.
+
+-------------------------------------------------------------------
+Sat Aug 6 13:48:52 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.1.80.week30.
+
+-------------------------------------------------------------------
+Mon Jul 25 19:55:42 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.1.80.week28.
+- Spec file updates:
+ * Compile the package with gstreamer support.
+
+-------------------------------------------------------------------
+Fri Jul 1 19:01:44 UTC 2011 - asterios.dramis@gmail.com
+
+- Rebased webkit-qtwebkit-type-casting.patch to apply cleanly.
+
+-------------------------------------------------------------------
+Thu Jun 30 18:52:49 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.2-beta1 (2.1.80).
+
+-------------------------------------------------------------------
+Wed Jun 29 20:29:11 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+ * Added qt-mobility-devel in BuildRequires: (for audio/video tags support).
+
+-------------------------------------------------------------------
+Wed Jun 22 18:24:26 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+ * Don't install qt_webkit_version.pri (conflicts with libqt4-devel).
+
+-------------------------------------------------------------------
+Sun Jun 19 20:59:57 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+ * perl-Switch in BuildRequires: is needed only for openSUSE > 11.4.
+
+-------------------------------------------------------------------
+Sun Jun 19 20:26:11 UTC 2011 - asterios.dramis@gmail.com
++++ 2 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.3:Update/.libQtWebKit4.1967.new/libQtWebKit4.changes
New:
----
0001_fix_symbols_visibility_for_webcore.diff
01_lflags_as-needed.diff
02_add_nostrip_for_debug_packages.diff
03_hide_std_symbols.diff
04_enable_debug_information.diff
QtWebKit-2.2.0.tar.bz2
avoid-rpath.diff
baselibs.conf
bison-26.diff
build-with-glib-231.diff
defines_qt_webkit.diff
do-not-force-optimization-level.diff
fix_infinite_loop_bwo97258.diff
libQtWebKit4-gcc47.patch
libQtWebKit4.changes
libQtWebKit4.spec
qwebview-4.8.4.tar.bz2
qwebview-buildfixes.diff
reduce-link-optimization.diff
webkit-qtwebkit-2.2-tp1-pluginpath.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libQtWebKit4.spec ++++++
#
# spec file for package libQtWebKit4
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Asterios Dramis .
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libQtWebKit4
%define tar_version 2.2.0
%define qt_version 4.8.4
Version: %qt_version+%tar_version
Release: 0
Summary: Open source Web Browser engine based on Qt4
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
Source1: qwebview-%qt_version.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE webkit-qtwebkit-2.2-tp1-pluginpath.patch asterios.dramis@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.dramis@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.dramis@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.dramis@gmail.com -- Set CONFIG += nostrip to avoid stripping (taken from Ubuntu)
Patch6: 02_add_nostrip_for_debug_packages.diff
# PATCH-FIX-OPENSUSE 03_hide_std_symbols.diff asterios.dramis@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
# PATCH-FIX-OPENSUSE defines_qt_webkit.diff asterios.dramis@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 dimstar@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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: fontconfig-devel
BuildRequires: gperf
BuildRequires: libicu-devel
BuildRequires: libqt4-devel
BuildRequires: pcre-devel
BuildRequires: perl
BuildRequires: python-devel
%if 0%{?suse_version} > 1140
BuildRequires: perl-Switch
%endif
%if 0%{?suse_version} > 1120
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-app-0.10)
BuildRequires: pkgconfig(gstreamer-base-0.10)
BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
BuildRequires: pkgconfig(gstreamer-pbutils-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(gstreamer-video-0.10)
%endif
BuildRequires: sqlite-devel
%requires_ge libqt4-x11
%description
WebKit is an open source web browser engine. WebKit's HTML and JavaScript code
began as a branch of the KHTML and KJS libraries from KDE. As part of KDE
framework KHTML was based on Qt but during their porting efforts Apple's
engineers made WebKit toolkit independent. QtWebKit is a project aiming at
porting this fabulous engine back to Qt.
%package -n libQtWebKit-devel
Summary: Development files for qtwebkit
Group: Development/Libraries/C and C++
Requires: libQtWebKit4 = %{version}
%requires_ge libqt4-devel
%description -n libQtWebKit-devel
This package contains development files for qtwebkit.
%prep
%setup -q -n QtWebKit-%{tar_version} -a 1
%patch0 -p1 -b .pluginpath
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10
%patch11 -p1
%patch12
%patch13
%patch14
%patch15 -p1
%patch16
%patch17 -p1
%build
export QTDIR=%{_prefix}
%ifarch %arm
# debug uses crazy amount of memory which we don't have
RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}"
%endif
Tools/Scripts/build-webkit \
--release \
--qt \
%ifarch %arm
--no-svg \
--no-mathml \
%endif
--makeargs="%{?_smp_mflags}" \
--qmakearg="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
make
popd
%install
make install INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release
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" {} \;
find %{buildroot}%{_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
find %{buildroot}%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=/usr/bin/moc," -e "s,uic_location=.*,uic_location=/usr/bin/uic," {} \;
%fdupes -s %{buildroot}%{_includedir}
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/qt4/plugins/imports/QtWebKit/
%{_libdir}/libQtWebKit.so.4*
%{_libdir}/qt4/plugins/designer/libqwebview.so
%files -n libQtWebKit-devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_includedir}/QtWebKit/
%{_libdir}/pkgconfig/QtWebKit.pc
%{_libdir}/libQtWebKit.prl
%{_libdir}/libQtWebKit.so
%dir %{_datadir}/qt4/mkspecs/modules
%{_datadir}/qt4/mkspecs/modules/qt_webkit_version.pri
%changelog
++++++ 0001_fix_symbols_visibility_for_webcore.diff ++++++
Description: Corrects symbols visibility for WebCore.
Author: Felix Geyer
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -336,6 +336,9 @@ unix:!mac:!symbian:CONFIG += link_pkgconfig
# Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
+
enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
++++++ 01_lflags_as-needed.diff ++++++
Description: set --as-needed linker flag to avoid useless linking.
Author: Fathi Boudra
---
WebKit.pri | 2 ++
1 file changed, 2 insertions(+)
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -68,6 +68,8 @@ symbian {
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
+*-g++*:QMAKE_LFLAGS += -Wl,--as-needed
+
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
++++++ 02_add_nostrip_for_debug_packages.diff ++++++
Description: set CONFIG += nostrip to avoid stripping and
let dh_strip do it to generate debug packages.
Author: Fathi Boudra
---
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
+CONFIG += nostrip
+
DEFINES += BUILDING_QT__=1
building-libs {
win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
++++++ 03_hide_std_symbols.diff ++++++
Description: do not make the std:: symbols in webkit public.
based on Mike Hommey work in the webkit package.
Author: Sune Vuorela
---
WebKit.pri | 1 +
symbols.filter | 5 +++++
2 files changed, 6 insertions(+)
--- 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
*-g++*:QMAKE_LFLAGS += -Wl,--as-needed
+*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
# 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 ++++++
Description: on Qt >= 4.5, debug info are disabled for QtWebkit.
enable debug information in JavaScriptCore and WebCore.
author: Fathi Boudra
---
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
}
*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
++++++ avoid-rpath.diff ++++++
Binärdateien a/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png and b/QtWebKit-2.2.0/LayoutTests/platform/chromium-win/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop-expected.png sind verschieden.
--- Source/WebKit/qt/declarative/declarative.pro
+++ Source/WebKit/qt/declarative/declarative.pro
@@ -41,21 +41,6 @@
QT += declarative
-!CONFIG(standalone_package) {
- linux-* {
- # From Creator's src/rpath.pri:
- # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
- # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
- MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
- QMAKE_RPATHDIR =
- } else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
- }
-}
-
SOURCES += qdeclarativewebview.cpp plugin.cpp
HEADERS += qdeclarativewebview_p.h
--- Source/WebKit2/WebProcess.pro
+++ Source/WebKit2/WebProcess.pro
@@ -20,19 +20,6 @@
QT += network
macx:QT+=xml
-linux-* {
- # From Creator's src/rpath.pri:
- # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
- # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
- QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
- MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined
- QMAKE_RPATHDIR =
-} else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
symbian {
TARGET.UID3 = 0xA000E544
MMP_RULES += pageddata
--- Tools/MiniBrowser/qt/MiniBrowser.pro
+++ Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -33,19 +33,6 @@
QT += network
macx:QT+=xml
-linux-* {
- # From Creator's src/rpath.pri:
- # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
- # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
- QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
- MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
- QMAKE_RPATHDIR =
-} else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
symbian {
TARGET.UID3 = 0xA000E545
MMP_RULES += pageddata
--- Tools/QtTestBrowser/QtTestBrowser.pro
+++ Tools/QtTestBrowser/QtTestBrowser.pro
@@ -39,19 +39,6 @@
PKGCONFIG += fontconfig
}
-linux-* {
- # From Creator's src/rpath.pri:
- # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
- # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
- QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
- MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
- QMAKE_RPATHDIR =
-} else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
symbian {
TARGET.UID3 = 0xA000E543
TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices Location
--- Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -50,18 +50,5 @@
PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h
*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
-linux-* {
- # From Creator's src/rpath.pri:
- # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
- # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
- QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
- MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' -Wl,--no-undefined
- QMAKE_RPATHDIR =
-} else {
- QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-
include(../../../Source/JavaScriptCore/JavaScriptCore.pri)
prependJavaScriptCoreLib(../../JavaScriptCore)
++++++ baselibs.conf ++++++
libQtWebKit4
++++++ bison-26.diff ++++++
--- Source/WebCore/css/CSSGrammar.y
+++ Source/WebCore/css/CSSGrammar.y
@@ -52,14 +52,13 @@
#define YYMAXDEPTH 10000
#define YYDEBUG 0
-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
-#define YYPARSE_PARAM parser
-#define YYLEX_PARAM parser
-
%}
%pure_parser
+%parse-param { CSSParser* parser }
+%lex-param { CSSParser* parser }
+
%union {
bool boolean;
char character;
@@ -87,7 +86,7 @@
%{
-static inline int cssyyerror(const char*)
+static inline int cssyyerror(void*, const char*)
{
return 1;
}
--- Source/WebCore/css/CSSParser.cpp
+++ Source/WebCore/css/CSSParser.cpp
@@ -87,7 +87,7 @@
extern int cssyydebug;
#endif
-extern int cssyyparse(void* parser);
+extern int cssyyparse(WebCore::CSSParser*);
using namespace std;
using namespace WTF;
--- Source/WebCore/xml/XPathGrammar.y
+++ Source/WebCore/xml/XPathGrammar.y
@@ -36,6 +36,7 @@
#include "XPathParser.h"
#include "XPathPath.h"
#include "XPathPredicate.h"
+#include "XPathStep.h"
#include "XPathVariableReference.h"
#include
@@ -46,8 +47,6 @@
#define YYLTYPE_IS_TRIVIAL 1
#define YYDEBUG 0
#define YYMAXDEPTH 10000
-#define YYPARSE_PARAM parserParameter
-#define PARSER static_cast(parserParameter)
using namespace WebCore;
using namespace XPath;
@@ -55,6 +54,7 @@
%}
%pure_parser
+%parse-param { WebCore::XPath::Parser* parser }
%union
{
@@ -73,7 +73,7 @@
%{
static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
-static void xpathyyerror(const char*) { }
+static void xpathyyerror(void*, const char*) { }
%}
@@ -120,7 +120,7 @@
Expr:
OrExpr
{
- PARSER->m_topExpr = $1;
+ parser->m_topExpr = $1;
}
;
@@ -140,7 +140,7 @@
'/'
{
$$ = new LocationPath;
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
'/' RelativeLocationPath
@@ -152,7 +152,7 @@
{
$$ = $2;
$$->insertFirstStep($1);
- PARSER->unregisterParseNode($1);
+ parser->unregisterParseNode($1);
}
;
@@ -161,22 +161,22 @@
{
$$ = new LocationPath;
$$->appendStep($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->registerParseNode($$);
}
|
RelativeLocationPath '/' Step
{
$$->appendStep($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
|
RelativeLocationPath DescendantOrSelf Step
{
$$->appendStep($2);
$$->appendStep($3);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
}
;
@@ -185,58 +185,58 @@
{
if ($2) {
$$ = new Step(Step::ChildAxis, *$1, *$2);
- PARSER->deletePredicateVector($2);
+ parser->deletePredicateVector($2);
} else
$$ = new Step(Step::ChildAxis, *$1);
- PARSER->deleteNodeTest($1);
- PARSER->registerParseNode($$);
+ parser->deleteNodeTest($1);
+ parser->registerParseNode($$);
}
|
NAMETEST OptionalPredicateList
{
String localName;
String namespaceURI;
- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
- PARSER->m_gotNamespaceError = true;
+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
+ parser->m_gotNamespaceError = true;
YYABORT;
}
if ($2) {
$$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
- PARSER->deletePredicateVector($2);
+ parser->deletePredicateVector($2);
} else
$$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
AxisSpecifier NodeTest OptionalPredicateList
{
if ($3) {
$$ = new Step($1, *$2, *$3);
- PARSER->deletePredicateVector($3);
+ parser->deletePredicateVector($3);
} else
$$ = new Step($1, *$2);
- PARSER->deleteNodeTest($2);
- PARSER->registerParseNode($$);
+ parser->deleteNodeTest($2);
+ parser->registerParseNode($$);
}
|
AxisSpecifier NAMETEST OptionalPredicateList
{
String localName;
String namespaceURI;
- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
- PARSER->m_gotNamespaceError = true;
+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
+ parser->m_gotNamespaceError = true;
YYABORT;
}
if ($3) {
$$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
- PARSER->deletePredicateVector($3);
+ parser->deletePredicateVector($3);
} else
$$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
- PARSER->deleteString($2);
- PARSER->registerParseNode($$);
+ parser->deleteString($2);
+ parser->registerParseNode($$);
}
|
AbbreviatedStep
@@ -261,23 +261,23 @@
else if (*$1 == "comment")
$$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
PI '(' ')'
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
PI '(' LITERAL ')'
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
- PARSER->deleteString($1);
- PARSER->deleteString($3);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->deleteString($3);
+ parser->registerNodeTest($$);
}
;
@@ -295,14 +295,14 @@
{
$$ = new Vector;
$$->append(new Predicate($1));
- PARSER->unregisterParseNode($1);
- PARSER->registerPredicateVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerPredicateVector($$);
}
|
PredicateList Predicate
{
$$->append(new Predicate($2));
- PARSER->unregisterParseNode($2);
+ parser->unregisterParseNode($2);
}
;
@@ -317,7 +317,7 @@
SLASHSLASH
{
$$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -325,13 +325,13 @@
'.'
{
$$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
DOTDOT
{
$$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -339,8 +339,8 @@
VARIABLEREFERENCE
{
$$ = new VariableReference(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
'(' Expr ')'
@@ -351,15 +351,15 @@
LITERAL
{
$$ = new StringExpression(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
NUMBER
{
$$ = new Number($1->toDouble());
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
FunctionCall
@@ -371,8 +371,8 @@
$$ = createFunction(*$1);
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
FUNCTIONNAME '(' ArgumentList ')'
@@ -380,9 +380,9 @@
$$ = createFunction(*$1, *$3);
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->deleteExpressionVector($3);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->deleteExpressionVector($3);
+ parser->registerParseNode($$);
}
;
@@ -391,14 +391,14 @@
{
$$ = new Vector;
$$->append($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerExpressionVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerExpressionVector($$);
}
|
ArgumentList ',' Argument
{
$$->append($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
;
@@ -414,9 +414,9 @@
$$ = new Union;
$$->addSubExpression($1);
$$->addSubExpression($3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -432,9 +432,9 @@
{
$3->setAbsolute(true);
$$ = new Path(static_cast($1), $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
FilterExpr DescendantOrSelf RelativeLocationPath
@@ -442,10 +442,10 @@
$3->insertFirstStep($2);
$3->setAbsolute(true);
$$ = new Path(static_cast($1), $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -455,9 +455,9 @@
PrimaryExpr PredicateList
{
$$ = new Filter($1, *$2);
- PARSER->unregisterParseNode($1);
- PARSER->deletePredicateVector($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->deletePredicateVector($2);
+ parser->registerParseNode($$);
}
;
@@ -467,9 +467,9 @@
OrExpr OR AndExpr
{
$$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -479,9 +479,9 @@
AndExpr AND EqualityExpr
{
$$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -491,9 +491,9 @@
EqualityExpr EQOP RelationalExpr
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -503,9 +503,9 @@
RelationalExpr RELOP AdditiveExpr
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -515,17 +515,17 @@
AdditiveExpr PLUS MultiplicativeExpr
{
$$ = new NumericOp(NumericOp::OP_Add, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
AdditiveExpr MINUS MultiplicativeExpr
{
$$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -535,9 +535,9 @@
MultiplicativeExpr MULOP UnaryExpr
{
$$ = new NumericOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -548,8 +548,8 @@
{
$$ = new Negative;
$$->addSubExpression($2);
- PARSER->unregisterParseNode($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($2);
+ parser->registerParseNode($$);
}
;
--- Source/WebCore/xml/XPathParser.cpp
+++ Source/WebCore/xml/XPathParser.cpp
@@ -34,21 +34,18 @@
#include "XPathEvaluator.h"
#include "XPathException.h"
#include "XPathNSResolver.h"
+#include "XPathPath.h"
#include "XPathStep.h"
#include
#include
-int xpathyyparse(void*);
-
+using namespace WebCore;
using namespace WTF;
using namespace Unicode;
+using namespace XPath;
-namespace WebCore {
-namespace XPath {
-
-class LocationPath;
-
-#include "XPathGrammar.h"
+extern int xpathyyparse(WebCore::XPath::Parser*);
+#include "XPathGrammar.h"
Parser* Parser::currentParser = 0;
@@ -632,7 +629,5 @@
delete t;
}
-}
-}
#endif // ENABLE(XPATH)
++++++ build-with-glib-231.diff ++++++
--- configure.ac
+++ configure.ac
@@ -111,6 +111,9 @@
AC_CHECK_HEADERS([pthread.h],
AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
AC_MSG_ERROR([pthread support is required to build WebKit]))
+AC_CHECK_LIB(pthread, pthread_rwlock_init,
+ AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
+ AC_MSG_WARN([pthread rwlock support is not available]))
fi
# check for libjpeg the way Gtk does it.
--- Source/JavaScriptCore/GNUmakefile.list.am
+++ Source/JavaScriptCore/GNUmakefile.list.am
@@ -438,7 +438,6 @@
Source/JavaScriptCore/wtf/gobject/GRefPtr.h \
Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
Source/JavaScriptCore/wtf/HashCountedSet.h \
Source/JavaScriptCore/wtf/HashFunctions.h \
Source/JavaScriptCore/wtf/HashIterators.h \
--- Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
+++ Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
@@ -37,18 +37,6 @@
g_list_free(ptr);
}
-template <> void freeOwnedGPtr<GCond>(GCond* ptr)
-{
- if (ptr)
- g_cond_free(ptr);
-}
-
-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
-{
- if (ptr)
- g_mutex_free(ptr);
-}
-
template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
{
if (ptr)
--- Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
+++ Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
@@ -35,8 +35,6 @@
template <typename T> inline void freeOwnedGPtr(T* ptr);
template<> void freeOwnedGPtr<GError>(GError*);
template<> void freeOwnedGPtr<GList>(GList*);
-template<> void freeOwnedGPtr<GCond>(GCond*);
-template<> void freeOwnedGPtr<GMutex>(GMutex*);
template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
template<> void freeOwnedGPtr<GDir>(GDir*);
--- Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+++ Source/JavaScriptCore/wtf/gobject/GTypedefs.h
@@ -39,7 +39,6 @@
typedef struct _GAsyncResult GAsyncResult;
typedef struct _GCancellable GCancellable;
typedef struct _GCharsetConverter GCharsetConverter;
-typedef struct _GCond GCond;
typedef struct _GDir GDir;
typedef struct _GdkAtom* GdkAtom;
typedef struct _GdkCursor GdkCursor;
@@ -52,7 +51,6 @@
typedef struct _GHashTable GHashTable;
typedef struct _GInputStream GInputStream;
typedef struct _GList GList;
-typedef struct _GMutex GMutex;
typedef struct _GPatternSpec GPatternSpec;
typedef struct _GPollableOutputStream GPollableOutputStream;
typedef struct _GSocketClient GSocketClient;
--- Source/JavaScriptCore/wtf/ThreadingPrimitives.h
+++ Source/JavaScriptCore/wtf/ThreadingPrimitives.h
@@ -44,8 +44,6 @@
#if USE(PTHREADS)
#include
-#elif PLATFORM(GTK)
-#include "GOwnPtr.h"
#endif
#if PLATFORM(QT)
@@ -66,10 +64,6 @@
typedef void* PlatformReadWriteLock;
#endif
typedef pthread_cond_t PlatformCondition;
-#elif PLATFORM(GTK)
-typedef GOwnPtr<GMutex> PlatformMutex;
-typedef void* PlatformReadWriteLock; // FIXME: Implement.
-typedef GOwnPtr<GCond> PlatformCondition;
#elif PLATFORM(QT)
typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
typedef void* PlatformReadWriteLock; // FIXME: Implement.
--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
@@ -34,4 +34,5 @@
#include
#include
+#include
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink",
@@ -106,6 +107,13 @@
sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
+#if GLIB_CHECK_VERSION(2, 31, 0)
+ priv->data_cond = WTF::fastNew<GCond>();
+ g_cond_init(priv->data_cond);
+ priv->buffer_mutex = WTF::fastNew<GMutex>();
+ g_mutex_init(priv->buffer_mutex);
+#else
priv->data_cond = g_cond_new();
priv->buffer_mutex = g_mutex_new();
+#endif
}
@@ -243,10 +251,20 @@
if (priv->data_cond) {
+#if GLIB_CHECK_VERSION(2, 31, 0)
+ g_cond_clear(priv->data_cond);
+ WTF::fastDelete(priv->data_cond);
+#else
g_cond_free(priv->data_cond);
+#endif
priv->data_cond = 0;
}
if (priv->buffer_mutex) {
+#if GLIB_CHECK_VERSION(2, 31, 0)
+ g_mutex_clear(priv->buffer_mutex);
+ WTF::fastDelete(priv->buffer_mutex);
+#else
g_mutex_free(priv->buffer_mutex);
+#endif
priv->buffer_mutex = 0;
}
++++++ defines_qt_webkit.diff ++++++
Description: defines QT_WEBKIT to display correctly documentation in Qt Creator Help plugin.
Author: Fathi Boudra
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
!contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {
QT_CONFIG += webkit
+ DEFINES += QT_WEBKIT
} else {
warning("Attempted to include $$QT.webkit.name in the build, but it was not enabled in configure.")
}
++++++ do-not-force-optimization-level.diff ++++++
--- 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 @@
AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
fi
-# Add the appropriate 'O' level for optimized builds
-if test "$enable_optimizations" = "yes"; then
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
-else
- 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 @@
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
}
-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
-
# 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
@@ -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')
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
+QMAKE_CFLAGS_RELEASE = ""
+QMAKE_CXXFLAGS_RELEASE = ""
+QMAKE_LFLAGS_RELEASE = ""
+
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 @@
TEMPLATE = subdirs
CONFIG += ordered
+QMAKE_CFLAGS_RELEASE = ""
+QMAKE_CXXFLAGS_RELEASE = ""
+QMAKE_LFLAGS_RELEASE = ""
+
include($$PWD/../Source/common.pri)
include($$PWD/../Source/WebCore/features.pri)
++++++ fix_infinite_loop_bwo97258.diff ++++++
diff -U 3 -H -d -r -N -x '.svn/*' -- QtWebKit-2.2.0/LayoutTests/ChangeLog QtWebKit-2.2.0.bwo97258/LayoutTests/ChangeLog
--- QtWebKit-2.2.0/LayoutTests/ChangeLog 2011-09-13 22:23:44.000000000 +0200
+++ QtWebKit-2.2.0.bwo97258/LayoutTests/ChangeLog 2012-12-19 16:55:50.320166004 +0100
@@ -1,3 +1,13 @@
+2012-10-17 Allan Sandfeld Jensen
+
+ [Qt] Certain SVG content freezes QtWebKit
+ https://bugs.webkit.org/show_bug.cgi?id=97258
+
+ Reviewed by Simon Hausmann.
+
+ * svg/stroke/zero-width-hang-expected.txt: Added.
+ * svg/stroke/zero-width-hang.html: Added.
+
2011-09-08 Jarred Nicholls
frame-loading-via-document-write.html test cases have extra slash in path
diff -U 3 -H -d -r -N -x '.svn/*' -- QtWebKit-2.2.0/LayoutTests/svg/stroke/zero-width-hang-expected.txt QtWebKit-2.2.0.bwo97258/LayoutTests/svg/stroke/zero-width-hang-expected.txt
--- QtWebKit-2.2.0/LayoutTests/svg/stroke/zero-width-hang-expected.txt 1970-01-01 01:00:00.000000000 +0100
+++ QtWebKit-2.2.0.bwo97258/LayoutTests/svg/stroke/zero-width-hang-expected.txt 2012-12-19 16:55:50.309232198 +0100
@@ -0,0 +1 @@
+This test PASS if it doesn't cause the page to freeze.
diff -U 3 -H -d -r -N -x '.svn/*' -- QtWebKit-2.2.0/LayoutTests/svg/stroke/zero-width-hang.html QtWebKit-2.2.0.bwo97258/LayoutTests/svg/stroke/zero-width-hang.html
--- QtWebKit-2.2.0/LayoutTests/svg/stroke/zero-width-hang.html 1970-01-01 01:00:00.000000000 +0100
+++ QtWebKit-2.2.0.bwo97258/LayoutTests/svg/stroke/zero-width-hang.html 2012-12-19 16:55:50.310237712 +0100
@@ -0,0 +1,16 @@
+<html>
+ <head>
+ <title> SVG lock up test</title>
+ </head>
+ <body>
+ This test PASS if it doesn't cause the page to freeze.
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="312" height="200">
+ <path style="stroke-width: 0px; stroke-linejoin: miter; " fill="none" stroke="#ffffff" d="M0,1L312,1" stroke-linejoin="miter" stroke-dasharray="0,0"></path>
+ </svg>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+ </script>
+ </body>
+</html>
diff -U 3 -H -d -r -N -x '.svn/*' -- QtWebKit-2.2.0/Source/WebCore/ChangeLog QtWebKit-2.2.0.bwo97258/Source/WebCore/ChangeLog
--- QtWebKit-2.2.0/Source/WebCore/ChangeLog 2011-09-13 22:23:44.000000000 +0200
+++ QtWebKit-2.2.0.bwo97258/Source/WebCore/ChangeLog 2012-12-19 16:55:50.336194829 +0100
@@ -1,3 +1,17 @@
+2012-10-17 Allan Sandfeld Jensen
+
+ [Qt] Certain SVG content freezes QtWebKit
+ https://bugs.webkit.org/show_bug.cgi?id=97258
+
+ Reviewed by Simon Hausmann.
+
+ Ensure dashpattern is well-formed by avoiding divisions by zero.
+
+ Test: svg/stroke/zero-width-hang.html
+
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::setLineDash):
+
2011-09-12 Adam Klein
Fix out-of-bounds access in Gradient::sortStopsIfNecessary
diff -U 3 -H -d -r -N -x '.svn/*' -- QtWebKit-2.2.0/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp QtWebKit-2.2.0.bwo97258/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
--- QtWebKit-2.2.0/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2011-09-13 22:23:44.000000000 +0200
+++ QtWebKit-2.2.0.bwo97258/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2012-12-19 16:55:50.337132115 +0100
@@ -1057,6 +1057,9 @@
count *= 2;
float penWidth = narrowPrecisionToFloat(double(pen.widthF()));
+ if (penWidth <= 0.f)
+ penWidth = 1.f;
+
for (unsigned i = 0; i < count; i++)
pattern.append(dashes[i % dashLength] / penWidth);
++++++ libQtWebKit4-gcc47.patch ++++++
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
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
#include
+#include
using namespace std;
extern NPNetscapeFuncs *browser;
++++++ qwebview-buildfixes.diff ++++++
--- tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
+++ tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
@@ -45,7 +45,7 @@
#include
#include
-#include
+#include "qwebview.h"
static const char *toolTipC = "QtWebKit Web widget";
--- tools/designer/src/plugins/qwebview/qwebview.pro
+++ tools/designer/src/plugins/qwebview/qwebview.pro
@@ -2,6 +2,8 @@
TARGET = qwebview
CONFIG += qt warn_on plugin
QT += webkit
+INCLUDEPATH += ../../../../../Source/WebKit/qt/Api
+LIBS += -L../../../../../WebKitBuild/Release/lib
include(../plugins.pri)
build_all:!build_pass {
++++++ reduce-link-optimization.diff ++++++
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 {
}
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 ++++++
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
paths.append("/usr/lib/firefox/plugins");
paths.append("/usr/lib64/browser-plugins");
paths.append("/usr/lib/browser-plugins");
+ paths.append("/usr/lib/mozilla/plugins-wrapped");
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
paths.append("/usr/lib/netscape/plugins");
paths.append("/usr/lib/netscape/plugins-libc5");
paths.append("/usr/lib/netscape/plugins-libc6");
+ paths.append("/usr/lib64/mozilla/plugins-wrapped");
paths.append("/usr/lib64/netscape/plugins");
paths.append("/usr/lib64/mozilla/plugins");
paths.append("/usr/lib/nsbrowser/plugins");
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
