diff -Nru qtdeclarative-opensource-src-5.10.1/debian/changelog qtdeclarative-opensource-src-5.10.1/debian/changelog --- qtdeclarative-opensource-src-5.10.1/debian/changelog 2018-04-09 23:44:03.000000000 +0000 +++ qtdeclarative-opensource-src-5.10.1/debian/changelog 2018-04-18 20:44:31.000000000 +0000 @@ -1,3 +1,23 @@ +qtdeclarative-opensource-src (5.10.1-4+rpi1) buster-staging; urgency=medium + + [changes brought forward from 5.3.2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 03 Oct 2014 08:10:59 +0000] + * Fix clean target. + + [changes introduced in 5.6.1-11+rpi1 by Peter Michael Green] + * Further fixes to clean target. + + [changes introduced in 5.7.1~20161021-5+rpi1 by Peter Michael Green] + * Use sed to replace "arch=amd64 arm64 armhf i386)" "with optional=meh)" in + debian/libqt5qml5.symbols . The symbols don't seem to appear in raspbian and + I doubt they are important (probablly some sort of template instantiation + or similar crap). + * Further fixes to clean target. + + [Changed introduced in 5.9.1-5+rpi by Peter Michael Green] + * Extend symbols file hack. + + -- Peter Michael Green <plugwash@raspbian.org> Wed, 18 Apr 2018 20:44:31 +0000 + qtdeclarative-opensource-src (5.10.1-4) unstable; urgency=high * Avoid marking hidden windows as updatePending in Gui render loop diff -Nru qtdeclarative-opensource-src-5.10.1/debian/morecraptoremove qtdeclarative-opensource-src-5.10.1/debian/morecraptoremove --- qtdeclarative-opensource-src-5.10.1/debian/morecraptoremove 1970-01-01 00:00:00.000000000 +0000 +++ qtdeclarative-opensource-src-5.10.1/debian/morecraptoremove 2018-04-18 20:44:31.000000000 +0000 @@ -0,0 +1,97 @@ +.dbus/session-bus/ce4498b8f75f437fb558dcc2feda5e8c-99 +examples/qml/tutorials/extending-qml/chapter6-plugins/Charts/qmldir +src/particles/QtQuickParticles.version +src/qml/QtQml.version.in +src/qmltest/QtQuickTest.version.in +src/quick/QtQuick.version.in +src/quickwidgets/QtQuickWidgets.version.in +tests/auto/cmake/build/CMakeCache.txt +tests/auto/cmake/build/CMakeFiles/3.6.2/CMakeCCompiler.cmake +tests/auto/cmake/build/CMakeFiles/3.6.2/CMakeCXXCompiler.cmake +tests/auto/cmake/build/CMakeFiles/3.6.2/CMakeSystem.cmake +tests/auto/cmake/build/CMakeFiles/3.6.2/CompilerIdC/CMakeCCompilerId.c +tests/auto/cmake/build/CMakeFiles/3.6.2/CompilerIdCXX/CMakeCXXCompilerId.cpp +tests/auto/cmake/build/CMakeFiles/CMakeDirectoryInformation.cmake +tests/auto/cmake/build/CMakeFiles/CMakeOutput.log +tests/auto/cmake/build/CMakeFiles/Makefile.cmake +tests/auto/cmake/build/CMakeFiles/Makefile2 +tests/auto/cmake/build/CMakeFiles/TargetDirectories.txt +tests/auto/cmake/build/CMakeFiles/cmake.check_cache +tests/auto/cmake/build/CMakeFiles/feature_tests.c +tests/auto/cmake/build/CMakeFiles/feature_tests.cxx +tests/auto/cmake/build/CMakeFiles/progress.marks +tests/auto/cmake/build/CTestTestfile.cmake +tests/auto/cmake/build/Makefile +tests/auto/cmake/build/Testing/Temporary/CTestCostData.txt +tests/auto/cmake/build/Testing/Temporary/LastTest.log +tests/auto/cmake/build/Testing/Temporary/LastTestsFailed.log +tests/auto/cmake/build/cmake_install.cmake +tests/auto/cmake/build/module_includes/CMakeLists.txt +tests/auto/cmake/build/module_includes/build/CMakeCache.txt +tests/auto/cmake/build/module_includes/build/CMakeFiles/3.6.2/CMakeCCompiler.cmake +tests/auto/cmake/build/module_includes/build/CMakeFiles/3.6.2/CMakeCXXCompiler.cmake +tests/auto/cmake/build/module_includes/build/CMakeFiles/3.6.2/CMakeSystem.cmake +tests/auto/cmake/build/module_includes/build/CMakeFiles/3.6.2/CompilerIdC/CMakeCCompilerId.c +tests/auto/cmake/build/module_includes/build/CMakeFiles/3.6.2/CompilerIdCXX/CMakeCXXCompilerId.cpp +tests/auto/cmake/build/module_includes/build/CMakeFiles/CMakeOutput.log +tests/auto/cmake/build/module_includes/build/CMakeFiles/cmake.check_cache +tests/auto/cmake/build/module_includes/build/CMakeFiles/feature_tests.c +tests/auto/cmake/build/module_includes/build/CMakeFiles/feature_tests.cxx +tests/auto/cmake/build/module_includes/main.cpp +tests/auto/cmake/build/test_plugins/CMakeCache.txt +tests/auto/cmake/build/test_plugins/CMakeFiles/3.6.2/CMakeCCompiler.cmake +tests/auto/cmake/build/test_plugins/CMakeFiles/3.6.2/CMakeCXXCompiler.cmake +tests/auto/cmake/build/test_plugins/CMakeFiles/3.6.2/CMakeSystem.cmake +tests/auto/cmake/build/test_plugins/CMakeFiles/3.6.2/CompilerIdC/CMakeCCompilerId.c +tests/auto/cmake/build/test_plugins/CMakeFiles/3.6.2/CompilerIdCXX/CMakeCXXCompilerId.cpp +tests/auto/cmake/build/test_plugins/CMakeFiles/CMakeOutput.log +tests/auto/cmake/build/test_plugins/CMakeFiles/cmake.check_cache +tests/auto/cmake/build/test_plugins/CMakeFiles/feature_tests.c +tests/auto/cmake/build/test_plugins/CMakeFiles/feature_tests.cxx +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestPluginWithQmlFile/MyQmlFile.qml +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestPluginWithQmlFile/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlMixedPluginType/Foo.qml +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlMixedPluginType/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlNestedPluginType/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlPluginType.2.1/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlPluginType.2/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlPluginType/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlVersionPluginType/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/InvalidFirstCommandModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/InvalidNamespaceModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/InvalidStrictModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/NonstrictModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PreemptedStrictModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PreemptiveModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/ProtectedModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/StrictModule.2/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/StrictModule/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/WrongCase/qmldir +tests/auto/qml/temp.qml +tests/benchmarks/qml/librarymetrics_performance/.rcc/qmake_qmake_immediate.qrc +qml/Qt/labs/folderlistmodel/plugins.qmltypes +qml/Qt/labs/folderlistmodel/qmldir +qml/Qt/labs/settings/plugins.qmltypes +qml/Qt/labs/settings/qmldir +qml/QtQml/Models.2/plugins.qmltypes +qml/QtQml/Models.2/qmldir +qml/QtQml/StateMachine/plugins.qmltypes +qml/QtQml/StateMachine/qmldir +qml/QtQml/qmldir +qml/QtQuick.2/plugins.qmltypes +qml/QtQuick.2/qmldir +qml/QtQuick/Layouts/plugins.qmltypes +qml/QtQuick/Layouts/qmldir +qml/QtQuick/LocalStorage/plugins.qmltypes +qml/QtQuick/LocalStorage/qmldir +qml/QtQuick/Particles.2/plugins.qmltypes +qml/QtQuick/Particles.2/qmldir +qml/QtQuick/Window.2/plugins.qmltypes +qml/QtQuick/Window.2/qmldir +qml/QtQuick/XmlListModel/plugins.qmltypes +qml/QtQuick/XmlListModel/qmldir +qml/QtTest/plugins.qmltypes +qml/QtTest/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin/qmldir +tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin/qmldir diff -Nru qtdeclarative-opensource-src-5.10.1/debian/rules qtdeclarative-opensource-src-5.10.1/debian/rules --- qtdeclarative-opensource-src-5.10.1/debian/rules 2018-04-09 23:44:03.000000000 +0000 +++ qtdeclarative-opensource-src-5.10.1/debian/rules 2018-04-18 20:44:31.000000000 +0000 @@ -17,8 +17,30 @@ rm -rf $(CURDIR)/test_root rm -rf $(CURDIR)/docs rm -rf $(CURDIR)/.local + #clean up crap left behind + rm -rf doc + rm -f bin/qml* + rm -rf mkspecs + rm -rf lib + rm -rf examples/quick/tutorials/gettingStartedQml/imports + rm -f `find include/ -name '*Depends'` + rm -f tests/auto/headersclean/tst_headersclean.cpp + rm -f tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlNestedPluginType/libnestedPlugin.prl + rm -f debian/*.mps + rm -f `find . -name 'a.out'` + rm -f `find . -name '*.bin'` + rm -f `cat debian/morecraptoremove` + rm -f tests/auto/qmltest/itemgrabber/*.png + #undo our symbols file hack + sed -i 's/optional=meh)/arch=amd64 arm64 armhf i386)/' debian/libqt5qml5.symbols + sed -i 's/(optional=meh2)/(arch=armhf)/' debian/libqt5qml5.symbols + sed -i 's/(c++|optional=meh2)/(c++|arch=armhf)/' debian/libqt5qml5.symbols override_dh_auto_configure: + #symbols file hack + sed -i 's/arch=amd64 arm64 armhf i386)/optional=meh)/' debian/libqt5qml5.symbols + sed -i 's/(arch=armhf)/(optional=meh2)/' debian/libqt5qml5.symbols + sed -i 's/(c++|arch=armhf)/(c++|optional=meh2)/' debian/libqt5qml5.symbols dh_auto_configure -- QT_BUILD_PARTS+=tests override_dh_auto_build-indep: