Hello community,
here is the log from the commit of package libQtWebKit4 for openSUSE:Factory
checked in at 2013-04-14 10:33:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-05 09:28:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes
2013-04-14 10:33:54.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Apr 6 19:19:57 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Add libQtWebKit4-gcc48.patch, fixes build with GCC 4.8
+- Tweak the patches, so it also saves memory on
+ arm
+
+-------------------------------------------------------------------
New:
----
libQtWebKit4-gcc48.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libQtWebKit4.spec ++++++
--- /var/tmp/diff_new_pack.aRv9Zg/_old 2013-04-14 10:33:57.000000000 +0200
+++ /var/tmp/diff_new_pack.aRv9Zg/_new 2013-04-14 10:33:57.000000000 +0200
@@ -31,11 +31,11 @@
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 02_add_nostrip_for_debug_packages.diff
asterios.dra...@gmail.com -- Set CONFIG += nostrip to avoid stripping (taken
from Ubuntu)
-Patch1: 02_add_nostrip_for_debug_packages.diff
+Patch1: 04_enable_debug_information.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)
Patch2: 03_hide_std_symbols.diff
-Patch3: 04_enable_debug_information.diff
+# PATCH-FIX-OPENSUSE 02_add_nostrip_for_debug_packages.diff
asterios.dra...@gmail.com -- Set CONFIG += nostrip to avoid stripping (taken
from Ubuntu)
+Patch3: 02_add_nostrip_for_debug_packages.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)
Patch4: defines_qt_webkit.diff
Patch5: do-not-force-optimization-level.diff
@@ -44,10 +44,12 @@
Patch8: qwebview-buildfixes.diff
# PATCH-FEATURE-UPSTREAM
Patch9: gstreamer-1.0.diff
-# PATCH-FIX-UPSTREAM buffer-ranges.patch hrvoje.sen...@gmail.com -- Use
different method for buffering with gstreamer 1.0
-Patch10: buffer-ranges.patch
# PATCH-FIX-UPSTREAM hrvoje.sen...@gmail.com -- Call gst_object_ref_sink() on
the playbin object to take ownership of it
-Patch11:
MediaPlayerPrivateGStreamer-should-take-ownership-of-the-playbin.patch
+Patch10:
MediaPlayerPrivateGStreamer-should-take-ownership-of-the-playbin.patch
+# PATCH-FIX-UPSTREAM buffer-ranges.patch hrvoje.sen...@gmail.com -- Use
different method for buffering with gstreamer 1.0
+Patch11: buffer-ranges.patch
+# PATCH-FIX-UPSTREAM hrvoje.sen...@gmail.com -- Fix build with GCC 4.8
+Patch12: libQtWebKit4-gcc48.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
@@ -120,15 +122,11 @@
%patch10 -p1
%patch11 -p1
%endif
+%patch12 -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 \
--qt \
--makeargs="%{?_smp_mflags}" \
++++++ 02_add_nostrip_for_debug_packages.diff ++++++
--- /var/tmp/diff_new_pack.aRv9Zg/_old 2013-04-14 10:33:57.000000000 +0200
+++ /var/tmp/diff_new_pack.aRv9Zg/_new 2013-04-14 10:33:57.000000000 +0200
@@ -1,11 +1,48 @@
---- 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
+diff -urNB orig.webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
+--- orig.webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
2013-04-08 19:48:19.908101090 +0200
++++ webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
2013-04-08 19:48:57.210634744 +0200
+@@ -13,6 +13,8 @@
+ QMAKE_CXXFLAGS_RELEASE += -g1
}
+CONFIG += nostrip
+
- contains(DEFINES, ENABLE_VIDEO=1):contains(DEFINES, WTF_USE_QTKIT=1) {
- LIBS += -framework Security -framework IOKit
+ JAVASCRIPTCORE_GENERATED_SOURCES_DIR =
$${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR}
+ INCLUDEPATH += \
+diff -urNB orig.webkit-qtwebkit-23/Source/WebCore/WebCore.pri
webkit-qtwebkit-23/Source/WebCore/WebCore.pri
+--- orig.webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-04-08
19:48:19.909101077 +0200
++++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-04-08
19:49:24.013299665 +0200
+@@ -13,6 +13,8 @@
+ QMAKE_CXXFLAGS_RELEASE += -g1
+ }
+
++CONFIG += nostrip
++
+ QT *= network
+ haveQt(5): QT *= core-private gui-private
+
+diff -urNB orig.webkit-qtwebkit-23/Source/WebKit/WebKit1.pri
webkit-qtwebkit-23/Source/WebKit/WebKit1.pri
+--- orig.webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-04-08
19:48:19.909101077 +0200
++++ webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-04-08
19:49:40.386094977 +0200
+@@ -13,6 +13,8 @@
+ QMAKE_CXXFLAGS_RELEASE += -g1
+ }
+
++CONFIG += nostrip
++
+ INCLUDEPATH += \
+ $$SOURCE_DIR/qt/Api \
+ $$SOURCE_DIR/qt/WebCoreSupport \
+diff -urNB orig.webkit-qtwebkit-23/Source/WTF/WTF.pri
webkit-qtwebkit-23/Source/WTF/WTF.pri
+--- orig.webkit-qtwebkit-23/Source/WTF/WTF.pri 2013-04-08 19:48:19.910101065
+0200
++++ webkit-qtwebkit-23/Source/WTF/WTF.pri 2013-04-08 19:49:55.895901077
+0200
+@@ -14,6 +14,8 @@
+ QMAKE_CXXFLAGS_RELEASE += -g1
+ }
+
++CONFIG += nostrip
++
+ haveQt(5) {
+ mac {
+ # Mac OS does ship libicu but not the associated header files.
++++++ 04_enable_debug_information.diff ++++++
--- /var/tmp/diff_new_pack.aRv9Zg/_old 2013-04-14 10:33:57.000000000 +0200
+++ /var/tmp/diff_new_pack.aRv9Zg/_new 2013-04-14 10:33:57.000000000 +0200
@@ -1,27 +1,27 @@
-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
+diff -urNB orig.webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
+--- orig.webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
2013-03-14 14:24:37.000000000 +0100
++++ webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
2013-04-08 19:44:20.232097452 +0200
@@ -7,6 +7,12 @@
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
-+#}
++equals(QT_ARCH, arm) {
++ 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
+diff -urNB orig.webkit-qtwebkit-23/Source/WebCore/WebCore.pri
webkit-qtwebkit-23/Source/WebCore/WebCore.pri
+--- orig.webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-03-14
14:24:37.000000000 +0100
++++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-04-08
19:45:23.002312717 +0200
@@ -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) {
++equals(QT_ARCH, arm)|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
@@ -30,50 +30,34 @@
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
+diff -urNB orig.webkit-qtwebkit-23/Source/WebKit/WebKit1.pri
webkit-qtwebkit-23/Source/WebKit/WebKit1.pri
+--- orig.webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-03-14
14:24:37.000000000 +0100
++++ webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-04-08
19:46:41.045337045 +0200
@@ -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
-+#}
++equals(QT_ARCH, arm) {
++ message("WebKit1 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
+diff -urNB orig.webkit-qtwebkit-23/Source/WTF/WTF.pri
webkit-qtwebkit-23/Source/WTF/WTF.pri
+--- orig.webkit-qtwebkit-23/Source/WTF/WTF.pri 2013-03-14 14:24:37.000000000
+0100
++++ webkit-qtwebkit-23/Source/WTF/WTF.pri 2013-04-08 19:46:46.301271336
+0200
@@ -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
-+#}
++equals(QT_ARCH, arm) {
++ message("WTF workaround for QtWebkit: do not build with -g, but with -g1")
++ QMAKE_CXXFLAGS_RELEASE -= -g
++ QMAKE_CXXFLAGS_RELEASE += -g1
++}
+
haveQt(5) {
mac {
++++++ do-not-force-optimization-level.diff ++++++
--- /var/tmp/diff_new_pack.aRv9Zg/_old 2013-04-14 10:33:57.000000000 +0200
+++ /var/tmp/diff_new_pack.aRv9Zg/_new 2013-04-14 10:33:57.000000000 +0200
@@ -1,6 +1,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
+--- orig.webkit-qtwebkit-23/configure.ac 2013-04-07 15:18:00.547041081
+0200
++++ webkit-qtwebkit-23/configure.ac 2013-04-07 15:14:49.538429017 +0200
@@ -956,14 +956,6 @@
AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
fi
@@ -16,9 +16,20 @@
PKG_CHECK_MODULES([LIBSOUP],
[libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
+diff -urNB orig.webkit-qtwebkit-23/Source/JavaScriptCore/GNUmakefile.am
webkit-qtwebkit-23/Source/JavaScriptCore/GNUmakefile.am
+--- orig.webkit-qtwebkit-23/Source/JavaScriptCore/GNUmakefile.am
2013-03-14 14:24:37.000000000 +0100
++++ webkit-qtwebkit-23/Source/JavaScriptCore/GNUmakefile.am 2013-04-07
15:17:32.598390487 +0200
+@@ -35,7 +35,6 @@
+
+
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS
= \
+ -fstrict-aliasing \
+- -O3 \
+ $(javascriptcore_cflags)
+
+
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS
= \
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
+--- orig.webkit-qtwebkit-23/Source/JavaScriptCore/Target.pri 2013-04-07
15:18:00.582040643 +0200
++++ webkit-qtwebkit-23/Source/JavaScriptCore/Target.pri 2013-04-07
15:14:49.539429004 +0200
@@ -15,9 +15,6 @@
CONFIG += staticlib
@@ -30,8 +41,8 @@
!contains(DEFINES, ENABLE_JIT=0) {
linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0)
{
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
+---
orig.webkit-qtwebkit-23/Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py
2013-04-07 15:18:00.588040568 +0200
++++ webkit-qtwebkit-23/Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py
2013-04-07 15:14:49.539429004 +0200
@@ -28,7 +28,6 @@
try:
@@ -40,9 +51,33 @@
test.run_gyp('cxxflags.gyp')
finally:
# We clear the environ after calling gyp. When the auto-regeneration
happens,
+diff -urNB orig.webkit-qtwebkit-23/Source/WTF/GNUmakefile.am
webkit-qtwebkit-23/Source/WTF/GNUmakefile.am
+--- orig.webkit-qtwebkit-23/Source/WTF/GNUmakefile.am 2013-03-14
14:24:37.000000000 +0100
++++ webkit-qtwebkit-23/Source/WTF/GNUmakefile.am 2013-04-07
15:17:21.514529054 +0200
+@@ -26,7 +26,6 @@
+
+ libWTF_la_CFLAGS = \
+ -fstrict-aliasing \
+- -O3 \
+ $(global_cflags) \
+ $(GLIB_CFLAGS) \
+ $(UNICODE_CFLAGS)
+diff -urNB orig.webkit-qtwebkit-23/Source/WTF/WTF.pro
webkit-qtwebkit-23/Source/WTF/WTF.pro
+--- orig.webkit-qtwebkit-23/Source/WTF/WTF.pro 2013-03-14 14:24:37.000000000
+0100
++++ webkit-qtwebkit-23/Source/WTF/WTF.pro 2013-04-07 15:16:15.211357958
+0200
+@@ -268,9 +268,6 @@
+ QT += core
+ QT -= gui
+
+-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+-
+ *sh4* {
+ QMAKE_CXXFLAGS += -mieee -w
+ QMAKE_CFLAGS += -mieee -w
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
+--- orig.webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_pre.prf
2013-04-07 15:18:00.644039868 +0200
++++ webkit-qtwebkit-23/Tools/qmake/mkspecs/features/unix/default_pre.prf
2013-04-07 15:14:49.539429004 +0200
@@ -12,6 +12,10 @@
SBOX_CHECK = $$(_SBOX_DIR)
!isEmpty(SBOX_CHECK): CONFIG += scratchbox
@@ -55,8 +90,8 @@
# flag that can be used to test for either of these situations.
contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
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
+--- orig.webkit-qtwebkit-23/Tools/Tools.pro 2013-04-07 15:18:00.772038268
+0200
++++ webkit-qtwebkit-23/Tools/Tools.pro 2013-04-07 15:14:49.539429004 +0200
@@ -7,6 +7,10 @@
TEMPLATE = subdirs
CONFIG += ordered
++++++ gstreamer-1.0.diff ++++++
--- /var/tmp/diff_new_pack.aRv9Zg/_old 2013-04-14 10:33:57.000000000 +0200
+++ /var/tmp/diff_new_pack.aRv9Zg/_new 2013-04-14 10:33:57.000000000 +0200
@@ -1,7 +1,7 @@
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 @@
+@@ -197,8 +197,10 @@
contains(DEFINES, WTF_USE_GSTREAMER=1) {
DEFINES += ENABLE_GLIB_SUPPORT=1
@@ -14,7 +14,7 @@
contains(DEFINES, ENABLE_VIDEO=1) {
contains(DEFINES, WTF_USE_QTKIT=1) {
-@@ -220,7 +222,7 @@
+@@ -233,7 +235,7 @@
contains(DEFINES, WTF_USE_GSTREAMER=1) {
DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1
INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer
++++++ libQtWebKit4-gcc48.patch ++++++
>From bfab6c135769d68bdec0a074bf1b72d9b65ef31f Mon Sep 17 00:00:00 2001
From: Andras Becsi <abe...@webkit.org>
Date: Sat, 6 Apr 2013 15:38:58 +0200
Subject: [PATCH] Fix the build with GCC 4.8
https://bugs.webkit.org/show_bug.cgi?id=113147
Reviewed by Allan Sandfeld Jensen.
Source/JavaScriptCore:
Initialize JSObject* exception to suppress warnings that make
the build fail because of -Werror=maybe-uninitialized.
* runtime/Executable.cpp:
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):
Source/WTF:
Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8
since dummy typedefs are commonly used in the codebase.
* wtf/Compiler.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147640
268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
Source/JavaScriptCore/runtime/Executable.cpp | 4 ++--
Source/WTF/wtf/Compiler.h | 3 +++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/Source/JavaScriptCore/runtime/Executable.cpp
b/Source/JavaScriptCore/runtime/Executable.cpp
index 746e281..ff4c2ff 100644
--- a/Source/JavaScriptCore/runtime/Executable.cpp
+++ b/Source/JavaScriptCore/runtime/Executable.cpp
@@ -522,7 +522,7 @@ JSObject*
FunctionExecutable::compileForCallInternal(ExecState* exec, JSScope* s
UNUSED_PARAM(bytecodeIndex);
#endif
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
- JSObject* exception;
+ JSObject* exception = 0;
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scope,
CodeForCall, exception);
if (!newCodeBlock)
return exception;
@@ -558,7 +558,7 @@ JSObject*
FunctionExecutable::compileForConstructInternal(ExecState* exec, JSSco
#endif
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);
- JSObject* exception;
+ JSObject* exception = 0;
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scope,
CodeForConstruct, exception);
if (!newCodeBlock)
return exception;
diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
index a9ef419..293e86b 100644
--- a/Source/WTF/wtf/Compiler.h
+++ b/Source/WTF/wtf/Compiler.h
@@ -122,6 +122,9 @@
/* Specific compiler features */
#if COMPILER(GCC) && !COMPILER(CLANG)
+#if GCC_VERSION_AT_LEAST(4, 8, 0)
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
#if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >=
201103L
#define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
--
1.7.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
