diff --git a/debian/changelog b/debian/changelog index ece96fe..9b1eb35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,19 @@ qt6-base (6.3.0+dfsg-1) UNRELEASED; urgency=medium -- Debian Qt/KDE Maintainers Sun, 01 May 2022 01:08:36 +0200 +qt6-base (6.2.4+dfsg-7) unstable; urgency=medium + + * Team upload. + + [ Dmitry Shachnev ] + * Backport two upstream patches to fix libatomic detection. + * Update symbols files from buildds’ logs. + + [ Lu YaNing ] + * Modify LibraryExecutables path. + + -- Dmitry Shachnev Sat, 14 May 2022 20:14:37 +0300 + qt6-base (6.2.4+dfsg-6) unstable; urgency=medium * Team upload. diff --git a/debian/libqt6dbus6.symbols b/debian/libqt6dbus6.symbols index 6024189..298252d 100644 --- a/debian/libqt6dbus6.symbols +++ b/debian/libqt6dbus6.symbols @@ -411,8 +411,8 @@ libQt6DBus.so.6 libqt6dbus6 #MINVER# _ZNK24QDBusConnectionInterface23activatableServiceNamesEv@Qt_6 6.1.2 (optional=templinst)_ZNKSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE4findERS2_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_@Qt_6 6.1.2 - (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Qt_6 6.1.2 - (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE11equal_rangeERS2_@Qt_6 6.1.2 + (optional=templinst|arch=arm64 ppc64el riscv64 sh4 sparc64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Qt_6 6.1.2 + (optional=templinst|arch=arm64 ppc64el riscv64 sh4 sparc64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE11equal_rangeERS2_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS3_ESB_@Qt_6 6.1.2 (optional=templinst|arch=!armel !armhf)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE16_M_insert_uniqueIS3_EES1_ISt17_Rb_tree_iteratorIS3_EbEOT_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE24_M_get_insert_unique_posERS2_@Qt_6 6.1.2 diff --git a/debian/libqt6network6.symbols b/debian/libqt6network6.symbols index fce9558..153a0f6 100644 --- a/debian/libqt6network6.symbols +++ b/debian/libqt6network6.symbols @@ -1328,7 +1328,7 @@ libQt6Network.so.6 libqt6network6 #MINVER# (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeI10QByteArraySt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE16_M_insert_uniqueIS4_EES1_ISt17_Rb_tree_iteratorIS4_EbEOT_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeI10QByteArraySt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE16_M_insert_uniqueIS3_EES1_ISt17_Rb_tree_iteratorIS3_EbEOT_@Qt_6 6.1.2 - (optional=templinst)_ZNSt8_Rb_treeI9QDateTimeSt4pairIKS0_7QStringESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE28_M_get_insert_hint_equal_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Qt_6 6.1.2 + (optional=templinst|arch=amd64 ppc64el riscv64 sh4 sparc64)_ZNSt8_Rb_treeI9QDateTimeSt4pairIKS0_7QStringESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE28_M_get_insert_hint_equal_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Qt_6 6.1.2 (optional=templinst)_ZSt14__copy_move_a1ILb1EPjjEN9__gnu_cxx11__enable_ifIXsrSt23__is_random_access_iterIT0_NSt15iterator_traitsIS4_E17iterator_categoryEE7__valueESt15_Deque_iteratorIT1_RSA_PSA_EE6__typeES4_S4_SD_@Qt_6 6.1.2 (optional=templinst|arch=!amd64 !arm64 !sh4)_ZSt15__copy_move_ditILb1EjRjPjSt15_Deque_iteratorIjS0_S1_EET3_S2_IT0_T1_T2_ES8_S4_@Qt_6 6.2.1 (optional=templinst)_ZSt23__copy_move_backward_a1ILb1EPjjEN9__gnu_cxx11__enable_ifIXsrSt23__is_random_access_iterIT0_NSt15iterator_traitsIS4_E17iterator_categoryEE7__valueESt15_Deque_iteratorIT1_RSA_PSA_EE6__typeES4_S4_SD_@Qt_6 6.1.2 diff --git a/debian/libqt6widgets6.symbols b/debian/libqt6widgets6.symbols index 2bbdcbc..3016661 100644 --- a/debian/libqt6widgets6.symbols +++ b/debian/libqt6widgets6.symbols @@ -6363,7 +6363,7 @@ libQt6Widgets.so.6 libqt6widgets6 #MINVER# (optional=templinst)_ZNSt8_Rb_treeIN2Qt11GestureTypeESt4pairIKS1_P7QWidgetESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE16_M_insert_uniqueIS6_EES2_ISt17_Rb_tree_iteratorIS6_EbEOT_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIN2Qt11GestureTypeESt4pairIKS1_bESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE16_M_insert_uniqueIS4_EES2_ISt17_Rb_tree_iteratorIS4_EbEOT_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIP13QGraphicsItemSt4pairIKS1_S1_ESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE28_M_get_insert_hint_equal_posESt23_Rb_tree_const_iteratorIS4_ERS3_@Qt_6 6.1.2 - (optional=templinst)_ZNSt8_Rb_treeIP7QObjectSt4pairIKS1_N2Qt11GestureTypeEESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE28_M_get_insert_hint_equal_posESt23_Rb_tree_const_iteratorIS6_ERS3_@Qt_6 6.1.2 + (optional=templinst|arch=amd64 arm64 ppc64el riscv64 sh4 sparc64)_ZNSt8_Rb_treeIP7QObjectSt4pairIKS1_N2Qt11GestureTypeEESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE28_M_get_insert_hint_equal_posESt23_Rb_tree_const_iteratorIS6_ERS3_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIP7QObjectSt4pairIKS1_P9QScrollerESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE24_M_get_insert_unique_posERS3_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIP7QObjectSt4pairIKS1_P9QScrollerESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS3_@Qt_6 6.1.2 (optional=templinst|arch=amd64 arm64 sh4)_ZNSt8_Rb_treeIiSt4pairIKi11QEventPointESt10_Select1stIS3_ESt4lessIiESaIS3_EE16_M_insert_uniqueIS3_EES0_ISt17_Rb_tree_iteratorIS3_EbEOT_@Qt_6 6.1.2 @@ -6373,9 +6373,9 @@ libQt6Widgets.so.6 libqt6widgets6 #MINVER# (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKi7QStringESt10_Select1stIS3_ESt4lessIiESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS1_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKi8QVariantESt10_Select1stIS3_ESt4lessIiESaIS3_EE16_M_insert_uniqueIS3_EES0_ISt17_Rb_tree_iteratorIS3_EbEOT_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKi8QVariantESt10_Select1stIS3_ESt4lessIiESaIS3_EE24_M_get_insert_unique_posERS1_@Qt_6 6.1.2 - (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKi8QVariantESt10_Select1stIS3_ESt4lessIiESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS1_@Qt_6 6.1.2 + (optional=templinst|arch=amd64 arm64 ppc64el riscv64 sh4 sparc64)_ZNSt8_Rb_treeIiSt4pairIKi8QVariantESt10_Select1stIS3_ESt4lessIiESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS1_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiP11QWizardPageESt10_Select1stIS4_ESt4lessIiESaIS4_EE24_M_get_insert_unique_posERS1_@Qt_6 6.1.2 - (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiP11QWizardPageESt10_Select1stIS4_ESt4lessIiESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS1_@Qt_6 6.1.2 + (optional=templinst|arch=amd64 arm64 ppc64el riscv64 sh4 sparc64)_ZNSt8_Rb_treeIiSt4pairIKiP11QWizardPageESt10_Select1stIS4_ESt4lessIiESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS1_@Qt_6 6.1.2 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiP13QGraphicsItemESt10_Select1stIS4_ESt4lessIiESaIS4_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS4_ESC_@Qt_6 6.1.2 (optional=templinst|arch=amd64 arm64 sh4)_ZNSt8_Rb_treeIiSt4pairIKiP13QGraphicsItemESt10_Select1stIS4_ESt4lessIiESaIS4_EE16_M_insert_uniqueIS4_EES0_ISt17_Rb_tree_iteratorIS4_EbEOT_@Qt_6 6.2.1 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiP13QGraphicsItemESt10_Select1stIS4_ESt4lessIiESaIS4_EE24_M_get_insert_unique_posERS1_@Qt_6 6.1.2 diff --git a/debian/patches/series b/debian/patches/series index 37f81df..6369c2b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,7 @@ +# fixed in 6.3.1 +upstream_Explicitly-check-for-atomic-addition.patch +upstream_Hardcode-atomic_LIB-as-latomic.patch + # fixed in 6.4 upstream_CMake-add-support-for-GNU-Hurd.patch upstream_QProcess-Unix-fallback-on-_POSIX_PIPE_BUF-w-missing-.patch diff --git a/debian/patches/upstream_Explicitly-check-for-atomic-addition.patch b/debian/patches/upstream_Explicitly-check-for-atomic-addition.patch new file mode 100644 index 0000000..da9c3a6 --- /dev/null +++ b/debian/patches/upstream_Explicitly-check-for-atomic-addition.patch @@ -0,0 +1,82 @@ +From 4088b27b9397fa9877bf60b8e707bba5dc51e9cb Mon Sep 17 00:00:00 2001 +From: Moody Liu +Date: Tue, 12 Apr 2022 10:40:00 +0100 +Subject: [PATCH] Explicitly check for atomic addition and relaxed load + operation support + +...and properly find and link against `libatomic` using find_library. +This fixes the qtdeclarative build on the RISC-V platform. + +Initial-patch-by: Sprite +Pick-to: 6.2 +Pick-to: 6.3 +Task-number: QTBUG-99234 +Change-Id: I2b5e4812886ce45cb02bed3106ce8c519b294cbe +Reviewed-by: Thiago Macieira +Reviewed-by: Jörg Bornemann +--- + cmake/FindWrapAtomic.cmake | 34 +++++++++++++++++++--------------- + 1 file changed, 19 insertions(+), 15 deletions(-) + +diff --git a/cmake/FindWrapAtomic.cmake b/cmake/FindWrapAtomic.cmake +index c2582bdd6b..3ea72bb188 100644 +--- a/cmake/FindWrapAtomic.cmake ++++ b/cmake/FindWrapAtomic.cmake +@@ -10,35 +10,39 @@ include(CheckCXXSourceCompiles) + set (atomic_test_sources "#include + #include + +-void test(volatile std::atomic &a) +-{ +- std::int64_t v = a.load(std::memory_order_acquire); +- while (!a.compare_exchange_strong(v, v + 1, +- std::memory_order_acq_rel, +- std::memory_order_acquire)) { +- v = a.exchange(v - 1); +- } +- a.store(v + 1, std::memory_order_release); +-} +- + int main(int, char **) + { +- void *ptr = (void*)0xffffffc0; // any random pointer +- test(*reinterpret_cast *>(ptr)); ++ volatile std::atomic size_1; ++ volatile std::atomic size_2; ++ volatile std::atomic size_4; ++ volatile std::atomic size_8; ++ ++ ++size_1; ++ ++size_2; ++ ++size_4; ++ ++size_8; ++ ++ (void)size_1.load(std::memory_order_relaxed); ++ (void)size_2.load(std::memory_order_relaxed); ++ (void)size_4.load(std::memory_order_relaxed); ++ (void)size_8.load(std::memory_order_relaxed); ++ + return 0; + }") + + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC) + if(NOT HAVE_STDATOMIC) + set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}") +- set(CMAKE_REQUIRED_LIBRARIES "atomic") ++ find_library(atomic_LIB atomic REQUIRED) ++ set(CMAKE_REQUIRED_LIBRARIES ${atomic_LIB}) + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB) + set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}") + endif() + + add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) + if(HAVE_STDATOMIC_WITH_LIB) +- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic) ++ # atomic_LIB is already found above. ++ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${atomic_LIB}) + endif() + + set(WrapAtomic_FOUND 1) +-- +2.35.1 + diff --git a/debian/patches/upstream_Hardcode-atomic_LIB-as-latomic.patch b/debian/patches/upstream_Hardcode-atomic_LIB-as-latomic.patch new file mode 100644 index 0000000..034b8ca --- /dev/null +++ b/debian/patches/upstream_Hardcode-atomic_LIB-as-latomic.patch @@ -0,0 +1,35 @@ +From e2a8b0adbd099cfda84e931f6a24f34e80b12fd7 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Sat, 7 May 2022 20:51:25 +0300 +Subject: [PATCH] Hardcode atomic_LIB as -latomic + +find_library does not always work because libatomic.so may be in a path +like /usr/lib/gcc/x86_64-linux-gnu/11/libatomic.so, which CMake does not +consider by default. + +Pick-to: 6.3 +Change-Id: I73a657c470efa4f84f8629bd531edfcac3b3a352 +Reviewed-by: Alexey Edelev +Reviewed-by: Thiago Macieira +Reviewed-by: Qt CI Bot +Reviewed-by: Jörg Bornemann +--- + cmake/FindWrapAtomic.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindWrapAtomic.cmake b/cmake/FindWrapAtomic.cmake +index 3ea72bb188..006be0ed8f 100644 +--- a/cmake/FindWrapAtomic.cmake ++++ b/cmake/FindWrapAtomic.cmake +@@ -33,7 +33,7 @@ int main(int, char **) + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC) + if(NOT HAVE_STDATOMIC) + set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}") +- find_library(atomic_LIB atomic REQUIRED) ++ set(atomic_LIB "-latomic") + set(CMAKE_REQUIRED_LIBRARIES ${atomic_LIB}) + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB) + set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}") +-- +2.35.1 + diff --git a/debian/qt.conf.in b/debian/qt.conf.in index 530bdcf..ea99272 100644 --- a/debian/qt.conf.in +++ b/debian/qt.conf.in @@ -9,7 +9,7 @@ HostBinaries=lib/qt6/bin HostData=lib/@DEB_HOST_MULTIARCH@/qt6 HostLibraries=lib/@DEB_HOST_MULTIARCH@ Libraries=lib/@DEB_HOST_MULTIARCH@ -LibraryExecutables=lib/@DEB_HOST_MULTIARCH@/qt6/mkspecs +LibraryExecutables=lib/qt6/libexec Plugins=lib/@DEB_HOST_MULTIARCH@/qt6/plugins Qml2Imports=lib/@DEB_HOST_MULTIARCH@/qt6/qml Settings=/etc/xdg