]> git.pld-linux.org Git - packages/qt4.git/blobdiff - qt4.spec
- rel 8; upstream fixes for QTBUGs
[packages/qt4.git] / qt4.spec
index af0005af261e0b15590932c2973235a88868a764..3ca24f3cdacfc7e98cc12223a8f3c0378f6046df 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -4,8 +4,6 @@
 #      - more cleanups
 #      - check if translations are available
 #      - check Qt ui tool
-#      - QtWebKit-devel is broken: libQtWebKit.*la contains '-ljscore', it comes
-#        from src/3rdparty/webkit/JavaScriptCore, but jscore lib isn't installed
 #
 # Conditional build:
 %bcond_with    nas             # enable NAS audio support
@@ -54,12 +52,12 @@ Summary(es.UTF-8):  Biblioteca para ejecutar aplicaciones GUI Qt
 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:       6
+Version:       4.8.3
+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
-# Source0-md5: 3c1146ddf56247e16782f96910a8423b
+# Source0-md5: a663b6c875f8d7caa8ac9c30e4a4ec3b
 Source2:       %{name}-qtconfig.desktop
 Source3:       %{name}-designer.desktop
 Source4:       %{name}-assistant.desktop
@@ -77,13 +75,15 @@ Patch3:             %{name}-locale.patch
 Patch5:                %{name}-support-cflags-with-commas.patch
 Patch6:                %{name}-build-lib-static.patch
 Patch7:                %{name}-x11_fonts.patch
-Patch8:                %{name}-glib.patch
-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
-Patch14:       moc-boost148.patch
+Patch8:                %{name}-ibase.patch
+Patch9:                qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+Patch10:       webkit-no_Werror.patch
+Patch11:       moc-boost148.patch
+Patch12:       fix-crash-in-assistant.patch
+Patch13:       improve-cups-support.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
@@ -97,9 +97,11 @@ 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}
-BuildRequires: libicu-devel >= 4.8
+# see dependency on libicu version below
+BuildRequires: libicu-devel >= 49
+BuildRequires: libicu-devel < 50
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel >= 1.0.0
 BuildRequires: libpng-devel >= 2:1.0.8
@@ -263,10 +265,10 @@ Group:            X11/Libraries
 %requires_eq   libicu
 # be sure to depend on proper arch.
 %ifarch %{ix86}
-Requires:      libicui18n.so.48
+Requires:      libicui18n.so.49
 %endif
 %ifarch %{x8664}
-Requires:      libicui18n.so.48()(64bit)
+Requires:      libicui18n.so.49()(64bit)
 %endif
 Obsoletes:     QtAssistant
 
@@ -682,6 +684,45 @@ Qt OpenGL support classes - static libraries.
 %description -n QtOpenGL-static -l pl.UTF-8
 Klasy Qt wspomagające OpenGL - biblioteki statyczne.
 
+%package -n QtOpenVG
+Summary:       Qt OpenVG support classes
+Summary(pl.UTF-8):     Klasy Qt wspomagające OpenVG
+Group:         X11/Libraries
+Requires:      QtCore = %{version}-%{release}
+Requires:      QtGui = %{version}-%{release}
+
+%description -n QtOpenVG
+Qt OpenVG support classes.
+
+%description -n QtOpenVG -l pl.UTF-8
+Klasy Qt wspomagające OpenVG.
+
+%package -n QtOpenVG-devel
+Summary:       Qt OpenVG support classes - development files
+Summary(pl.UTF-8):     Klasy Qt wspomagające OpenVG - pliki programistyczne
+Group:         X11/Development/Libraries
+Requires:      Mesa-libOpenVG-devel
+Requires:      QtCore-devel = %{version}-%{release}
+Requires:      QtGui-devel = %{version}-%{release}
+
+%description -n QtOpenVG-devel
+Qt OpenVG support classes - development files.
+
+%description -n QtOpenVG-devel -l pl.UTF-8
+Klasy Qt wspomagające OpenVG - pliki programistyczne.
+
+%package -n QtOpenVG-static
+Summary:       Qt OpenVG support classes - static libraries
+Summary(pl.UTF-8):     Klasy Qt wspomagające OpenVG - biblioteki statyczne
+Group:         X11/Development/Libraries
+Requires:      QtOpenVG-devel = %{version}-%{release}
+
+%description -n QtOpenVG-static
+Qt OpenVG support classes - static libraries.
+
+%description -n QtOpenVG-static -l pl.UTF-8
+Klasy Qt wspomagające OpenVG - biblioteki statyczne.
+
 %package -n QtScript
 Summary:       Qt classes for scripting applications
 Summary(pl.UTF-8):     Klasy Qt pozwalające dodać obsługę skryptów w aplikacjach
