- fix building on x32

- qdoc requires clang-devel

diff --git a/qt6.spec b/qt6.spec
index 7c192928df72a4844fb85a9a92719f3ddd178c9b..675cbc336768a98930050006d01124b2ac23fd24 100644 (file)
--- a/qt6.spec
+++ b/qt6.spec
@@ -75,6 +75,7 @@ Patch0:               system-cacerts.patch
 Patch1:                ninja-program.patch
 Patch2:                %{name}-gn.patch
 Patch3:                no-implicit-sse2.patch
+Patch4:                x32.patch
 URL:           https://www.qt.io/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: EGL-devel
@@ -87,6 +88,8 @@ BuildRequires:        alsa-lib-devel
 BuildRequires: assimp-devel >= 5
 BuildRequires: at-spi2-core-devel
 BuildRequires: bluez-libs-devel
+# qdoc
+BuildRequires: clang-devel
 # base dir requires 3.16, gn 3.19
 BuildRequires: cmake >= 3.19
 %{?with_cups:BuildRequires:    cups-devel >= 1.4}
@@ -477,8 +480,8 @@ Summary(pl.UTF-8):  Biblioteka Qt6 DataVisualization
 Group:         X11/Libraries
 Requires:      Qt6Core >= %{version}
 Requires:      Qt6Gui >= %{version}
-Requires:      Qt6Qml >= %{qtdeclarative_ver}
-Requires:      Qt6Quick >= %{qtdeclarative_ver}
+Requires:      Qt6Qml >= %{version}
+Requires:      Qt6Quick >= %{version}
 
 %description -n Qt6DataVisualization
 Qt6 DataVisualization library.
@@ -1337,6 +1340,7 @@ Generator plików makefile dla aplikacji Qt6.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
 

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..64acc2d
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-src-6.3.1/qtbase/src/corelib/thread/qthread.h~       2022-05-25 10:58:52.000000000 +0200
++++ qt-everywhere-src-6.3.1/qtbase/src/corelib/thread/qthread.h        2022-08-01 21:54:57.783355420 +0200
+@@ -196,7 +196,7 @@
+ #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_DARWIN64)
+     // 64bit macOS uses GS, see https://github.com/apple/darwin-xnu/blob/master/libsyscall/os/tsd.h
+     __asm__("movq %%gs:0, %0" : "=r" (tid) : : );
+-#elif defined(Q_PROCESSOR_X86_64) && (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)
++#elif (defined(Q_PROCESSOR_X86_64) && !defined(__ILP32__)) && (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)
+     // x86_64 Linux, BSD uses FS
+     __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : );
+ #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN)