Hello community,
here is the log from the commit of package libQtWebKit4 for openSUSE:Factory
checked in at 2012-04-17 21:59:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2012-04-12 09:38:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes
2012-04-17 21:59:35.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Apr 14 14:54:28 UTC 2012 - dims...@opensuse.org
+
+- Add libQtWebKit4-gcc47.patch: Fix build with gcc 4.7. Patch taken
+ from Fedora.
+
+-------------------------------------------------------------------
New:
----
libQtWebKit4-gcc47.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libQtWebKit4.spec ++++++
--- /var/tmp/diff_new_pack.CvwB7c/_old 2012-04-17 21:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvwB7c/_new 2012-04-17 21:59:50.000000000 +0200
@@ -50,6 +50,8 @@
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
@@ -110,6 +112,7 @@
%patch12
%patch13
%patch14
+%patch15 -p1
%build
export QTDIR=%{_prefix}
++++++ 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 <assert.h>
#include <string.h>
+#include <unistd.h>
using namespace std;
extern NPNetscapeFuncs *browser;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
