From 53e84012a0a391d8aeb119796ad045f4d6afcc23 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 16 Jan 2025 21:24:55 +0100 Subject: [PATCH] Add experimental Qt patches to control Android activity lifecycle --- .../templates/layouts/android-qt6-base.sh.ep | 2 +- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/android-aarch64/PKGBUILD | 44 ++++++----- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/android-armv7a-eabi/PKGBUILD | 44 ++++++----- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/android-x86-64/PKGBUILD | 44 ++++++----- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/android-x86/PKGBUILD | 44 ++++++----- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/mingw-w64-static/PKGBUILD | 42 +++++----- ...Make-s-default-import-library-suffix.patch | 4 +- .../mingw-w64/0002-Fix-finding-D-Bus.patch | 4 +- ...03-Fix-using-static-PCRE2-and-DBus-1.patch | 4 +- ...ive-dependencies-of-static-libraries.patch | 4 +- ...orkaround-for-conflict-with-rpcndr.h.patch | 4 +- ...inding-static-MariaDB-client-library.patch | 4 +- ...-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | 4 +- ...via-pkg-config-for-correct-handling-.patch | 4 +- ...-dependency-of-xcb-image-on-xcb-util.patch | 4 +- ...erties-of-PkgConfig-targets-for-glib.patch | 4 +- ...erties-of-PkgConfig-targets-for-Wayl.patch | 4 +- ...-preference-for-shared-libzstd-libra.patch | 4 +- ...o-disabled-exceptions-with-cpp_winrt.patch | 4 +- ...ng-exception-flags-of-plugin-targets.patch | 4 +- ...rectly-against-runtimeobject-when-co.patch | 4 +- ...r-error-about-missing-symbol-__sync_.patch | 4 +- ...wn-CMake-command-_qt_test_emscripten.patch | 4 +- ...n-when-EMSCRIPTEN_ROOT-is-an-absolut.patch | 4 +- ...ting-Context-only-when-app-is-entire.patch | 34 ++++++++ ...ndroid-activity-lifecycle-by-user-pr.patch | 78 +++++++++++++++++++ qt6-base/mingw-w64/PKGBUILD | 42 +++++----- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/static-compat/PKGBUILD | 42 +++++----- ...ting-Context-only-when-app-is-entire.patch | 1 + ...ndroid-activity-lifecycle-by-user-pr.patch | 1 + qt6-base/wasm/PKGBUILD | 42 +++++----- 43 files changed, 351 insertions(+), 193 deletions(-) create mode 120000 qt6-base/android-aarch64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/android-aarch64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 120000 qt6-base/android-armv7a-eabi/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/android-armv7a-eabi/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 120000 qt6-base/android-x86-64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/android-x86-64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 120000 qt6-base/android-x86/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/android-x86/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 120000 qt6-base/mingw-w64-static/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/mingw-w64-static/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 100644 qt6-base/mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 100644 qt6-base/mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 120000 qt6-base/static-compat/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/static-compat/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch create mode 120000 qt6-base/wasm/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch create mode 120000 qt6-base/wasm/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch diff --git a/devel/generator/templates/layouts/android-qt6-base.sh.ep b/devel/generator/templates/layouts/android-qt6-base.sh.ep index 96e5efa0..b5e40d29 100644 --- a/devel/generator/templates/layouts/android-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/android-qt6-base.sh.ep @@ -16,7 +16,7 @@ _android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part % pkgname=<%= $package_name %> _qtver=6.8.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) diff --git a/qt6-base/android-aarch64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/android-aarch64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/android-aarch64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/android-aarch64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/android-aarch64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/android-aarch64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/android-aarch64/PKGBUILD b/qt6-base/android-aarch64/PKGBUILD index f07ef4a0..20c10164 100644 --- a/qt6-base/android-aarch64/PKGBUILD +++ b/qt6-base/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ _android_arch=aarch64 pkgname=android-aarch64-qt6-base _qtver=6.8.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -49,26 +49,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') prepare () { cd $_pkgfqn diff --git a/qt6-base/android-armv7a-eabi/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/android-armv7a-eabi/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/android-armv7a-eabi/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/android-armv7a-eabi/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/android-armv7a-eabi/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/android-armv7a-eabi/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/android-armv7a-eabi/PKGBUILD b/qt6-base/android-armv7a-eabi/PKGBUILD index 30a3b3a6..068de659 100644 --- a/qt6-base/android-armv7a-eabi/PKGBUILD +++ b/qt6-base/android-armv7a-eabi/PKGBUILD @@ -13,7 +13,7 @@ _android_arch=armv7a-eabi pkgname=android-armv7a-eabi-qt6-base _qtver=6.8.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -49,26 +49,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') prepare () { cd $_pkgfqn diff --git a/qt6-base/android-x86-64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/android-x86-64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/android-x86-64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/android-x86-64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/android-x86-64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/android-x86-64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/android-x86-64/PKGBUILD b/qt6-base/android-x86-64/PKGBUILD index f2d316f2..dcc8a1b2 100644 --- a/qt6-base/android-x86-64/PKGBUILD +++ b/qt6-base/android-x86-64/PKGBUILD @@ -13,7 +13,7 @@ _android_arch=x86-64 pkgname=android-x86-64-qt6-base _qtver=6.8.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -49,26 +49,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') prepare () { cd $_pkgfqn diff --git a/qt6-base/android-x86/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/android-x86/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/android-x86/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/android-x86/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/android-x86/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/android-x86/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/android-x86/PKGBUILD b/qt6-base/android-x86/PKGBUILD index c4665956..fd23e85e 100644 --- a/qt6-base/android-x86/PKGBUILD +++ b/qt6-base/android-x86/PKGBUILD @@ -13,7 +13,7 @@ _android_arch=x86 pkgname=android-x86-qt6-base _qtver=6.8.1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(any) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -49,26 +49,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') prepare () { cd $_pkgfqn diff --git a/qt6-base/mingw-w64-static/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/mingw-w64-static/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/mingw-w64-static/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/mingw-w64-static/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/mingw-w64-static/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/mingw-w64-static/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD index 91337965..d2e08c94 100644 --- a/qt6-base/mingw-w64-static/PKGBUILD +++ b/qt6-base/mingw-w64-static/PKGBUILD @@ -50,26 +50,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') # disable i686 build because 32-bit Windows is generally not supported by upstream and # it does not build anymore as of GCC 14 (probably due to commit 9a19fa8b616f83474c35cc5b34a3865073ced829) diff --git a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch index 6f04b8c4..5ad68a95 100644 --- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,7 +1,7 @@ From 9230c43da2d9ae03a14cddc39ae1aa8b16336aa6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 22:08:10 +0100 -Subject: [PATCH 01/18] Use CMake's default import library suffix +Subject: [PATCH 01/20] Use CMake's default import library suffix Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 --- @@ -110,5 +110,5 @@ index 238ab7b3633..e17e0da53bb 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch index 49b839ea..981db234 100644 --- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch +++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch @@ -1,7 +1,7 @@ From 9f9ce9031bf71a7ff8d5fd61b1fa451abba0d375 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 7 Oct 2020 12:13:37 +0200 -Subject: [PATCH 02/18] Fix finding D-Bus +Subject: [PATCH 02/20] Fix finding D-Bus Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 --- @@ -20,5 +20,5 @@ index e2a58790c4e..8e0ed81f893 100644 + set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +endif() -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch index 8e9d0612..eac43ff2 100644 --- a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch +++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -1,7 +1,7 @@ From 4c6c85f55870d9cf878853ef319e081b97bbc416 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:13:19 +0100 -Subject: [PATCH 03/18] Fix using static PCRE2 and DBus-1 +Subject: [PATCH 03/20] Fix using static PCRE2 and DBus-1 When making a static build of Qt we're using the static version of these libraries and must define the corresponding macros. @@ -44,5 +44,5 @@ index 78b7e049ef3..d06a3b04aac 100644 # include #else -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch index bc6fe13d..4283d683 100644 --- a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,7 +1,7 @@ From cf68d802748ae1c2b34d68764b8631f0a1d9b65d Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:59:33 +0100 -Subject: [PATCH 04/18] Fix transitive dependencies (of static libraries) +Subject: [PATCH 04/20] Fix transitive dependencies (of static libraries) The dependencies of these libraries are not reliably picked up by their corresponding find modules. This change allows adding the required @@ -132,5 +132,5 @@ index 2f55ab49500..bcf0bdbb42e 100644 Qt::CorePrivate Qt::SqlPrivate -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch index d5662968..8dc06a12 100644 --- a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,7 +1,7 @@ From cbf3a9509d0d5b0a85add80cf4686837bd0a2497 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 2 Nov 2020 13:47:45 +0100 -Subject: [PATCH 05/18] Fix libjpeg workaround for conflict with rpcndr.h +Subject: [PATCH 05/20] Fix libjpeg workaround for conflict with rpcndr.h Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of libjpeg seems to take care of the conflict already as long as jconfig.h is @@ -25,5 +25,5 @@ index 59b73587c52..cc0c3702f31 100644 #ifdef const # undef const // remove crazy C hackery in jconfig.h -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch index 61367eb5..abd67522 100644 --- a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch +++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,7 +1,7 @@ From 5e46b2125b14da7e02ca6dab17d4634238996f4c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:33:12 +0100 -Subject: [PATCH 06/18] Support finding static MariaDB client library +Subject: [PATCH 06/20] Support finding static MariaDB client library We need to reverse the order to look for mariadb first (and only then for mysql) because otherwise it would pick up the static library @@ -34,5 +34,5 @@ index 175c064e648..aff77a6af0d 100644 endif() -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch index dcfe070b..8f5880db 100644 --- a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch +++ b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch @@ -1,7 +1,7 @@ From bd2157ef5a84309e1f2eb4a37d9788b996e125e4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:34:09 +0100 -Subject: [PATCH 07/18] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer +Subject: [PATCH 07/20] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer static libraries Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa @@ -25,5 +25,5 @@ index 129f1ebb771..9bae62d8795 100644 # This depends on qt_internal_read_repo_dependencies existing. -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/qt6-base/mingw-w64/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch index aa83dd81..2727af11 100644 --- a/qt6-base/mingw-w64/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch +++ b/qt6-base/mingw-w64/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch @@ -1,7 +1,7 @@ From 2cd8aaf00645f24afaf5d258428ef4b0ef88530d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 24 Apr 2022 23:00:27 +0200 -Subject: [PATCH 08/18] Find fontconfig via pkg-config for correct handling of +Subject: [PATCH 08/20] Find fontconfig via pkg-config for correct handling of its dependencies CMake's own find module unforunately does not consider fontconfig's deps so @@ -59,5 +59,5 @@ index 0e53f5127a5..44545ea9679 100644 qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm) qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz) -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch b/qt6-base/mingw-w64/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch index 5ca85551..32199345 100644 --- a/qt6-base/mingw-w64/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch +++ b/qt6-base/mingw-w64/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch @@ -1,7 +1,7 @@ From 85b2822b7e27f2af455a3a762e4341928df5d6f1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 24 Apr 2022 23:49:36 +0200 -Subject: [PATCH 09/18] Fix dependency of xcb-image on xcb-util +Subject: [PATCH 09/20] Fix dependency of xcb-image on xcb-util Considering this linker error, xcb-image apparently depends on xcb-util: ``` @@ -44,5 +44,5 @@ index 26b9bf89633..0ae21f774c6 100644 set(XCB_XFIXES_component_deps XCB RENDER SHAPE) set(XCB_XVMC_component_deps XCB XV) -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/qt6-base/mingw-w64/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch index 752df0f4..172c860f 100644 --- a/qt6-base/mingw-w64/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch +++ b/qt6-base/mingw-w64/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch @@ -1,7 +1,7 @@ From 25021bbef5acc2b62bb1578a2ab512d863c77382 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 26 Apr 2022 20:16:31 +0200 -Subject: [PATCH 10/18] Allow using properties of PkgConfig targets for glib2 +Subject: [PATCH 10/20] Allow using properties of PkgConfig targets for glib2 to handle deps of static glib2 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908 @@ -70,5 +70,5 @@ index a6a16b494fd..a5da57824c9 100644 set_package_properties(GLIB2 PROPERTIES URL "https://wiki.gnome.org/Projects/GLib" -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch index b7901446..c3190493 100644 --- a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch +++ b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch @@ -1,7 +1,7 @@ From 12e3a5f4dc5bd11ed2e6caa9c67a281f352cd7f2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 1 May 2022 23:28:26 +0200 -Subject: [PATCH 11/18] Allow using properties of PkgConfig targets for Wayland +Subject: [PATCH 11/20] Allow using properties of PkgConfig targets for Wayland to handle deps of static libs Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27 @@ -49,5 +49,5 @@ index 233cc88d020..875c71377c6 100644 set_package_properties(Wayland PROPERTIES URL "http://wayland.freedesktop.org" -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch b/qt6-base/mingw-w64/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch index a83bc5f8..46fa2e72 100644 --- a/qt6-base/mingw-w64/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch +++ b/qt6-base/mingw-w64/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch @@ -1,7 +1,7 @@ From bcb48a193109d94c8d288ec81443c597181c6cae Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Nov 2023 23:58:54 +0100 -Subject: [PATCH 12/18] Allow overriding preference for shared libzstd library +Subject: [PATCH 12/20] Allow overriding preference for shared libzstd library As of 3f45905953d57e0174059d7d9d6bc75c3c1c406c Qt prefers the shared zstd library. This breaks static builds. With this change the static library is @@ -36,5 +36,5 @@ index 310f6cf9603..534bfa99b3a 100644 if(NOT TARGET WrapZSTD::WrapZSTD) -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch b/qt6-base/mingw-w64/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch index 3d32fe08..1179fc28 100644 --- a/qt6-base/mingw-w64/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch +++ b/qt6-base/mingw-w64/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch @@ -1,7 +1,7 @@ From bc5f095e639e76f03a1f105feb80bf4afe3a0329 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 17 Feb 2024 20:31:12 +0100 -Subject: [PATCH 13/18] Fix errors due to disabled exceptions with cpp_winrt +Subject: [PATCH 13/20] Fix errors due to disabled exceptions with cpp_winrt support The winrt headers use exceptions so code using them must be compiled @@ -25,5 +25,5 @@ index bbb8c46cf67..8ad72dad080 100644 main.cpp qtwindowsglobal.h -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0014-Fix-setting-exception-flags-of-plugin-targets.patch b/qt6-base/mingw-w64/0014-Fix-setting-exception-flags-of-plugin-targets.patch index 13f86532..9a4f3e93 100644 --- a/qt6-base/mingw-w64/0014-Fix-setting-exception-flags-of-plugin-targets.patch +++ b/qt6-base/mingw-w64/0014-Fix-setting-exception-flags-of-plugin-targets.patch @@ -1,7 +1,7 @@ From f0d397e9e1e58dae1a6b4f939031076f1795bc41 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 17 Feb 2024 20:48:21 +0100 -Subject: [PATCH 14/18] Fix setting exception flags of plugin targets +Subject: [PATCH 14/20] Fix setting exception flags of plugin targets Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8 --- @@ -27,5 +27,5 @@ index fc036cf6a54..108b545e3db 100644 set(qt_libs_private "") qt_internal_get_qt_all_known_modules(known_modules) -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch b/qt6-base/mingw-w64/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch index b49e1c39..fd04855f 100644 --- a/qt6-base/mingw-w64/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch +++ b/qt6-base/mingw-w64/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch @@ -1,7 +1,7 @@ From 34f6b3a613c58fdb346ec3eba35ca585b7b8023f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 17 Feb 2024 21:39:39 +0100 -Subject: [PATCH 15/18] Link corelib correctly against runtimeobject when +Subject: [PATCH 15/20] Link corelib correctly against runtimeobject when compiling for Windows This library is included by mingw-w64 and also needs to be linked against @@ -27,5 +27,5 @@ index e8d7320c0bf..fe461414361 100644 runtimeobject ) -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch b/qt6-base/mingw-w64/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch index 788c7112..1e6e27b9 100644 --- a/qt6-base/mingw-w64/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch +++ b/qt6-base/mingw-w64/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch @@ -1,7 +1,7 @@ From caf193b7d731fd32724369662ff4139238001a6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 17 Feb 2024 23:11:18 +0100 -Subject: [PATCH 16/18] Workaround linker error about missing symbol +Subject: [PATCH 16/20] Workaround linker error about missing symbol `__sync_bool_compare_and_swap_16` This error only happens when compiling for the x86_64-w64-mingw32 target @@ -83,5 +83,5 @@ index 8ad72dad080..9064100e912 100644 set_source_files_properties("openglblacklists/default.json" PROPERTIES QT_RESOURCE_ALIAS "default.json" -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch b/qt6-base/mingw-w64/0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch index fdc279ec..cb0e413e 100644 --- a/qt6-base/mingw-w64/0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch +++ b/qt6-base/mingw-w64/0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch @@ -1,7 +1,7 @@ From 1be24843743fec51577d6a6632ce4b4757fee9c2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Jun 2024 23:28:03 +0200 -Subject: [PATCH 17/18] Workaround `Unknown CMake command +Subject: [PATCH 17/20] Workaround `Unknown CMake command "_qt_test_emscripten_version".` Not sure why `QtPublicWasmToolchainHelpers.cmake` is not included @@ -30,5 +30,5 @@ index b590d893962..9bdd24b719d 100644 function(_qt_internal_wasm_add_target_helpers target) -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch b/qt6-base/mingw-w64/0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch index ec7475a1..01118df4 100644 --- a/qt6-base/mingw-w64/0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch +++ b/qt6-base/mingw-w64/0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch @@ -1,7 +1,7 @@ From d86808ebaea9039d2008cadbe204dc17a949e4b3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Jun 2024 23:31:12 +0200 -Subject: [PATCH 18/18] Fix configuration when `EMSCRIPTEN_ROOT` is an absolute +Subject: [PATCH 18/20] Fix configuration when `EMSCRIPTEN_ROOT` is an absolute path Not sure whether this is unusual but under Arch Linux the `emscripten` @@ -30,5 +30,5 @@ index 2b93284cda8..bd7f4a7c4b6 100644 set(${out_var} "${EMROOT_PATH}" PARENT_SCOPE) endfunction() -- -2.47.1 +2.48.1 diff --git a/qt6-base/mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 100644 index 00000000..0104cfb6 --- /dev/null +++ b/qt6-base/mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1,34 @@ +From 626a8a703872cc46f74ff9bf7c7db0a306864f1b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tinja=20Paavosepp=C3=A4?= +Date: Tue, 26 Nov 2024 14:20:52 +0200 +Subject: [PATCH 19/20] Android: Quit hosting Context only when app is entirely + Qt + +When quitting Qt, only quit the hosting Activity or Service if it's +primarily a Qt app, i.e. Qt is in the driver's seat. When using QtQuick +for Android, i.e. Qt is just a View, we do not want to forcefully quit +Activities, that is up to the app code. + +Task-number: QTBUG-123711 +Pick-to: 6.8 6.9 +Change-Id: Ib98700be8693c3d30a296998b863b0f224c9bf69 +--- + src/plugins/platforms/android/androidjnimain.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp +index f90093a837c..b74e0fd359f 100644 +--- a/src/plugins/platforms/android/androidjnimain.cpp ++++ b/src/plugins/platforms/android/androidjnimain.cpp +@@ -470,7 +470,7 @@ static void startQtApplication(JNIEnv */*env*/, jclass /*clazz*/) + qWarning() << "dlclose failed:" << dlerror(); + } + +- if (m_applicationClass) ++ if (m_applicationClass && QtAndroid::isQtApplication()) + QJniObject::callStaticMethod(m_applicationClass, "quitApp", "()V"); + + sem_post(&m_terminateSemaphore); +-- +2.48.1 + diff --git a/qt6-base/mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 100644 index 00000000..6a46ef8b --- /dev/null +++ b/qt6-base/mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1,78 @@ +From b2e37ce6e9af0ce7975d55de9ca103624ef65d36 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Thu, 16 Jan 2025 21:21:50 +0100 +Subject: [PATCH 20/20] Allow handling Android activity lifecycle by user + provided methods + +Change-Id: I52107fadaea431c2932c1a1948ca7d2c889abd6d +--- + .../qtproject/qt/android/QtActivityBase.java | 25 +++++++++++++++---- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java +index 248c0696680..c1175c6d720 100644 +--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java ++++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java +@@ -73,7 +73,7 @@ public class QtActivityBase extends Activity + m_isCustomThemeSet = true; + } + +- private void restartApplication() { ++ protected void restartApplication() { + Intent intent = Intent.makeRestartActivityTask(getComponentName()); + startActivity(intent); + QtNative.quitApp(); +@@ -85,6 +85,11 @@ public class QtActivityBase extends Activity + m_delegate = new QtActivityDelegate(this); + } + ++ protected boolean handleRestart(Bundle savedInstanceState) ++ { ++ return false; ++ } ++ + @Override + protected void onCreate(Bundle savedInstanceState) + { +@@ -97,7 +102,7 @@ public class QtActivityBase extends Activity + android.R.style.Theme_Holo_Light); + } + +- if (QtNative.getStateDetails().isStarted) { ++ if (QtNative.getStateDetails().isStarted && !handleRestart(savedInstanceState)) { + // We don't yet have a reliable way to keep the app + // running properly in case of an Activity only restart, + // so for now restart the whole app. +@@ -168,16 +173,26 @@ public class QtActivityBase extends Activity + QtNative.setApplicationState(QtNative.ApplicationState.ApplicationSuspended); + } + ++ protected boolean handleDestruction() ++ { ++ return false; ++ } ++ + @Override + protected void onDestroy() + { + super.onDestroy(); ++ boolean destructionHandled = handleDestruction(); + if (!m_retainNonConfigurationInstance) { + QtNative.unregisterAppStateListener(m_delegate); +- QtNative.terminateQt(); ++ if (!destructionHandled) { ++ QtNative.terminateQt(); ++ } + QtNative.setActivity(null); +- QtNative.getQtThread().exit(); +- System.exit(0); ++ if (!destructionHandled) { ++ QtNative.getQtThread().exit(); ++ System.exit(0); ++ } + } + } + +-- +2.48.1 + diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD index 23efc104..dc260272 100644 --- a/qt6-base/mingw-w64/PKGBUILD +++ b/qt6-base/mingw-w64/PKGBUILD @@ -50,26 +50,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') # disable i686 build because 32-bit Windows is generally not supported by upstream and # it does not build anymore as of GCC 14 (probably due to commit 9a19fa8b616f83474c35cc5b34a3865073ced829) diff --git a/qt6-base/static-compat/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/static-compat/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/static-compat/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/static-compat/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/static-compat/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/static-compat/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/static-compat/PKGBUILD b/qt6-base/static-compat/PKGBUILD index f83a54b3..07fdf457 100644 --- a/qt6-base/static-compat/PKGBUILD +++ b/qt6-base/static-compat/PKGBUILD @@ -47,26 +47,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') prepare () { cd $_pkgfqn diff --git a/qt6-base/wasm/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch b/qt6-base/wasm/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch new file mode 120000 index 00000000..a94faa11 --- /dev/null +++ b/qt6-base/wasm/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch @@ -0,0 +1 @@ +../mingw-w64/0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch \ No newline at end of file diff --git a/qt6-base/wasm/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch b/qt6-base/wasm/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch new file mode 120000 index 00000000..fe8f7798 --- /dev/null +++ b/qt6-base/wasm/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch @@ -0,0 +1 @@ +../mingw-w64/0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch \ No newline at end of file diff --git a/qt6-base/wasm/PKGBUILD b/qt6-base/wasm/PKGBUILD index 896f3da2..1d45392b 100644 --- a/qt6-base/wasm/PKGBUILD +++ b/qt6-base/wasm/PKGBUILD @@ -41,26 +41,30 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' '0017-Workaround-Unknown-CMake-command-_qt_test_emscripten.patch' - '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch') + '0018-Fix-configuration-when-EMSCRIPTEN_ROOT-is-an-absolut.patch' + '0019-Android-Quit-hosting-Context-only-when-app-is-entire.patch' + '0020-Allow-handling-Android-activity-lifecycle-by-user-pr.patch') sha256sums=('40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf' - 'd9e52174bc67de800d8c7d6849d57070b9c252822aa155965885ecbaf6a599e6' - '5ad195693ee54833f16dc8dd2645e8eb929818591e8dfde1bdd90933d5769552' - '7c3d0814ab948a2974f26a74d33d16be18f7c3dee9e656920e0310c97ed26c70' - '83dfad20eefddfb0959a99fcbb99cddcf49469bbf2fe2aef138e77e57594ecf6' - 'd65c79d9ab12e9e7b15918ba5567c3d792761bb922473a06ab7762aa7e46e4e7' - '9e9fb4f4f2ed25310e3b9d8983777deb1d7bc70b254bccfbe0a00740c42dbc42' - '6ff6ef06978ecf35eb58d3c9adc635469d860704d47bb04c1e0a002afb32fcb9' - '15959b2a4aa423355632a01729f2f9d28328b66222c09728437caccabdd89eff' - '697651aefb33425e7cddefc73c93149f8f99adcfbc5723a459c665d9ee125a70' - '353b5cd748e0d5f6f8c6297436e716ed85d8dc3e6ea1d4df4150407c4f2e26d0' - 'b764833f2ad995387edcc1c69d0dc77a601b44d36817765b94d7b7b1b4f8fa9c' - '612d637d1a1ecf3f6e69383bd24f17fc3870dddf73294f355f1272c732df01c4' - 'd62957971a884702f6bb211ff49f2806ce0d61fb09ecb372832a5a787cb97ecc' - 'b6be14723fb82d0b0bb4faa8d530d0ec05e65d514862961002e99501d88a9eae' - 'f3635b1ad1b4630b214fbac3140710d10fb55c1199a48c40d22c336ae1836bb2' - '6a319f037b4643cb4c2d71574713719a2941e094a080d01b55befb624f00d638' - '1f38dbf9f3ee5dd47c54e5365f5ee0cfcdceb897e53af4d26a476cab15161b5d' - '7b5f30fbf757647a58230c709d97f980e6019562da549aa714a6855287ddd4d2') + '48ec451323a8293be67869a26dcccd8573425d96d2be80c2680502ea7af06663' + '6ff5c6fcafab187ab9e636759ac61341292a1d0726bf9506df527da08b61ec32' + 'be26f1cd11086e582e27e90055ce89668d009d05bbc9928fcc2c684e5a2c3f7d' + '158c734b400cbbfad209ce2ca58cd2c9627a2e1555f9b81f1d303aacae2bf232' + '0e284eac74f1865693bd2799480eee8be43eb7b94a5a736cd578bcc4bf8397f4' + 'd1857b5ce72e0534df5396919802d77f7a084fc94478ccb7b1a73ecccfe1c473' + 'c3d77455ceb849b2356af6d86585759d7fad219203cf7e842074af9b53d8edbd' + 'e0d81fbb03fa65a0c8afe7e2920a8f08dd006f0fb5b3f67d56f3f55da349a69f' + '30de2ff2a83f9b7e675e01e1fba9ad4a471f04bb83f607cd3abdfd19c9875d51' + '61cd378e1b74fc8da0d82d139f35dedcbca32399cdff064f41dadb7c108ba64b' + '0a0e162ca753e85e9f249dd3515cd1ae8a74ab01ffd4f87e8f6720582adcae10' + '2a3711ced287367d8b4c667c47ff9bfa98d73f679fbb131025dcacc6aa5dc15e' + '2fdba643908e000b9d1742bd04d74222a63c7f677cc6c24015ca5055b8333ca4' + '995923a07aff2c78b0f094fabab1c1539e12148546c9d0280f0f21fe06a4aa56' + 'ce056c17b84679ef0d75374154e483c37732d2505580f607f3542a65760cffb6' + '9b9e8bb6306e76df261c016cdbb53f845e560231806b34aee2e31ff4cf69d9ea' + '5106989fdf153494b98685924c8fded94b51a5a12c49ae3626c71f9733ac4e01' + '2b5a2dcec2577e7d30e27b3a3b46ba0185937384817a985b8333f6e4a91b9c6c' + '550e89a1afb42269659bc87b645a8ce4f6a50586dea8a206d621a5fc1c030939' + '508c84c8863e088f2463cd276c10f1462bfda75d8f60eef239b66f1361894991') prepare () { cd $_pkgfqn