diff --git a/.gitignore b/.gitignore index f2a577f..c1bbf14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz -/qtwebkit-2.2.1.tar.xz -/qtwebkit-2.2.1-source.tar.xz +/qtwebkit-2.2.2-source.tar.xz diff --git a/qtwebkit-2.2.2-no_Werror.patch b/qtwebkit-2.2.2-no_Werror.patch new file mode 100644 index 0000000..d80c6b9 --- /dev/null +++ b/qtwebkit-2.2.2-no_Werror.patch @@ -0,0 +1,12 @@ +diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri +--- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror 2012-05-22 09:30:37.000000000 -0500 ++++ qtwebkit-2.2.2-source/Source/WebKit.pri 2012-05-22 09:51:42.126610618 -0500 +@@ -102,7 +102,7 @@ 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 ++ #!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)) { diff --git a/qtwebkit.spec b/qtwebkit.spec index 16bfd31..75bda9a 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -1,7 +1,7 @@ Name: qtwebkit -Version: 2.2.1 -Release: 6%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Qt WebKit bindings Group: System Environment/Libraries License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -10,14 +10,14 @@ URL: http://trac.webkit.org/wiki/QtWebKit # $ git clone git://qt.gitorious.org/qtwebkit/tools.git # get Qt WebKit source code: # $ git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git -# create a branch from a tag (e.g. qtwebkit-2.2.1): -# $ git checkout -b qtwebkit-2.2.1 qtwebkit-2.2.1 +# create a branch from a tag (e.g. qtwebkit-2.2.2): +# $ git checkout -b qtwebkit-2.2.2 qtwebkit-2.2.2 # generate the tarball (requires: bison flex gperf): # $ make-package.py # fix/repack the generated tarball: -# $ tar xzf qtwebkit-2.2-source.tar.gz -# $ mv qtwebkit-2.2.1-source/include qtwebkit-2.2.1-source/Source/ -# $ tar cJf qtwebkit-2.2.1-source.tar.xz qtwebkit-2.2.1-source/ +# $ tar xzf qtwebkit-2.2.2-source.tar.gz +# $ mv qtwebkit-2.2.2-source/include qtwebkit-2.2.2-source/Source/ +# $ tar cJf qtwebkit-2.2.2-source.tar.xz qtwebkit-2.2.2-source/ Source0: qtwebkit-%{version}-source.tar.xz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -29,7 +29,7 @@ Patch3: webkit-qtwebkit-2.2-debuginfo.patch # https://bugs.webkit.org/show_bug.cgi?id=63941 # -Wall + -Werror = fail -Patch4: webkit-qtwebkit-2.2-no_Werror.patch +Patch4: qtwebkit-2.2.2-no_Werror.patch # fix for qt-4.6.x Patch5: webkit-qtwebkit-2.2tp1-qt46.patch @@ -145,6 +145,9 @@ rm -rf %{buildroot} %changelog +* Tue May 22 2012 Rex Dieter 2.2.2-1 +- qtwebkit-2.2.2 + * Fri May 11 2012 Rex Dieter 2.2.1-6 - can't render Complex Text Layout (Hindi, Arabic) (#761337) diff --git a/sources b/sources index ab1c26e..0a70500 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9669cf1f28ba4020377d7d8266a225b qtwebkit-2.2.1-source.tar.xz +750055355d11dd37984bfbe4d02b2225 qtwebkit-2.2.2-source.tar.xz diff --git a/webkit-qtwebkit-2.2-no_Werror.patch b/webkit-qtwebkit-2.2-no_Werror.patch deleted file mode 100644 index e63d4e9..0000000 --- a/webkit-qtwebkit-2.2-no_Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -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)) {