diff -Nru qtdeclarative-opensource-src-5.15.4+dfsg/debian/changelog qtdeclarative-opensource-src-5.15.4+dfsg/debian/changelog --- qtdeclarative-opensource-src-5.15.4+dfsg/debian/changelog 2022-06-13 18:36:23.000000000 +0000 +++ qtdeclarative-opensource-src-5.15.4+dfsg/debian/changelog 2022-06-23 04:00:15.000000000 +0000 @@ -1,3 +1,14 @@ +qtdeclarative-opensource-src (5.15.4+dfsg-3+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 5.14.2+dfsg-2+rpi1 by Peter Michael Green at Sat, 04 Jul 2020 19:53:58 +0000] + * Update symbols file for raspbian. + + [changes introduced in 5.14.2+dfsg-3+rpi1 by Peter Michael Green] + * Mark a gcc 10 only symbol as optional. + * Disable testsuite. + + -- Raspbian forward porter Thu, 23 Jun 2022 04:00:15 +0000 + qtdeclarative-opensource-src (5.15.4+dfsg-3) unstable; urgency=medium * Upload to unstable. diff -Nru qtdeclarative-opensource-src-5.15.4+dfsg/debian/libqt5qml5.symbols qtdeclarative-opensource-src-5.15.4+dfsg/debian/libqt5qml5.symbols --- qtdeclarative-opensource-src-5.15.4+dfsg/debian/libqt5qml5.symbols 2022-06-13 18:36:23.000000000 +0000 +++ qtdeclarative-opensource-src-5.15.4+dfsg/debian/libqt5qml5.symbols 2022-06-23 04:00:15.000000000 +0000 @@ -984,9 +984,9 @@ _ZTIN6QQmlJS3AST9UiProgramE@Qt_5 5.3.0 (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Qt_5 5.14.1 (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_5 5.14.1 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 + (optional=notarmelandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_5 5.14.1 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 + (optional=notarmelandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Qt_5 5.14.1 _ZTS10QQmlEngine@Qt_5 5.0.2 _ZTS11QQmlContext@Qt_5 5.0.2 @@ -1133,9 +1133,9 @@ _ZTSN6QQmlJS3AST9UiProgramE@Qt_5 5.3.0 (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Qt_5 5.14.1 (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_5 5.14.1 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 + (optional=notarmelandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_5 5.14.1 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 + (optional=notarmelandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_5 5.14.1 _ZTSSt19_Sp_make_shared_tag@Qt_5 5.14.1 _ZTV10QQmlEngine@Qt_5 5.0.2 _ZTV11QQmlContext@Qt_5 5.0.2 diff -Nru qtdeclarative-opensource-src-5.15.4+dfsg/debian/rules qtdeclarative-opensource-src-5.15.4+dfsg/debian/rules --- qtdeclarative-opensource-src-5.15.4+dfsg/debian/rules 2022-06-13 18:36:23.000000000 +0000 +++ qtdeclarative-opensource-src-5.15.4+dfsg/debian/rules 2022-06-23 04:00:15.000000000 +0000 @@ -62,7 +62,7 @@ dh_link -pqml usr/lib/qt5/bin/qml usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qml override_dh_auto_test-arch: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitdisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) install INSTALL_ROOT=$(CURDIR)/test_root mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine # - hppa: QML engine is broken, see bug #973659