@@ -1413,11 +1454,13 @@ Programas exemplo para o Qt versão.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-#%patch10 -p1
+%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf
@@ -1597,6 +1640,10 @@ install bin/qdoc3 $RPM_BUILD_ROOT%{_qtdir}/bin/qdoc3
        s|uic_location=.*|uic_location=%{_bindir}/uic-qt4|;
        ' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 
+# libQtWebKit.la contains '-ljscore' and '-lwebcore', they come
+# from src/3rdparty/webkit/{JavaScriptCore,WebCore}} but those libs aren't installed
+%{__sed} -i -e "s,-lwebcore,,g;s,-ljscore,,g;" $RPM_BUILD_ROOT%{_libdir}/libQtWebKit.la
+
 # install tools
 install bin/findtr     $RPM_BUILD_ROOT%{_qtdir}/bin
 
@@ -1755,6 +1802,7 @@ mkdevfl QtGui
 mkdevfl QtMultimedia
 mkdevfl QtNetwork
 mkdevfl QtOpenGL
+mkdevfl QtOpenVG
 mkdevfl QtScript
 mkdevfl QtScriptTools
 mkdevfl QtSql
@@ -1775,6 +1823,9 @@ mkdevfl QtUiTools || /bin/true
 # without glob (exclude QtScriptTools* QtXmlPatterns*)
 %{__sed} -i 's,QtScript\*,QtScript,g' QtScript-devel.files
 %{__sed} -i 's,QtXml\*,QtXml,g' QtXml-devel.files
+# no duplication between QtCore-devel and QtXml-devel
+%{__sed} -i 's,%{_includedir}/qt4/Qt/QXmlStream.*,,g' QtCore-devel.files
+%{__sed} -i 's,%{_includedir}/qt4/Qt/qxmlstream\.h,,g' QtCore-devel.files
 
 echo "%defattr(644,root,root,755)" > examples.files
 ifecho examples %{_examplesdir}/qt4
@@ -1836,6 +1887,9 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n QtOpenGL     -p /sbin/ldconfig
 %postun        -n QtOpenGL     -p /sbin/ldconfig
 
+%post  -n QtOpenVG     -p /sbin/ldconfig
+%postun        -n QtOpenVG     -p /sbin/ldconfig
+
 %post   -n QtScript    -p /sbin/ldconfig
 %postun -n QtScript    -p /sbin/ldconfig
 
@@ -2033,6 +2087,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libQtOpenGL.so.4
 %attr(755,root,root) %{_qtdir}/plugins/graphicssystems/libqglgraphicssystem.so
 
+%files -n QtOpenVG
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtOpenVG.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtOpenVG.so.4
+
 %files -n QtScript
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtScript.so.*.*
@@ -2298,6 +2357,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -n QtOpenGL-devel -f QtOpenGL-devel.files
 %defattr(644,root,root,755)
 
+%files -n QtOpenVG-devel -f QtOpenVG-devel.files
+%defattr(644,root,root,755)
+
 %files -n QtScript-devel -f QtScript-devel.files
 %defattr(644,root,root,755)
 
@@ -2372,6 +2434,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libQtOpenGL.a
 
+%files -n QtOpenVG-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtOpenVG.a
+
 %files -n QtScript-static
 %defattr(644,root,root,755)
 %{_libdir}/libQtScript.a
This page took 0.060843 seconds and 4 git commands to generate.