- added openvg bcond (library not available in Mesa 10.4)

- added fix for x32 arch

diff --git a/qt4.spec b/qt4.spec
index 43e42ca157121d6a863f1c12f8e8370c9bc3416a..3ba842e3a2656a3a4567bc199dffebb74c536786 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -13,6 +13,7 @@
 %bcond_without pch             # pch (pre-compiled headers) in qmake
 %bcond_without system_phonon   # phonon libraries from phonon.spec intead of qt4.spec
 %bcond_with    wkhtml          # WKHTMLTOPDF patch (affects QtGui ABI)
+%bcond_with    openvg          # OpenVG support
 # -- databases
 %bcond_without mysql           # MySQL plugin
 %bcond_without odbc            # unixODBC plugin
@@ -87,6 +88,7 @@ Patch10:      webkit-no_Werror.patch
 Patch11:       %{name}-wkhtml.patch
 Patch12:       fix-crash-in-assistant.patch
 Patch13:       improve-cups-support.patch
+Patch14:       x32.patch
 # backported from Qt5 (essentially)
 # http://bugzilla.redhat.com/702493
 # https://bugreports.qt-project.org/browse/QTBUG-5545
@@ -104,7 +106,7 @@ Patch25:    0065-Fix-QPainter-drawPolyline-painting-errors-with-cosme.patch
 Patch26:       0072-Fix-font-cache-check-in-QFontEngineFT-recalcAdvances.patch
 URL:           http://qt-project.org/
 %{?with_ibase:BuildRequires:   Firebird-devel}
-BuildRequires: Mesa-libOpenVG-devel
+%{?with_openvg:BuildRequires:  Mesa-libOpenVG-devel}
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
@@ -1487,7 +1489,7 @@ Programas exemplo para o Qt versão.
 %{?with_wkhtml:%patch11 -p1}
 %patch12 -p1
 %patch13 -p1
-
+%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 
@@ -1855,7 +1857,7 @@ mkdevfl QtGui
 mkdevfl QtMultimedia
 mkdevfl QtNetwork
 mkdevfl QtOpenGL
-mkdevfl QtOpenVG
+%{?with_openvg:mkdevfl QtOpenVG}
 mkdevfl QtScript
 mkdevfl QtScriptTools
 mkdevfl QtSql
@@ -2142,10 +2144,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libQtOpenGL.so.4
 %attr(755,root,root) %{_qtdir}/plugins/graphicssystems/libqglgraphicssystem.so
 
+%if %{with openvg}
 %files -n QtOpenVG
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtOpenVG.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtOpenVG.so.4
+%endif
 
 %files -n QtScript
 %defattr(644,root,root,755)
@@ -2415,8 +2419,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -n QtOpenGL-devel -f QtOpenGL-devel.files
 %defattr(644,root,root,755)
 
+%if %{with openvg}
 %files -n QtOpenVG-devel -f QtOpenVG-devel.files
 %defattr(644,root,root,755)
+%endif
 
 %files -n QtScript-devel -f QtScript-devel.files
 %defattr(644,root,root,755)
@@ -2492,9 +2498,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libQtOpenGL.a
 
+%if %{with openvg}
 %files -n QtOpenVG-static
 %defattr(644,root,root,755)
 %{_libdir}/libQtOpenVG.a
+%endif
 
 %files -n QtScript-static
 %defattr(644,root,root,755)

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..2d5b515
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,63 @@
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -213,8 +213,12 @@
+ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
+ #if   defined(__x86_64__) \
+     || defined(_M_X64)
++#ifdef __ILP32__
++#define WTF_CPU_X86_64_32 1
++#else
+ #define WTF_CPU_X86_64 1
+ #endif
++#endif
+ 
+ /* 64-bit mode on AIX */
+ #ifdef __64BIT__
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+@@ -213,8 +213,12 @@
+ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
+ #if   defined(__x86_64__) \
+     || defined(_M_X64)
++#ifdef __ILP32__
++#define WTF_CPU_X86_64_32 1
++#else
+ #define WTF_CPU_X86_64 1
+ #endif
++#endif
+ 
+ /* 64-bit mode on AIX */
+ #ifdef __64BIT__
+--- a/configure
++++ b/configure
+@@ -3329,6 +3329,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+         fi
+         CFG_HOST_ARCH=sh
+         ;;
++    *:*:x32)
++        if [ "$OPT_VERBOSE" = "yes" ]; then
++            echo "    32-bit AMD 80x86 (x32)"
++        fi
++        CFG_HOST_ARCH=x32
++        ;;
+     *:*:*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+             echo "    Trying '$UNAME_MACHINE'..."
+--- a/src/corelib/arch/qatomic_arch.h
++++ b/src/corelib/arch/qatomic_arch.h
+@@ -92,6 +92,8 @@ QT_BEGIN_HEADER
+ #  include "QtCore/qatomic_sh.h"
+ #elif defined(QT_ARCH_SH4A)
+ #  include "QtCore/qatomic_sh4a.h"
++#elif defined(QT_ARCH_X32)
++#  include "QtCore/qatomic_i386.h"
+ #elif defined(QT_ARCH_NACL)
+ #  include "QtCore/qatomic_generic.h"
+ #elif defined(QT_ARCH_AARCH64)
+--- /dev/null
++++ b/src/corelib/arch/x32/arch.pri
+@@ -0,0 +1,4 @@
++#
++# X32 architecture
++#
++# nothing special needed here