extra/qt6-base: atomic fix for i486 (more to come)

2 files changed, 44 insertions, 2 deletions

diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD
index a5dc07b9..5ce557f9 100644
--- a/extra/qt6-base/PKGBUILD
+++ b/extra/qt6-base/PKGBUILD
@@ -1,11 +1,11 @@
 # add -latomic where needed (i486)
 if [ "$CARCH" = 'i486' ]; then
   source+=('qtbase-everywhere-src-6.1.0-atomic.patch')
-  sha256sums+=('425e92fef5fe05530a73e80d00d574436de39101c27ffcf4901626598d997e5c')
+  sha256sums+=('93a74717564e003918941c6e4ca1866a0c252995c9b79508c0755e182df6adf7')
   eval "$(
     declare -f prepare | \
       sed '
-        /patch.*nostrip.*/ a \ patch -d $_pkgfn -p1 -i "${srcdir}/qtbase-everywhere-src-6.1.0-atomic.patch"
+        /patch.*nostrip.*/ a \ patch -d $_pkgfn -p1 -i ../qtbase-everywhere-src-6.1.0-atomic.patch
       '
   )"
 fi
diff --git a/extra/qt6-base/qtbase-everywhere-src-6.1.0-atomic.patch b/extra/qt6-base/qtbase-everywhere-src-6.1.0-atomic.patch
new file mode 100644
index 00000000..1a657b0f
--- /dev/null
+++ b/extra/qt6-base/qtbase-everywhere-src-6.1.0-atomic.patch
@@ -0,0 +1,42 @@
+diff -rauN qtbase-everywhere-src-6.1.0/src/corelib/CMakeLists.txt qtbase-everywhere-src-6.1.0-atomic-patch/src/corelib/CMakeLists.txt
+--- qtbase-everywhere-src-6.1.0/src/corelib/CMakeLists.txt	2021-04-30 11:31:33.000000000 +0200
++++ qtbase-everywhere-src-6.1.0-atomic-patch/src/corelib/CMakeLists.txt	2021-06-05 09:19:33.105924646 +0200
+@@ -1037,6 +1037,11 @@
+         ${FWUIKit}
+ )
+ 
++qt_internal_extend_target(Core CONDITION UNIX
++    LIBRARIES
++        atomic
++)
++
+ qt_internal_extend_target(Core CONDITION WATCHOS
+     LIBRARIES
+         ${FWWatchKit}
+diff -rauN qtbase-everywhere-src-6.1.0/src/gui/CMakeLists.txt qtbase-everywhere-src-6.1.0-atomic-patch/src/gui/CMakeLists.txt
+--- qtbase-everywhere-src-6.1.0/src/gui/CMakeLists.txt	2021-04-30 11:31:33.000000000 +0200
++++ qtbase-everywhere-src-6.1.0-atomic-patch/src/gui/CMakeLists.txt	2021-06-05 09:27:09.143983098 +0200
+@@ -849,6 +849,11 @@
+         ${CMAKE_DL_LIBS}
+ )
+ 
++qt_internal_extend_target(Gui CONDITION UNIX
++    LIBRARIES
++        atomic
++)
++
+ qt_internal_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
+     SOURCES
+         itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h
+diff -rauN qtbase-everywhere-src-6.1.0/src/plugins/imageformats/jpeg/CMakeLists.txt qtbase-everywhere-src-6.1.0-atomic-patch/src/plugins/imageformats/jpeg/CMakeLists.txt
+--- qtbase-everywhere-src-6.1.0/src/plugins/imageformats/jpeg/CMakeLists.txt	2021-04-30 11:31:33.000000000 +0200
++++ qtbase-everywhere-src-6.1.0-atomic-patch/src/plugins/imageformats/jpeg/CMakeLists.txt	2021-06-05 10:21:32.457384623 +0200
+@@ -102,3 +102,8 @@
+     DEFINES
+         _CRT_SECURE_NO_WARNINGS
+ )
++
++qt_internal_extend_target(QJpegPlugin CONDITION UNIX
++    LIBRARIES
++        atomic
++)