From 45bb4ac181b75fc21cea4055ef94f8587685b360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 29 May 2021 11:49:19 +0700 Subject: [PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 See: /usr/lib/qt6/mkspecs/modules/qt_lib_core_private.pri It should say "-latomic" instead of "atomic". --- srcpkgs/qt6-base/patches/libatomic.patch | 14 ++++++++++++++ srcpkgs/qt6-base/template | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/qt6-base/patches/libatomic.patch diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch new file mode 100644 index 00000000000..edbe5e609d5 --- /dev/null +++ b/srcpkgs/qt6-base/patches/libatomic.patch @@ -0,0 +1,14 @@ +Index: cmake/FindWrapAtomic.cmake +=================================================================== +--- cmake/FindWrapAtomic.cmake.orig ++++ cmake/FindWrapAtomic.cmake +@@ -38,7 +38,8 @@ endif() + + add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) + if(HAVE_STDATOMIC_WITH_LIB) +- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic) ++ find_library(LIBATOMIC atomic REQUIRED) ++ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC}) + endif() + + set(WrapAtomic_FOUND 1) diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index c720e7f5167..d03dfe7a212 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -1,7 +1,7 @@ # Template file for 'qt6-base' pkgname=qt6-base version=6.1.0 -revision=1 +revision=2 wrksrc="qtbase-everywhere-src-${version}" build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 @@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader" short_desc="Cross-platform application and UI framework (QT6)" maintainer="John " -license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" +license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz" checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4