- rel 3

- don't treat warning as errors in webkit (breaks on gcc 4.7)

Changed files:
    qt4.spec -> 1.318
    webkit-no_Werror.patch -> 1.1

diff --git a/qt4.spec b/qt4.spec
index 71dc17ce17b61726bbe4407b7908bfd89e158f48..e96ee240b43934ef7395d76b07b54cc67051d165 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -55,7 +55,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.8.2
-Release:       2
+Release:       3
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -82,6 +82,7 @@ Patch9:               %{name}-ibase.patch
 Patch10:       %{name}-git.patch
 Patch11:       qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 Patch12:       gcc-4.7.patch
+Patch13:       webkit-no_Werror.patch
 URL:           http://qt.nokia.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 BuildRequires: Mesa-libOpenVG-devel
@@ -1414,6 +1415,7 @@ Programas exemplo para o Qt versão.
 #%patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf

diff --git a/webkit-no_Werror.patch b/webkit-no_Werror.patch
new file mode 100644 (file)
index 0000000..ef5d55d
--- /dev/null
+++ b/webkit-no_Werror.patch
@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri
+--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri   2012-03-28 17:12:33.391294004 +0200
+@@ -102,8 +102,6 @@ CONFIG -= warn_on
+ 
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+-    !CONFIG(standalone_package):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)) {
+             # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).