Author: baggins Date: Tue Jun 19 06:07:48 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - don't treat warning as errors in webkit (breaks on gcc 4.7)
---- Files affected: packages/qt4: qt4.spec (1.317 -> 1.318) , webkit-no_Werror.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/qt4/qt4.spec diff -u packages/qt4/qt4.spec:1.317 packages/qt4/qt4.spec:1.318 --- packages/qt4/qt4.spec:1.317 Mon Jun 18 14:15:18 2012 +++ packages/qt4/qt4.spec Tue Jun 19 08:07:43 2012 @@ -56,7 +56,7 @@ 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 @@ -83,6 +83,7 @@ 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 @@ -1415,6 +1416,7 @@ #%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 @@ -2422,6 +2424,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.318 2012/06/19 06:07:43 baggins +- rel 3 +- don't treat warning as errors in webkit (breaks on gcc 4.7) + Revision 1.317 2012/06/18 12:15:18 baggins - release 2 ================================================================ Index: packages/qt4/webkit-no_Werror.patch diff -u /dev/null packages/qt4/webkit-no_Werror.patch:1.1 --- /dev/null Tue Jun 19 08:07:48 2012 +++ packages/qt4/webkit-no_Werror.patch Tue Jun 19 08:07:43 2012 @@ -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). ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/qt4/qt4.spec?r1=1.317&r2=1.318 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
