6.2.4+dfsg-7 unstable; urgency=medium
-----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEE5688gqe4PSusUZcLZkYmW1hrg8sFAmJ/5PkTHG1pdHlhNTdA ZGViaWFuLm9yZwAKCRBmRiZbWGuDy5EoD/wN/xznFEfPL8/eVhFsvsDXIysndIQV N7GpO57VUdGsfeK2fjqbdv3lblvytqvG5jk6KF5ihAUyR1s4YxoYUMUilyjmXaB+ eGoMj8PEG3yA6xncAxNBRYCEaUfdUO6OsGWyPew1EULclvtX56ot/iN8GTSQWv6J SYrJxF7xH5nq0Sn8CVPbauFR/wPu5k2644cVVcFAJ6Xw265iY/I9Ndy4XJHdfH5i VS36AotbqLrrcJBvnx4E3G/rzZT5ArqCzJq4Wnz+Z4f1TF4UzFhp46FkyFFRE0IS H41UWrAY6DcS31wysSxHz1YPdOc/WMm1o+JEdhNqq0YrfXa8h+Don66eTvkntSFd cmSbqW69aZvhOYEjb8Yd8IDyVgZD9sO3SIFLcePCt3nh5f8KtWl4bKn7CHq5BGnm W83whObuGCFM1lfAuZqIperh9hhSlSnsvu0eFRtw6rpB5CLmCFozqJNauX2ml6H5 TlbILE3iw7kEEHs0SNzwt+QoXWc4X1Z3E6CzV5mFEXMYMrTkMUrQ4ChTrums2r88 ZJZgtn6xxLNrVivzMUu85Td27egZWMP8OL8R++oDtnuobQ2MpcYl0kXFOWgJy2Mk MIL6gLsuz/03uzkwXMjFwAryF9wN+gdTaj0cRpy38yGAmhBduirHjTuQxaq52WyZ D/CVeP2lYb2egQ== =HnZA -----END PGP SIGNATURE----- Merge tag 'debian/6.2.4+dfsg-7' into experimental 6.2.4+dfsg-7 unstable; urgency=medium
This commit is contained in:
Dmitry Shachnev
commit
fec0a88773
13
debian/changelog
vendored
13
debian/changelog
vendored
@ -11,6 +11,19 @@ qt6-base (6.3.0+dfsg-1) UNRELEASED; urgency=medium
|
||||
|
||||
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> 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 <mitya57@debian.org> Sat, 14 May 2022 20:14:37 +0300
|
||||
|
||||
qt6-base (6.2.4+dfsg-6) unstable; urgency=medium
|
||||
|
||||
* Team upload.
|
||||
|
||||
4
debian/libqt6dbus6.symbols
vendored
4
debian/libqt6dbus6.symbols
vendored
@ -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
|
||||
|
||||
2
debian/libqt6network6.symbols
vendored
2
debian/libqt6network6.symbols
vendored
@ -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
|
||||
|
||||
6
debian/libqt6widgets6.symbols
vendored
6
debian/libqt6widgets6.symbols
vendored
@ -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
|
||||
|
||||
4
debian/patches/series
vendored
4
debian/patches/series
vendored
@ -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
|
||||
|
||||
82
debian/patches/upstream_Explicitly-check-for-atomic-addition.patch
vendored
Normal file
82
debian/patches/upstream_Explicitly-check-for-atomic-addition.patch
vendored
Normal file
@ -0,0 +1,82 @@
|
||||
From 4088b27b9397fa9877bf60b8e707bba5dc51e9cb Mon Sep 17 00:00:00 2001
|
||||
From: Moody Liu <mooodyhunter@outlook.com>
|
||||
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 <SpriteOvO@gmail.com>
|
||||
Pick-to: 6.2
|
||||
Pick-to: 6.3
|
||||
Task-number: QTBUG-99234
|
||||
Change-Id: I2b5e4812886ce45cb02bed3106ce8c519b294cbe
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
||||
---
|
||||
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 <atomic>
|
||||
#include <cstdint>
|
||||
|
||||
-void test(volatile std::atomic<std::int64_t> &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<std::atomic<std::int64_t> *>(ptr));
|
||||
+ volatile std::atomic<char> size_1;
|
||||
+ volatile std::atomic<short> size_2;
|
||||
+ volatile std::atomic<int> size_4;
|
||||
+ volatile std::atomic<int64_t> 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
|
||||
|
||||
35
debian/patches/upstream_Hardcode-atomic_LIB-as-latomic.patch
vendored
Normal file
35
debian/patches/upstream_Hardcode-atomic_LIB-as-latomic.patch
vendored
Normal file
@ -0,0 +1,35 @@
|
||||
From e2a8b0adbd099cfda84e931f6a24f34e80b12fd7 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Shachnev <mitya57@gmail.com>
|
||||
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 <alexey.edelev@qt.io>
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
||||
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
||||
---
|
||||
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
|
||||
|
||||
2
debian/qt.conf.in
vendored
2
debian/qt.conf.in
vendored
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user