- fix building on x32

- rel 2

diff --git a/wkhtmltopdf.spec b/wkhtmltopdf.spec
index 21c2a936f8c831feb49668a5f24142e0a611ebee..dc17a2424b09fcf2591d0be835e0ae06b0e9de83 100644 (file)
--- a/wkhtmltopdf.spec
+++ b/wkhtmltopdf.spec
@@ -14,7 +14,7 @@ Summary:      Programs capable of converting HTML documents into images or PDF docume
 Summary(pl.UTF-8):     Programy do konwersji dokumentów HTML do obrazów lub dokumentów PDF
 Name:          wkhtmltopdf
 Version:       0.12.5
-Release:       1
+Release:       2
 License:       LGPL v3+ (library), GPL v3+ (utilities)
 Group:         Applications/Graphics
 Source0:       https://github.com/wkhtmltopdf/wkhtmltopdf/archive/%{version}/%{name}-%{version}.tar.gz
@@ -23,6 +23,7 @@ Source1:      http://download.qt-project.org/official_releases/qt/4.8/%{qt_ver}/qt-ev
 # Source1-md5: d990ee66bf7ab0c785589776f35ba6ad
 #git clone https://github.com/wkhtmltopdf/qt.git; git diff origin/4.8..wk_4.8.7 > qt.patch
 Patch0:                qt.patch
+Patch1:                x32.patch
 URL:           http://wkhtmltopdf.org/
 %if %{with patchedQt}
 BuildRequires: fontconfig-devel
@@ -89,6 +90,7 @@ Pliki nagłówkowe biblioteki wkhtmltox.
 %if %{with patchedQt}
 cd qt-everywhere-opensource-src-%{qt_ver}
 %patch0 -p1
+%patch1 -p1
 # change QMAKE FLAGS to build
 %{__sed} -i -e '
        s|QMAKE_CC.*=.*gcc|QMAKE_CC\t\t= %{__cc}|;

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