- rel 8; upstream fixes for QTBUGs

[packages/qt4.git] / qt4.spec

diff --git a/qt4.spec b/qt4.spec
index c4a023cd701bf75fd8fb32c3525212df0be2bf54..3ca24f3cdacfc7e98cc12223a8f3c0378f6046df 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -53,7 +53,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.3
-Release:       8
+Release:       9
 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
@@ -81,8 +81,9 @@ Patch10:      webkit-no_Werror.patch
 Patch11:       moc-boost148.patch
 Patch12:       fix-crash-in-assistant.patch
 Patch13:       improve-cups-support.patch
-Patch14:       undo-fix-jit-crash-on-x86_64.patch
-Patch15:       qt4-git.patch
+Patch14:       qt4-git.patch
+Patch15:       qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
+Patch16:       qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch
 URL:           http://qt.nokia.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 BuildRequires: Mesa-libOpenVG-devel
@@ -96,7 +97,7 @@ BuildRequires:        freetds-devel
 BuildRequires: freetype-devel >= 1:2.0.0
 %{?with_pch:BuildRequires:     gcc >= 5:4.0}
 BuildRequires: glib2-devel >= 2.0.0
-BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: gstreamer0.10-plugins-base-devel
 %{?with_gtk:BuildRequires:     gtk+2-devel >= 2:2.10}
 # see dependency on libicu version below
 BuildRequires: libicu-devel >= 49
@@ -1457,8 +1458,9 @@ Programas exemplo para o Qt versão.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1 -R
+%patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf