- use cmake for build to reliably pass configs options to build system

- fix building on x32

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 837c8e10329c185d928a4baf5626b846cd075331..7e04879185c8b5e68384f799452ab18c537a7f9e 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -202,21 +202,45 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 %patch108 -p1
 
 %build
+mkdir -p build
+cd build
+CFLAGS="%{rpmcflags}"; export CFLAGS
 CXXFLAGS="%{rpmcxxflags} -fpermissive"; export CXXFLAGS
-qmake-qt5 \
-       %{?with_qtmultimedia:WEBKIT_CONFIG+=use_qtmultimedia}
+# We cannot use default cmake macro here as it overwrites some settings queried
+# by qtwebkit cmake from qmake
+cmake \
+       -DPORT=Qt \
+       -DCMAKE_BUILD_TYPE=Release \
+       -DENABLE_TOOLS=OFF \
+       -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
+       -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
+       -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+       %{?with_qtmultimedia:-DUSE_QT_MULTIMEDIA:BOOL=ON} \
+       %{?with_doc:-DGENERATE_DOCUMENTATION=ON} \
+%if "%{_lib}" == "lib64"
+       -DLIB_SUFFIX=64 \
+%endif
+%if "%{_lib}" == "libx32"
+       -DLIB_SUFFIX=x32 \
+%endif
+%ifarch x32
+       -DENABLE_JIT=OFF \
+%endif
+       ..
 
 %{__make}
 %{?with_doc:%{__make} docs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+cd build
 %{__make} install \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with doc}
 %{__make} install_docs \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 # kill unnecessary -L%{_libdir} from *.pc

diff --git a/x32.patch b/x32.patch
index f9911c34e6f85e796210679cd0f469685f19b88b..c5913f942127422500df66738c70e764bde7abd6 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,15 +1,21 @@
---- webkit-qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/assembler/MacroAssembler.h.orig       2018-11-22 19:45:23.473588054 +0100
-+++ webkit-qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/assembler/MacroAssembler.h    2018-11-22 19:45:05.290379269 +0100
-@@ -1152,10 +1152,12 @@
-         case 0xffff:
-         case 0xffffff:
-         case 0xffffffffL:
-+#ifndef __ILP32__
-         case 0xffffffffffL:
-         case 0xffffffffffffL:
-         case 0xffffffffffffffL:
-         case 0xffffffffffffffffL:
+From: Daniel Schepler <dschepler@gmail.com>
+Subject: Fix FTBFS in x32
+Bug-Debian: https://bugs.debian.org/700795
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -179,9 +179,13 @@
+ /* 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
+ #define WTF_CPU_X86_SSE2 1
+ #endif
 +#endif
-             return false;
-         default: {
-             if (value <= 0xff)
+ 
+ /* CPU(ARM64) - Apple */
+ #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)