From 10ae1b26672b79ffec37a7b3d2b2a0c61f21213b Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 4 Feb 2021 18:12:25 +0100 Subject: [PATCH] Update android-*-qt6-* and mingw-w64-qt6-* packages to 6.0.1 --- README.md | 3 +- devel/apply-versions.sh | 7 ++- .../templates/fragments/qt6-source.sh.ep | 12 ++++ .../templates/layouts/android-qt6-base.sh.ep | 2 +- .../layouts/android-qt6-module.sh.ep | 10 +--- .../layouts/mingw-w64-qt6-base.sh.ep | 4 +- .../layouts/mingw-w64-qt6-module.sh.ep | 14 +---- .../templates/layouts/qt6-module.sh.ep | 10 +--- devel/qt5/update-patches.sh | 10 +++- devel/versions.sh | 2 +- qt6-3d/mingw-w64-static/PKGBUILD | 6 +- qt6-3d/mingw-w64/PKGBUILD | 4 +- qt6-3d/mingw-w64/PKGBUILD.sh.ep | 4 +- qt6-5compat/android-aarch64/PKGBUILD | 4 +- qt6-5compat/android-aarch64/PKGBUILD.sh.ep | 2 +- .../android-aarch64/qt5compat-sha256.txt | 2 +- qt6-5compat/mingw-w64-static/PKGBUILD | 6 +- .../mingw-w64-static/qt5compat-sha256.txt | 2 +- qt6-5compat/mingw-w64/PKGBUILD | 4 +- qt6-5compat/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-5compat/mingw-w64/qt5compat-sha256.txt | 2 +- .../0006-Support-finding-MariaDB.patch | 1 - ...inding-static-MariaDB-client-library.patch | 1 + qt6-base/android-aarch64/PKGBUILD | 20 +++---- qt6-base/android-aarch64/qtbase-sha256.txt | 2 +- .../0006-Support-finding-MariaDB.patch | 1 - ...inding-static-MariaDB-client-library.patch | 1 + qt6-base/mingw-w64-static/PKGBUILD | 22 ++++---- qt6-base/mingw-w64-static/qtbase-sha256.txt | 2 +- ...Make-s-default-import-library-suffix.patch | 12 ++-- .../mingw-w64/0002-Fix-finding-D-Bus.patch | 2 +- ...03-Fix-using-static-PCRE2-and-DBus-1.patch | 4 +- ...ive-dependencies-of-static-libraries.patch | 18 +++--- ...orkaround-for-conflict-with-rpcndr.h.patch | 2 +- .../0006-Support-finding-MariaDB.patch | 30 ---------- ...inding-static-MariaDB-client-library.patch | 31 ++++++++++ ...-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | 10 ++-- qt6-base/mingw-w64/PKGBUILD | 20 +++---- qt6-base/mingw-w64/qtbase-sha256.txt | 2 +- qt6-declarative/android-aarch64/PKGBUILD | 4 +- .../android-aarch64/PKGBUILD.sh.ep | 2 +- .../android-aarch64/qtdeclarative-sha256.txt | 2 +- ...Exclude-qmltime-when-cross-compiling.patch | 1 + qt6-declarative/mingw-w64-static/PKGBUILD | 20 +++++-- .../mingw-w64-static/qtdeclarative-sha256.txt | 2 +- ...Exclude-qmltime-when-cross-compiling.patch | 33 +++++++++++ qt6-declarative/mingw-w64/PKGBUILD | 18 +++++- qt6-declarative/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtdeclarative-sha256.txt | 2 +- qt6-imageformats/android-aarch64/PKGBUILD | 8 +-- .../android-aarch64/PKGBUILD.sh.ep | 6 +- .../android-aarch64/qtimageformats-sha256.txt | 2 +- qt6-imageformats/mingw-w64-static/PKGBUILD | 8 +-- .../qtimageformats-sha256.txt | 2 +- qt6-imageformats/mingw-w64/PKGBUILD | 6 +- qt6-imageformats/mingw-w64/PKGBUILD.sh.ep | 4 +- .../mingw-w64/qtimageformats-sha256.txt | 2 +- qt6-networkauth/android-aarch64/PKGBUILD | 51 +++++++++++++++++ .../android-aarch64/PKGBUILD.sh.ep | 11 ++++ .../android-aarch64/qtnetworkauth-sha256.txt | 1 + qt6-networkauth/mingw-w64-static/PKGBUILD | 49 ++++++++++++++++ .../mingw-w64-static/PKGBUILD.sh.ep | 1 + .../mingw-w64-static/qtnetworkauth-sha256.txt | 1 + qt6-networkauth/mingw-w64/PKGBUILD | 56 +++++++++++++++++++ qt6-networkauth/mingw-w64/PKGBUILD.sh.ep | 11 ++++ .../mingw-w64/qtnetworkauth-sha256.txt | 1 + qt6-quick3d/android-aarch64/PKGBUILD | 4 +- qt6-quick3d/android-aarch64/PKGBUILD.sh.ep | 2 +- .../android-aarch64/qtquick3d-sha256.txt | 2 +- qt6-quick3d/mingw-w64-static/PKGBUILD | 6 +- .../mingw-w64-static/qtquick3d-sha256.txt | 2 +- qt6-quick3d/mingw-w64/PKGBUILD | 4 +- qt6-quick3d/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-quick3d/mingw-w64/qtquick3d-sha256.txt | 2 +- qt6-quickcontrols2/android-aarch64/PKGBUILD | 4 +- .../android-aarch64/PKGBUILD.sh.ep | 2 +- .../qtquickcontrols2-sha256.txt | 2 +- qt6-quickcontrols2/mingw-w64-static/PKGBUILD | 6 +- .../qtquickcontrols2-sha256.txt | 2 +- qt6-quickcontrols2/mingw-w64/PKGBUILD | 4 +- qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtquickcontrols2-sha256.txt | 2 +- qt6-quicktimeline/android-aarch64/PKGBUILD | 4 +- .../android-aarch64/PKGBUILD.sh.ep | 2 +- .../qtquicktimeline-sha256.txt | 2 +- qt6-quicktimeline/mingw-w64-static/PKGBUILD | 6 +- .../qtquicktimeline-sha256.txt | 2 +- qt6-quicktimeline/mingw-w64/PKGBUILD | 4 +- qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtquicktimeline-sha256.txt | 2 +- qt6-shadertools/android-aarch64/PKGBUILD | 4 +- .../android-aarch64/PKGBUILD.sh.ep | 2 +- .../android-aarch64/qtshadertools-sha256.txt | 2 +- qt6-shadertools/mingw-w64-static/PKGBUILD | 6 +- .../mingw-w64-static/qtshadertools-sha256.txt | 2 +- qt6-shadertools/mingw-w64/PKGBUILD | 4 +- qt6-shadertools/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtshadertools-sha256.txt | 2 +- qt6-svg/android-aarch64/PKGBUILD | 4 +- qt6-svg/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-svg/android-aarch64/qtsvg-sha256.txt | 2 +- qt6-svg/mingw-w64-static/PKGBUILD | 6 +- qt6-svg/mingw-w64-static/qtsvg-sha256.txt | 2 +- qt6-svg/mingw-w64/PKGBUILD | 4 +- qt6-svg/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-svg/mingw-w64/qtsvg-sha256.txt | 2 +- ...Make-windeployqt-an-optional-feature.patch | 26 --------- qt6-tools/android-aarch64/PKGBUILD | 18 +----- qt6-tools/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-tools/android-aarch64/qttools-sha256.txt | 2 +- ...Make-windeployqt-an-optional-feature.patch | 1 - qt6-tools/mingw-w64-static/PKGBUILD | 20 ++----- qt6-tools/mingw-w64-static/qttools-sha256.txt | 2 +- ...Make-windeployqt-an-optional-feature.patch | 26 --------- qt6-tools/mingw-w64/PKGBUILD | 18 +----- qt6-tools/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-tools/mingw-w64/qttools-sha256.txt | 2 +- qt6-translations/android-aarch64/PKGBUILD | 4 +- .../android-aarch64/PKGBUILD.sh.ep | 2 +- .../android-aarch64/qttranslations-sha256.txt | 2 +- qt6-translations/mingw-w64/PKGBUILD | 4 +- qt6-translations/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qttranslations-sha256.txt | 2 +- 123 files changed, 502 insertions(+), 352 deletions(-) create mode 100644 devel/generator/templates/fragments/qt6-source.sh.ep delete mode 120000 qt6-base/android-aarch64/0006-Support-finding-MariaDB.patch create mode 120000 qt6-base/android-aarch64/0006-Support-finding-static-MariaDB-client-library.patch delete mode 120000 qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch create mode 120000 qt6-base/mingw-w64-static/0006-Support-finding-static-MariaDB-client-library.patch delete mode 100644 qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch create mode 100644 qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch create mode 120000 qt6-declarative/mingw-w64-static/0001-Exclude-qmltime-when-cross-compiling.patch create mode 100644 qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch create mode 100644 qt6-networkauth/android-aarch64/PKGBUILD create mode 100644 qt6-networkauth/android-aarch64/PKGBUILD.sh.ep create mode 100644 qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt create mode 100644 qt6-networkauth/mingw-w64-static/PKGBUILD create mode 100644 qt6-networkauth/mingw-w64-static/PKGBUILD.sh.ep create mode 100644 qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt create mode 100644 qt6-networkauth/mingw-w64/PKGBUILD create mode 100644 qt6-networkauth/mingw-w64/PKGBUILD.sh.ep create mode 100644 qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt delete mode 100644 qt6-tools/android-aarch64/0001-Make-windeployqt-an-optional-feature.patch delete mode 120000 qt6-tools/mingw-w64-static/0001-Make-windeployqt-an-optional-feature.patch delete mode 100644 qt6-tools/mingw-w64/0001-Make-windeployqt-an-optional-feature.patch diff --git a/README.md b/README.md index be6f6b83..7e866596 100644 --- a/README.md +++ b/README.md @@ -88,12 +88,13 @@ This is always done by me. Please don't try to help here because it will only ca workflow is quite simple: 1. Run `devel/qt5/rebase-patches.sh` on all Qt repository forks or just `devel/qt5/rebase-all-patches.sh` - * eg. `rebase-patches.sh 5.11.0 5.10.1 fixes` to create branch `5.11.0-mingw-w64` based on `5.10.1-mingw-w64-fixes` + * eg. `rebase-patches.sh 5.11.0 5.10.1 mingw-w64-fixes` to create branch `5.11.0-mingw-w64` based on `5.10.1-mingw-w64-fixes` * after fixing possible conflicts, run `devel/qt5/continue-rebase-patches.sh` * otherwise, that's it * all scripts need to run in the Git repository directory of the Qt module except `rebase-all-patches.sh` which needs the environment variable `QT_GIT_REPOS_DIR` to be set 2. Run `devel/qt5/update-patches.sh` or `devel/qt5/update-all-patches.sh` to update PKGBUILDs + * eg. `devel/qt5/update-all-patches.sh "" mingw-w64 qt6` to consider all mingw-w64-qt6-\* packages ## Brief documentation about mingw-w64-qt packages The Qt project does not support building Qt under GNU/Linux when targeting Windows. With Qt 6 they also stopped 32-bit diff --git a/devel/apply-versions.sh b/devel/apply-versions.sh index b01a5409..68ca295a 100755 --- a/devel/apply-versions.sh +++ b/devel/apply-versions.sh @@ -13,7 +13,9 @@ for pkgbuild_file in "${PKGBUILD_DIR:-.}"/*/*/PKGBUILD; do [ ${variant##*-} == 'git' ] && continue # skip android packages (for now) - [ ${variant%%-*} == 'android' ] && continue + qt6_pattern='qt6-.*' is_qt6= + [[ $project_name =~ $qt6_pattern ]] && is_qt6=1 + [ ${variant%%-*} == 'android' ] && [[ ! $is_qt6 ]] && continue # skip some of the packages [[ $project_name == 'qt5-quick1' # removed from official releases @@ -24,6 +26,9 @@ for pkgbuild_file in "${PKGBUILD_DIR:-.}"/*/*/PKGBUILD; do || $variant == 'mingw-w64-test' # just our own 'test' package (not used anymore) ]] && continue + # skip default qt6 packages (provided by Arch Linux itself) + [[ $is_qt6 ]] && [[ $variant == 'default' ]] && continue + # treat all qt5-*/qt6-* packages as qt5/qt6 start=${project_name%%-*} for qtver in 5 6; do diff --git a/devel/generator/templates/fragments/qt6-source.sh.ep b/devel/generator/templates/fragments/qt6-source.sh.ep new file mode 100644 index 00000000..2afe3322 --- /dev/null +++ b/devel/generator/templates/fragments/qt6-source.sh.ep @@ -0,0 +1,12 @@ +% if (my $git_commit = stash('git_commit')) { +source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#commit=<%== $git_commit %>"\ +% } +% elsif (my $git_tag = stash('git_tag')) { +source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#tag=<%== $git_tag %>"\ +% } +% elsif (stash('additional_library')) { +source=("https://download.qt.io/official_releases/additional_libraries/qt<%== $qt_module %>/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz"\ +% } +% else { +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\ +% } diff --git a/devel/generator/templates/layouts/android-qt6-base.sh.ep b/devel/generator/templates/layouts/android-qt6-base.sh.ep index b84c85dd..ccb4e7bf 100644 --- a/devel/generator/templates/layouts/android-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/android-qt6-base.sh.ep @@ -14,7 +14,7 @@ _android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %> pkgname=<%= $package_name %> -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/devel/generator/templates/layouts/android-qt6-module.sh.ep b/devel/generator/templates/layouts/android-qt6-module.sh.ep index 14e8b639..791b5a9d 100644 --- a/devel/generator/templates/layouts/android-qt6-module.sh.ep +++ b/devel/generator/templates/layouts/android-qt6-module.sh.ep @@ -11,15 +11,7 @@ pkgname=android-$_android_arch-qt6-<%== $qt_module %><%== $static_suffix %> options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}" -% if (my $git_commit = stash('git_commit')) { -source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#commit=<%== $git_commit %>"\ -% } -% elsif (my $git_tag = stash('git_tag')) { -source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#tag=<%== $git_tag %>"\ -% } -% else { -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\ -% } +<%== include 'fragments/qt6-source' %>\ <%== include 'fragments/source_file_list', relevant_files => $patch_files %>) sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\ <%== include 'fragments/sha256_list', relevant_files => $patch_files %>) diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep index 234de1b8..1a189706 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep @@ -14,7 +14,7 @@ % } pkgname=<%= $package_name %> -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -106,6 +106,6 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/<%== $static_variant ? 'static/' : '' %>share/doc" ]] && rm -r "$pkgdir/usr/$_arch/<%== $static_variant ? 'static/' : '' %>share/doc" done } diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep index d2f6c44b..6b34bffe 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep @@ -10,15 +10,7 @@ pkgname=mingw-w64-qt6-<%== $qt_module %><%== $static_suffix %> options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}" -% if (my $git_commit = stash('git_commit')) { -source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#commit=<%== $git_commit %>"\ -% } -% elsif (my $git_tag = stash('git_tag')) { -source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#tag=<%== $git_tag %>"\ -% } -% else { -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\ -% } +<%== include 'fragments/qt6-source' %>\ <%== include 'fragments/source_file_list', relevant_files => $patch_files %>) sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\ <%== include 'fragments/sha256_list', relevant_files => $patch_files %>) @@ -70,7 +62,7 @@ package() { % } % unless (stash('no_libs')) { # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \\ + find "$pkgdir/usr/$_arch<%== $static_variant ? '/static' : '' %>/lib" -type f -name '*.prl' \\ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; % } @@ -78,7 +70,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch<%== $static_variant ? '/static' : '' %>/share/doc" ]] && rm -r "$pkgdir/usr/$_arch<%== $static_variant ? '/static' : '' %>/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/devel/generator/templates/layouts/qt6-module.sh.ep b/devel/generator/templates/layouts/qt6-module.sh.ep index 1596e3b1..d597c817 100644 --- a/devel/generator/templates/layouts/qt6-module.sh.ep +++ b/devel/generator/templates/layouts/qt6-module.sh.ep @@ -9,15 +9,7 @@ pkgname=qt6-<%== $qt_module %> <%== content %>\ groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" -% if (my $git_commit = stash('git_commit')) { -source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#commit=<%== $git_commit %>"\ -% } -% elsif (my $git_tag = stash('git_tag')) { -source=("$_pkgfqn::git://code.qt.io/qt/qt<%== $qt_module %>.git#tag=<%== $git_tag %>"\ -% } -% else { -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"\ -% } +<%== include 'fragments/qt6-source' %>\ <%== include 'fragments/source_file_list', relevant_files => $patch_files %>) sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\ <%== include 'fragments/sha256_list', relevant_files => $patch_files %>) diff --git a/devel/qt5/update-patches.sh b/devel/qt5/update-patches.sh index e201e074..e393d2a2 100755 --- a/devel/qt5/update-patches.sh +++ b/devel/qt5/update-patches.sh @@ -61,7 +61,7 @@ template=$pkgbuild_path.sh.ep has_template= [[ -f $template ]] && has_template=1 source "$pkgbuild_path" -tag=${tag:-origin/$pkgver} +tag=${tag:-v$pkgver} new_sources=() new_md5sums=() @@ -89,10 +89,15 @@ if ! git checkout "${branch}"; then msg2 "No patches required for $1, skipping." exit 0 fi +msg2 "Exporting patches for branch '$branch' (based on '$tag')" git format-patch "$tag" --output-directory "$dest" +new_patches=("$dest"/*.patch) for other_variant_dir in "$dest/../$variant"?*; do [[ -d $other_variant_dir ]] || continue - cp --target-directory="$other_variant_dir" "$dest/"*.patch + find "$other_variant_dir" -iname '*.patch' -delete + if [[ ${#new_patches[@]} -gt 0 ]]; then + ln --symbolic --relative --target-directory="$other_variant_dir" "${new_patches[@]}" + fi done popd > /dev/null @@ -103,7 +108,6 @@ popd > /dev/null # system) [[ -f $has_template ]] && exit 0 -new_patches=("$dest"/*.patch) for patch in "${new_patches[@]}"; do new_sources+=("$patch") sum=$(sha256sum "$patch") diff --git a/devel/versions.sh b/devel/versions.sh index c6e7f54f..03df5a62 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -13,7 +13,7 @@ declare -A versions=( [dbus-soundrecorder]=1.2.3 [geocoordinatecalculator]=1.1.3 [qt5]=5.15.2 - [qt6]=6.0.0 + [qt6]=6.0.1 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/qt6-3d/mingw-w64-static/PKGBUILD b/qt6-3d/mingw-w64-static/PKGBUILD index 4ab44a58..8d147a3c 100644 --- a/qt6-3d/mingw-w64-static/PKGBUILD +++ b/qt6-3d/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-3d-static -_qtver=6.0.0-alpha +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ optdepends=('mingw-w64-assimp: Import from assimp' options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qt3d-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/additional_libraries/qt3d/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -42,7 +42,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-3d/mingw-w64/PKGBUILD b/qt6-3d/mingw-w64/PKGBUILD index 9ec600b9..55a67a66 100644 --- a/qt6-3d/mingw-w64/PKGBUILD +++ b/qt6-3d/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-3d -_qtver=6.0.0-alpha +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ optdepends=('mingw-w64-assimp: Import from assimp' options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qt3d-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +source=("https://download.qt.io/official_releases/additional_libraries/qt3d/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-3d/mingw-w64/PKGBUILD.sh.ep b/qt6-3d/mingw-w64/PKGBUILD.sh.ep index 09e5473a..b83411cf 100644 --- a/qt6-3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-3d/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ -% layout 'mingw-w64-qt6-module', has_binaries => 1; +% layout 'mingw-w64-qt6-module', additional_library => 1, has_binaries => 1; \ -_qtver=6.0.0-alpha +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-5compat/android-aarch64/PKGBUILD b/qt6-5compat/android-aarch64/PKGBUILD index 1db96cb0..1387e0cb 100644 --- a/qt6-5compat/android-aarch64/PKGBUILD +++ b/qt6-5compat/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-5compat -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qt5compat-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f') +sha256sums=('058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e') build() { source android-env ${_android_arch} diff --git a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep index 19051582..49450c8b 100644 --- a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-5compat/android-aarch64/qt5compat-sha256.txt b/qt6-5compat/android-aarch64/qt5compat-sha256.txt index eb3f9b20..baf33092 100644 --- a/qt6-5compat/android-aarch64/qt5compat-sha256.txt +++ b/qt6-5compat/android-aarch64/qt5compat-sha256.txt @@ -1 +1 @@ -13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f +058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e diff --git a/qt6-5compat/mingw-w64-static/PKGBUILD b/qt6-5compat/mingw-w64-static/PKGBUILD index 0056e234..d80afd82 100644 --- a/qt6-5compat/mingw-w64-static/PKGBUILD +++ b/qt6-5compat/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-5compat-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qt5compat-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f') +sha256sums=('058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -39,7 +39,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt index eb3f9b20..baf33092 100644 --- a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt @@ -1 +1 @@ -13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f +058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e diff --git a/qt6-5compat/mingw-w64/PKGBUILD b/qt6-5compat/mingw-w64/PKGBUILD index 57177e29..4f35b602 100644 --- a/qt6-5compat/mingw-w64/PKGBUILD +++ b/qt6-5compat/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-5compat -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qt5compat-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f') +sha256sums=('058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep index 162a2a08..3960c618 100644 --- a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-5compat/mingw-w64/qt5compat-sha256.txt b/qt6-5compat/mingw-w64/qt5compat-sha256.txt index eb3f9b20..baf33092 100644 --- a/qt6-5compat/mingw-w64/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64/qt5compat-sha256.txt @@ -1 +1 @@ -13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f +058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e diff --git a/qt6-base/android-aarch64/0006-Support-finding-MariaDB.patch b/qt6-base/android-aarch64/0006-Support-finding-MariaDB.patch deleted file mode 120000 index ee8bc166..00000000 --- a/qt6-base/android-aarch64/0006-Support-finding-MariaDB.patch +++ /dev/null @@ -1 +0,0 @@ -../mingw-w64/0006-Support-finding-MariaDB.patch \ No newline at end of file diff --git a/qt6-base/android-aarch64/0006-Support-finding-static-MariaDB-client-library.patch b/qt6-base/android-aarch64/0006-Support-finding-static-MariaDB-client-library.patch new file mode 120000 index 00000000..7daf86d2 --- /dev/null +++ b/qt6-base/android-aarch64/0006-Support-finding-static-MariaDB-client-library.patch @@ -0,0 +1 @@ +../mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch \ No newline at end of file diff --git a/qt6-base/android-aarch64/PKGBUILD b/qt6-base/android-aarch64/PKGBUILD index b5c0658b..7c6ee5cc 100644 --- a/qt6-base/android-aarch64/PKGBUILD +++ b/qt6-base/android-aarch64/PKGBUILD @@ -11,7 +11,7 @@ _android_arch=aarch64 pkgname=android-aarch64-qt6-base -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -33,16 +33,16 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0003-Fix-using-static-PCRE2-and-DBus-1.patch' '0004-Fix-transitive-dependencies-of-static-libraries.patch' '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' - '0006-Support-finding-MariaDB.patch' + '0006-Support-finding-static-MariaDB-client-library.patch' '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch') -sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656' - '0907b860c3394efc457304e75ec0282799374a83f411e194250cd20f4f703051' - 'ba9f624f9393289930b10a1b976d094f4f023009d46ceaf1a05af0ef9981a65f' - '7b1b9b3b995e0ade88251bd97ca9b197511ed35657d7ec5643eaee22f7f83993' - 'aa30dd86403f39cc3de9512de05c86dbb69ca141bdb55ca4dd7578c03de174a9' - 'dd4db93874ae433a88dde68ebe5bed864c0af4a37cb81778a4154cda8f310b3d' - '713d91d944688677c3d56f07f7a9e8b9858a38709daf95cea99e5a87f8e429d2' - '56d024b76fa9dde2bcf8720a48bf9c43dc8b48256be6590d3da55fc68c27ad25') +sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa' + '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b' + '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53' + 'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d' + '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06' + '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee' + '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd' + 'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2') prepare () { cd $_pkgfqn diff --git a/qt6-base/android-aarch64/qtbase-sha256.txt b/qt6-base/android-aarch64/qtbase-sha256.txt index c441384f..d7b393f2 100644 --- a/qt6-base/android-aarch64/qtbase-sha256.txt +++ b/qt6-base/android-aarch64/qtbase-sha256.txt @@ -1 +1 @@ -ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656 +8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa diff --git a/qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch b/qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch deleted file mode 120000 index ee8bc166..00000000 --- a/qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch +++ /dev/null @@ -1 +0,0 @@ -../mingw-w64/0006-Support-finding-MariaDB.patch \ No newline at end of file diff --git a/qt6-base/mingw-w64-static/0006-Support-finding-static-MariaDB-client-library.patch b/qt6-base/mingw-w64-static/0006-Support-finding-static-MariaDB-client-library.patch new file mode 120000 index 00000000..7daf86d2 --- /dev/null +++ b/qt6-base/mingw-w64-static/0006-Support-finding-static-MariaDB-client-library.patch @@ -0,0 +1 @@ +../mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch \ No newline at end of file diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD index 4c8e8a21..c07e85cb 100644 --- a/qt6-base/mingw-w64-static/PKGBUILD +++ b/qt6-base/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -36,16 +36,16 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0003-Fix-using-static-PCRE2-and-DBus-1.patch' '0004-Fix-transitive-dependencies-of-static-libraries.patch' '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' - '0006-Support-finding-MariaDB.patch' + '0006-Support-finding-static-MariaDB-client-library.patch' '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch') -sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656' - '0907b860c3394efc457304e75ec0282799374a83f411e194250cd20f4f703051' - 'ba9f624f9393289930b10a1b976d094f4f023009d46ceaf1a05af0ef9981a65f' - '7b1b9b3b995e0ade88251bd97ca9b197511ed35657d7ec5643eaee22f7f83993' - 'aa30dd86403f39cc3de9512de05c86dbb69ca141bdb55ca4dd7578c03de174a9' - 'dd4db93874ae433a88dde68ebe5bed864c0af4a37cb81778a4154cda8f310b3d' - '713d91d944688677c3d56f07f7a9e8b9858a38709daf95cea99e5a87f8e429d2' - '56d024b76fa9dde2bcf8720a48bf9c43dc8b48256be6590d3da55fc68c27ad25') +sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa' + '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b' + '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53' + 'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d' + '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06' + '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee' + '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd' + 'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -95,6 +95,6 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done } diff --git a/qt6-base/mingw-w64-static/qtbase-sha256.txt b/qt6-base/mingw-w64-static/qtbase-sha256.txt index c441384f..d7b393f2 100644 --- a/qt6-base/mingw-w64-static/qtbase-sha256.txt +++ b/qt6-base/mingw-w64-static/qtbase-sha256.txt @@ -1 +1 @@ -ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656 +8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa 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 dd5c2245..8590e029 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,4 +1,4 @@ -From b3a78b8672134e97f6a6b511dd1c6822fe9811e8 Mon Sep 17 00:00:00 2001 +From 450fa18bf971462b62ddcf4d2166b4b4d8b821e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 1/7] Use CMake's default import library suffix @@ -13,10 +13,10 @@ Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index e0f10d19bb..ae2fe6e8f3 100644 +index e77e98fe76..35639684a4 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -342,9 +342,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -368,9 +368,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") list(APPEND pri_files "${private_pri_file_path}") @@ -31,7 +31,7 @@ index e0f10d19bb..ae2fe6e8f3 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( -@@ -749,9 +753,13 @@ CONFIG += ${private_config_joined} +@@ -775,9 +779,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -47,7 +47,7 @@ index e0f10d19bb..ae2fe6e8f3 100644 ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 0ad1747961..fcb520f2ad 100644 +index 0c0b7a2aec..d408245ffc 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -348,11 +348,17 @@ ${prl_step1_content_libs} @@ -70,7 +70,7 @@ index 0ad1747961..fcb520f2ad 100644 if(QT_GENERATOR_IS_MULTI_CONFIG) set(configs ${CMAKE_CONFIGURATION_TYPES}) diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake -index fe8d461856..74dfefcedc 100644 +index 2a0a22f682..90d40e30c5 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -288,8 +288,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) 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 76d6bc03..a8f56f0e 100644 --- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch +++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch @@ -1,4 +1,4 @@ -From afc8756fb3d87149d958df1bcd4c9910dee1a104 Mon Sep 17 00:00:00 2001 +From 4e3120dee97c10cf61c3b796b5d353e172c33c75 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 7 Oct 2020 12:13:37 +0200 Subject: [PATCH 2/7] Fix finding D-Bus 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 6d9a15b6..57236e5e 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,4 +1,4 @@ -From 95e7cc0c70ebad9da721154cb523db7c214c6996 Mon Sep 17 00:00:00 2001 +From e97b19b49e4eaaf696b7a57cfa02ae7b07080917 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:13:19 +0100 Subject: [PATCH 3/7] Fix using static PCRE2 and DBus-1 @@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e 2 files changed, 9 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index 827884d709..be5159186c 100644 +index 6cc9011822..76041849b4 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,11 @@ 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 e26f8968..42596efe 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,4 +1,4 @@ -From 10cb71bf97fe6f6ebe9aa4e3f7387df675f32471 Mon Sep 17 00:00:00 2001 +From c037501e09603ef9ab645b0f9c909acb693ac096 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:59:33 +0100 Subject: [PATCH 4/7] Fix transitive dependencies (of static libraries) @@ -7,7 +7,7 @@ The dependencies of these libraries are not reliably picked up by their corresponding find modules. This change allows adding the required dependencies by setting certain variables, e.g. within the toolchain file. -Change-Id: I89da5ef519dd6dd3f86a94a01d3da7208a070bdb +Change-Id: I81dbe9eebf1529116417c5bf5332b3f135e854bd --- cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake | 2 +- cmake/FindMySQL.cmake | 1 + @@ -33,15 +33,15 @@ index 8f873c1b45..831ca8e624 100644 endif() diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake -index 54c94b8a2f..7575386338 100644 +index f6c77d2be1..c20e7c9fa5 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake -@@ -38,6 +38,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) - add_library(MySQL::MySQL UNKNOWN IMPORTED) - set_target_properties(MySQL::MySQL PROPERTIES - IMPORTED_LOCATION "${MySQL_LIBRARIES}" -+ INTERFACE_LINK_LIBRARIES "${MYSQL_DEPENDENCIES}" - INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") +@@ -37,6 +37,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) + add_library(MySQL::MySQL UNKNOWN IMPORTED) + set_target_properties(MySQL::MySQL PROPERTIES + IMPORTED_LOCATION "${MySQL_LIBRARIES}" ++ INTERFACE_LINK_LIBRARIES "${MYSQL_DEPENDENCIES}" + INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") endif() diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake 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 d34889bd..47819a3e 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,4 +1,4 @@ -From 0895ea01a90a5ef93d61971adf4be1d2f3015ce4 Mon Sep 17 00:00:00 2001 +From f1bb9a297c8df01081b073ad302c949488a7dc81 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 2 Nov 2020 13:47:45 +0100 Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h diff --git a/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch b/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch deleted file mode 100644 index 9b07d43e..00000000 --- a/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ea58e477bd07475f2fd9c1b0025732265cf0467c Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Sun, 8 Nov 2020 00:33:12 +0100 -Subject: [PATCH 6/7] Support finding MariaDB - -Change-Id: I3f95a7c3aabc734e1c6c5ce00957ab9814200232 ---- - cmake/FindMySQL.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake -index 7575386338..df1d848cf6 100644 ---- a/cmake/FindMySQL.cmake -+++ b/cmake/FindMySQL.cmake -@@ -24,10 +24,10 @@ pkg_check_modules(PC_MySQL QUIET mysqlclient) - find_path(MySQL_INCLUDE_DIRS - NAMES mysql.h - HINTS ${PC_MySQL_INCLUDEDIR} -- PATH_SUFFIXES mysql) -+ PATH_SUFFIXES mariadb mysql) - - find_library(MySQL_LIBRARIES -- NAMES mysqlclient -+ NAMES mariadb mariadbclient mysqlclient - HINTS ${PC_MySQL_LIBDIR} - ) - --- -2.30.0 - 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 new file mode 100644 index 00000000..042cdd64 --- /dev/null +++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch @@ -0,0 +1,31 @@ +From f209ca4e8726ae7502e06eaea09b5590b9050804 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 8 Nov 2020 00:33:12 +0100 +Subject: [PATCH 6/7] 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 +"libmysqlclient.a" (provided by mingw-w64-mariadb-connector-c during +the shared build (leading to linker errors). + +Change-Id: I52f0998a67d4850d6684cdda59fc4523b8549476 +--- + cmake/FindMySQL.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +index c20e7c9fa5..9346cd55c6 100644 +--- a/cmake/FindMySQL.cmake ++++ b/cmake/FindMySQL.cmake +@@ -27,7 +27,7 @@ find_path(MySQL_INCLUDE_DIRS + PATH_SUFFIXES mysql mariadb) + + find_library(MySQL_LIBRARIES +- NAMES libmysql mysql mysqlclient libmariadb mariadb ++ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient + HINTS ${PC_MySQL_LIBDIR}) + + include(FindPackageHandleStandardArgs) +-- +2.30.0 + 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 90894406..70155e68 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,4 +1,4 @@ -From 563b073d12df9982f3ec75b95a6a9eeb2058c6bd Mon Sep 17 00:00:00 2001 +From 77ef8904f307f78613f799ad4b9946e23c7910e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:34:09 +0100 Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer @@ -10,12 +10,12 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c 1 file changed, 5 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index bb2de0a0c2..a2e8b37ba7 100644 +index 477f5d21e9..fa394cd895 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -@@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR "Qt requires at least CMake version 3.1.0") - endif() +@@ -1,6 +1,10 @@ + # These values should be kept in sync with those in qtbase/.cmake.conf + cmake_minimum_required(VERSION 3.14...3.19) +if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE) + set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}") diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD index 70c01bdc..00533236 100644 --- a/qt6-base/mingw-w64/PKGBUILD +++ b/qt6-base/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -36,16 +36,16 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0003-Fix-using-static-PCRE2-and-DBus-1.patch' '0004-Fix-transitive-dependencies-of-static-libraries.patch' '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' - '0006-Support-finding-MariaDB.patch' + '0006-Support-finding-static-MariaDB-client-library.patch' '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch') -sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656' - '0907b860c3394efc457304e75ec0282799374a83f411e194250cd20f4f703051' - 'ba9f624f9393289930b10a1b976d094f4f023009d46ceaf1a05af0ef9981a65f' - '7b1b9b3b995e0ade88251bd97ca9b197511ed35657d7ec5643eaee22f7f83993' - 'aa30dd86403f39cc3de9512de05c86dbb69ca141bdb55ca4dd7578c03de174a9' - 'dd4db93874ae433a88dde68ebe5bed864c0af4a37cb81778a4154cda8f310b3d' - '713d91d944688677c3d56f07f7a9e8b9858a38709daf95cea99e5a87f8e429d2' - '56d024b76fa9dde2bcf8720a48bf9c43dc8b48256be6590d3da55fc68c27ad25') +sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa' + '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b' + '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53' + 'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d' + '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06' + '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee' + '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd' + 'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-base/mingw-w64/qtbase-sha256.txt b/qt6-base/mingw-w64/qtbase-sha256.txt index c441384f..d7b393f2 100644 --- a/qt6-base/mingw-w64/qtbase-sha256.txt +++ b/qt6-base/mingw-w64/qtbase-sha256.txt @@ -1 +1 @@ -ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656 +8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa diff --git a/qt6-declarative/android-aarch64/PKGBUILD b/qt6-declarative/android-aarch64/PKGBUILD index 787f5f8d..3e6ae5b6 100644 --- a/qt6-declarative/android-aarch64/PKGBUILD +++ b/qt6-declarative/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-declarative -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6') +sha256sums=('6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610') build() { source android-env ${_android_arch} diff --git a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep index c393db31..dcb87f6e 100644 --- a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt b/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt index 989eb316..ecf5fe19 100644 --- a/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt +++ b/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt @@ -1 +1 @@ -8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6 +6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610 diff --git a/qt6-declarative/mingw-w64-static/0001-Exclude-qmltime-when-cross-compiling.patch b/qt6-declarative/mingw-w64-static/0001-Exclude-qmltime-when-cross-compiling.patch new file mode 120000 index 00000000..c08dff18 --- /dev/null +++ b/qt6-declarative/mingw-w64-static/0001-Exclude-qmltime-when-cross-compiling.patch @@ -0,0 +1 @@ +../mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch \ No newline at end of file diff --git a/qt6-declarative/mingw-w64-static/PKGBUILD b/qt6-declarative/mingw-w64-static/PKGBUILD index fca6ff1d..5d0222b0 100644 --- a/qt6-declarative/mingw-w64-static/PKGBUILD +++ b/qt6-declarative/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-declarative-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,11 +17,23 @@ optdepends=('qt6-declarative: development tools') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + '0001-Exclude-qmltime-when-cross-compiling.patch') +sha256sums=('6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610' + 'c252273963e8508483b1edd09463640fdaee4d4c123dc4f000940f9f237f4e54') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' +prepare () { + cd $_pkgfqn + + # apply patches; further descriptions can be found in patch files itself + for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" + patch -p1 -i "$patch" + done +} + build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config @@ -40,7 +52,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt index 989eb316..ecf5fe19 100644 --- a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt @@ -1 +1 @@ -8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6 +6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610 diff --git a/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch b/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch new file mode 100644 index 00000000..c0d939b7 --- /dev/null +++ b/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch @@ -0,0 +1,33 @@ +From 67c5945fa0c3146d2f69c0c71f6ce5abe00edcc0 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Fri, 5 Feb 2021 02:22:45 +0100 +Subject: [PATCH] Exclude qmltime when cross compiling + +as the build script would attempt to set the property of a target +which does not exist (leading to a configuration error). + +This tool seems not really requird and is already disabled when +compiling for Android or when compiling static libraries anyways. +That's likely also why upstream did not notice this problem so far. +--- + tools/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 8438e8c6fa..23753dd0dc 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -30,7 +30,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND + endif() + if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlscene) +- add_subdirectory(qmltime) ++ if(NOT CMAKE_CROSSCOMPILING) ++ add_subdirectory(qmltime) ++ endif() + endif() + if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlplugindump) +-- +2.30.0 + diff --git a/qt6-declarative/mingw-w64/PKGBUILD b/qt6-declarative/mingw-w64/PKGBUILD index b6c89784..b9ed941a 100644 --- a/qt6-declarative/mingw-w64/PKGBUILD +++ b/qt6-declarative/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-declarative -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,11 +17,23 @@ optdepends=('qt6-declarative: development tools') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + '0001-Exclude-qmltime-when-cross-compiling.patch') +sha256sums=('6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610' + 'c252273963e8508483b1edd09463640fdaee4d4c123dc4f000940f9f237f4e54') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' +prepare () { + cd $_pkgfqn + + # apply patches; further descriptions can be found in patch files itself + for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" + patch -p1 -i "$patch" + done +} + build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config diff --git a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep index f8adb0ce..c8146ece 100644 --- a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt index 989eb316..ecf5fe19 100644 --- a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt @@ -1 +1 @@ -8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6 +6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610 diff --git a/qt6-imageformats/android-aarch64/PKGBUILD b/qt6-imageformats/android-aarch64/PKGBUILD index bdec3af8..1e182d58 100644 --- a/qt6-imageformats/android-aarch64/PKGBUILD +++ b/qt6-imageformats/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-imageformats -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -13,12 +13,12 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Plugins for additional image formats: TIFF, TGA, WBMP (android)' depends=('android-aarch64-qt6-base' "android-${_android_arch}-libwebp") -makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=8' 'git') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=8') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtimageformats-everywhere-src-${_qtver}" -source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#tag=v6.0.0") -sha256sums=('SKIP') +source=("https://download.qt.io/official_releases/additional_libraries/qtimageformats/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") +sha256sums=('27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105') build() { source android-env ${_android_arch} diff --git a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep index dbd974b1..3992ccab 100644 --- a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ -% layout 'android-qt6-module', git_tag => 'v6.0.0'; +% layout 'android-qt6-module', additional_library => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Plugins for additional image formats: TIFF, TGA, WBMP (android)' depends=(<%== qt6deps qw(base) %> "android-${_android_arch}-libwebp") -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=8' 'git') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=8') diff --git a/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt b/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt index cc2ecb63..1bb67125 100644 --- a/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt +++ b/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt @@ -1 +1 @@ -SKIP +27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105 diff --git a/qt6-imageformats/mingw-w64-static/PKGBUILD b/qt6-imageformats/mingw-w64-static/PKGBUILD index d7818fef..ee943bd4 100644 --- a/qt6-imageformats/mingw-w64-static/PKGBUILD +++ b/qt6-imageformats/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-imageformats-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,8 +19,8 @@ makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja' 'git') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtimageformats-everywhere-src-${_qtver}" -source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#tag=v6.0.0") -sha256sums=('SKIP') +source=("https://download.qt.io/official_releases/additional_libraries/qtimageformats/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") +sha256sums=('27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -42,7 +42,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt b/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt index cc2ecb63..1bb67125 100644 --- a/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt +++ b/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt @@ -1 +1 @@ -SKIP +27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105 diff --git a/qt6-imageformats/mingw-w64/PKGBUILD b/qt6-imageformats/mingw-w64/PKGBUILD index 7bca7704..ef2c6d9c 100644 --- a/qt6-imageformats/mingw-w64/PKGBUILD +++ b/qt6-imageformats/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-imageformats -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,8 +19,8 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja' 'git') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtimageformats-everywhere-src-${_qtver}" -source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#tag=v6.0.0") -sha256sums=('SKIP') +source=("https://download.qt.io/official_releases/additional_libraries/qtimageformats/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") +sha256sums=('27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep index c443db80..ae535039 100644 --- a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ -% layout 'mingw-w64-qt6-module', git_tag => 'v6.0.0'; +% layout 'mingw-w64-qt6-module', additional_library => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt index cc2ecb63..1bb67125 100644 --- a/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt +++ b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt @@ -1 +1 @@ -SKIP +27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105 diff --git a/qt6-networkauth/android-aarch64/PKGBUILD b/qt6-networkauth/android-aarch64/PKGBUILD new file mode 100644 index 00000000..36270e03 --- /dev/null +++ b/qt6-networkauth/android-aarch64/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Martchus + +# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where +# you also find the URL of a binary repository. + +_android_arch=aarch64 +pkgname=android-$_android_arch-qt6-networkauth +_qtver=6.0.1 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Network authentication module (android)' +depends=('android-aarch64-qt6-base') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=8') +options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') +groups=(android-${_android_arch}-qt6) +_pkgfqn="qtnetworkauth-everywhere-src-${_qtver}" +source=("https://download.qt.io/official_releases/additional_libraries/qtnetworkauth/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") +sha256sums=('7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122') + +build() { + source android-env ${_android_arch} + android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ + -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ + -DQT_BINARY_DIR=${ANDROID_PREFIX_BIN} \ + -DQT_INCLUDE_DIRS_NO_SYSTEM=ON \ + -DQT_HOST_PATH=/usr \ + -DANDROID_SDK_ROOT=${ANDROID_HOME} \ + -DANDROID_NDK_ROOT=${ANDROID_NDK_HOME} \ + -DANDROID_STL="c++_shared" \ + -DFEATURE_pkg_config=ON + cmake --build build-$_android_arch +} + +package() { + DESTDIR="$pkgdir" cmake --install build-$_android_arch + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/${ANDROID_PREFIX}" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \; + find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.a' -exec ${ANDROID_STRIP} -g {} \; + [[ -d "${pkgdir}/${ANDROID_PREFIX}/share/doc" ]] && rm -r "${pkgdir}/${ANDROID_PREFIX}/share/doc" || true + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/android-$_android_arch-qt6-base "$pkgdir"/usr/share/licenses/$pkgname + +} diff --git a/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep new file mode 100644 index 00000000..632c9455 --- /dev/null +++ b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep @@ -0,0 +1,11 @@ +% layout 'android-qt6-module', additional_library => 1; +\ +_qtver=6.0.1 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Network authentication module (android)' +depends=(<%== qt6deps qw(base) %>) +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=8') diff --git a/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt b/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt new file mode 100644 index 00000000..b4f79a34 --- /dev/null +++ b/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt @@ -0,0 +1 @@ +7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122 diff --git a/qt6-networkauth/mingw-w64-static/PKGBUILD b/qt6-networkauth/mingw-w64-static/PKGBUILD new file mode 100644 index 00000000..95f6486e --- /dev/null +++ b/qt6-networkauth/mingw-w64-static/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Martchus + +# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where +# you also find the URL of a binary repository. + +pkgname=mingw-w64-qt6-networkauth-static +_qtver=6.0.1 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Network authentication module (mingw-w64)' +depends=('mingw-w64-qt6-base-static') +makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja') +options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') +groups=(mingw-w64-qt6) +_pkgfqn="qtnetworkauth-everywhere-src-${_qtver}" +source=("https://download.qt.io/official_releases/additional_libraries/qtnetworkauth/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") +sha256sums=('7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122') + +_architectures='i686-w64-mingw32 x86_64-w64-mingw32' + +build() { + for _arch in ${_architectures}; do + export PKG_CONFIG=/usr/bin/$_arch-pkg-config + $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \ + -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \ + -DFEATURE_static_runtime=ON \ + -DFEATURE_pkg_config=ON + cmake --build build-$_arch + done +} + +package() { + for _arch in ${_architectures}; do + DESTDIR="$pkgdir" cmake --install build-$_arch + + find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; + find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; + find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" + done + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/mingw-w64-qt6-base-static "$pkgdir"/usr/share/licenses/$pkgname + +} + diff --git a/qt6-networkauth/mingw-w64-static/PKGBUILD.sh.ep b/qt6-networkauth/mingw-w64-static/PKGBUILD.sh.ep new file mode 100644 index 00000000..87756da4 --- /dev/null +++ b/qt6-networkauth/mingw-w64-static/PKGBUILD.sh.ep @@ -0,0 +1 @@ +%= include "$default_package_name/mingw-w64/PKGBUILD"; diff --git a/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt b/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt new file mode 100644 index 00000000..b4f79a34 --- /dev/null +++ b/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt @@ -0,0 +1 @@ +7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122 diff --git a/qt6-networkauth/mingw-w64/PKGBUILD b/qt6-networkauth/mingw-w64/PKGBUILD new file mode 100644 index 00000000..cc8cf23d --- /dev/null +++ b/qt6-networkauth/mingw-w64/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Martchus + +# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where +# you also find the URL of a binary repository. + +pkgname=mingw-w64-qt6-networkauth +_qtver=6.0.1 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Network authentication module (mingw-w64)' +depends=('mingw-w64-qt6-base') +makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja') +options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') +groups=(mingw-w64-qt6) +_pkgfqn="qtnetworkauth-everywhere-src-${_qtver}" +source=("https://download.qt.io/official_releases/additional_libraries/qtnetworkauth/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz") +sha256sums=('7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122') + +_architectures='i686-w64-mingw32 x86_64-w64-mingw32' + +build() { + for _arch in ${_architectures}; do + export PKG_CONFIG=/usr/bin/$_arch-pkg-config + $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ + -DFEATURE_pkg_config=ON + cmake --build build-$_arch + done +} + +package() { + for _arch in ${_architectures}; do + DESTDIR="$pkgdir" cmake --install build-$_arch + + # Add symlinks of DLLs in usual bin directory + mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin" + for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do + ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}" + done + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; + find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; + find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; + [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + done + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/mingw-w64-qt6-base "$pkgdir"/usr/share/licenses/$pkgname + +} diff --git a/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep b/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep new file mode 100644 index 00000000..719cd894 --- /dev/null +++ b/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep @@ -0,0 +1,11 @@ +% layout 'mingw-w64-qt6-module', additional_library => 1; +\ +_qtver=6.0.1 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Network authentication module (mingw-w64)' +depends=(<%== qt6deps qw(base) %>) +makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'qt6-base' 'ninja') diff --git a/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt b/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt new file mode 100644 index 00000000..b4f79a34 --- /dev/null +++ b/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt @@ -0,0 +1 @@ +7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122 diff --git a/qt6-quick3d/android-aarch64/PKGBUILD b/qt6-quick3d/android-aarch64/PKGBUILD index 15f71d48..dbf05d54 100644 --- a/qt6-quick3d/android-aarch64/PKGBUILD +++ b/qt6-quick3d/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-quick3d -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtquick3d-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8') +sha256sums=('26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388') build() { source android-env ${_android_arch} diff --git a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep index b4e305f9..a791e00d 100644 --- a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt b/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt index 9670602c..9e791b04 100644 --- a/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt +++ b/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt @@ -1 +1 @@ -0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8 +26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388 diff --git a/qt6-quick3d/mingw-w64-static/PKGBUILD b/qt6-quick3d/mingw-w64-static/PKGBUILD index 3b9e3137..2124cbeb 100644 --- a/qt6-quick3d/mingw-w64-static/PKGBUILD +++ b/qt6-quick3d/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quick3d-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquick3d-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8') +sha256sums=('26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -40,7 +40,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt index 9670602c..9e791b04 100644 --- a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt @@ -1 +1 @@ -0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8 +26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388 diff --git a/qt6-quick3d/mingw-w64/PKGBUILD b/qt6-quick3d/mingw-w64/PKGBUILD index f452f07a..2635f46a 100644 --- a/qt6-quick3d/mingw-w64/PKGBUILD +++ b/qt6-quick3d/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quick3d -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquick3d-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8') +sha256sums=('26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep index a7901baf..31e56e99 100644 --- a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt index 9670602c..9e791b04 100644 --- a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt @@ -1 +1 @@ -0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8 +26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388 diff --git a/qt6-quickcontrols2/android-aarch64/PKGBUILD b/qt6-quickcontrols2/android-aarch64/PKGBUILD index 8d4d970d..5cd0bf97 100644 --- a/qt6-quickcontrols2/android-aarch64/PKGBUILD +++ b/qt6-quickcontrols2/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-quickcontrols2 -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b') +sha256sums=('420631d37356e5f5005aaffc9d4a1c0163c77742c0aa6e1a74a7251851d55e25') build() { source android-env ${_android_arch} diff --git a/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep b/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep index 1f9b5bd1..8c46a3c4 100644 --- a/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt index ff89e4ec..0e25bda0 100644 --- a/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b +420631d37356e5f5005aaffc9d4a1c0163c77742c0aa6e1a74a7251851d55e25 diff --git a/qt6-quickcontrols2/mingw-w64-static/PKGBUILD b/qt6-quickcontrols2/mingw-w64-static/PKGBUILD index 09e4729f..db1b5294 100644 --- a/qt6-quickcontrols2/mingw-w64-static/PKGBUILD +++ b/qt6-quickcontrols2/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quickcontrols2-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b') +sha256sums=('420631d37356e5f5005aaffc9d4a1c0163c77742c0aa6e1a74a7251851d55e25') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -39,7 +39,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt index ff89e4ec..0e25bda0 100644 --- a/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b +420631d37356e5f5005aaffc9d4a1c0163c77742c0aa6e1a74a7251851d55e25 diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD b/qt6-quickcontrols2/mingw-w64/PKGBUILD index aa1631c1..5186a773 100644 --- a/qt6-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quickcontrols2 -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b') +sha256sums=('420631d37356e5f5005aaffc9d4a1c0163c77742c0aa6e1a74a7251851d55e25') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep b/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep index 5f13349e..9f31dbc1 100644 --- a/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt index ff89e4ec..0e25bda0 100644 --- a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b +420631d37356e5f5005aaffc9d4a1c0163c77742c0aa6e1a74a7251851d55e25 diff --git a/qt6-quicktimeline/android-aarch64/PKGBUILD b/qt6-quicktimeline/android-aarch64/PKGBUILD index dff71b4e..e86e615d 100644 --- a/qt6-quicktimeline/android-aarch64/PKGBUILD +++ b/qt6-quicktimeline/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-quicktimeline -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c') +sha256sums=('428c864b0be1f617cc4c2adfd334e0729d97b32e24a0fc902b275bdf159224e1') build() { source android-env ${_android_arch} diff --git a/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep b/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep index b690391b..8727383d 100644 --- a/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt b/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt index 5929e07b..dfce3d09 100644 --- a/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt @@ -1 +1 @@ -7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c +428c864b0be1f617cc4c2adfd334e0729d97b32e24a0fc902b275bdf159224e1 diff --git a/qt6-quicktimeline/mingw-w64-static/PKGBUILD b/qt6-quicktimeline/mingw-w64-static/PKGBUILD index 668f33bd..6cf3ec4c 100644 --- a/qt6-quicktimeline/mingw-w64-static/PKGBUILD +++ b/qt6-quicktimeline/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quicktimeline-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c') +sha256sums=('428c864b0be1f617cc4c2adfd334e0729d97b32e24a0fc902b275bdf159224e1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -39,7 +39,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt b/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt index 5929e07b..dfce3d09 100644 --- a/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt @@ -1 +1 @@ -7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c +428c864b0be1f617cc4c2adfd334e0729d97b32e24a0fc902b275bdf159224e1 diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD b/qt6-quicktimeline/mingw-w64/PKGBUILD index 3df786dc..0bfef103 100644 --- a/qt6-quicktimeline/mingw-w64/PKGBUILD +++ b/qt6-quicktimeline/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quicktimeline -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c') +sha256sums=('428c864b0be1f617cc4c2adfd334e0729d97b32e24a0fc902b275bdf159224e1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep b/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep index 926baa61..95ee8ce8 100644 --- a/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt index 5929e07b..dfce3d09 100644 --- a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt @@ -1 +1 @@ -7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c +428c864b0be1f617cc4c2adfd334e0729d97b32e24a0fc902b275bdf159224e1 diff --git a/qt6-shadertools/android-aarch64/PKGBUILD b/qt6-shadertools/android-aarch64/PKGBUILD index 9cb8890c..0080b7d3 100644 --- a/qt6-shadertools/android-aarch64/PKGBUILD +++ b/qt6-shadertools/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-shadertools -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c') +sha256sums=('c4a605361bdf6b534bcf4ae551f3362176a31f2dfeef95b67a22c50e5858c2a6') build() { source android-env ${_android_arch} diff --git a/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep b/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep index 962e582a..37070fa4 100644 --- a/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt b/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt index 0e44d241..cb6336af 100644 --- a/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt +++ b/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt @@ -1 +1 @@ -201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c +c4a605361bdf6b534bcf4ae551f3362176a31f2dfeef95b67a22c50e5858c2a6 diff --git a/qt6-shadertools/mingw-w64-static/PKGBUILD b/qt6-shadertools/mingw-w64-static/PKGBUILD index 726f3b02..5c737365 100644 --- a/qt6-shadertools/mingw-w64-static/PKGBUILD +++ b/qt6-shadertools/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-shadertools-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c') +sha256sums=('c4a605361bdf6b534bcf4ae551f3362176a31f2dfeef95b67a22c50e5858c2a6') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -40,7 +40,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt b/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt index 0e44d241..cb6336af 100644 --- a/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt @@ -1 +1 @@ -201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c +c4a605361bdf6b534bcf4ae551f3362176a31f2dfeef95b67a22c50e5858c2a6 diff --git a/qt6-shadertools/mingw-w64/PKGBUILD b/qt6-shadertools/mingw-w64/PKGBUILD index dedb6d05..0b2c70db 100644 --- a/qt6-shadertools/mingw-w64/PKGBUILD +++ b/qt6-shadertools/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-shadertools -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c') +sha256sums=('c4a605361bdf6b534bcf4ae551f3362176a31f2dfeef95b67a22c50e5858c2a6') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep b/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep index a84a4b9b..4db8d037 100644 --- a/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt index 0e44d241..cb6336af 100644 --- a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt @@ -1 +1 @@ -201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c +c4a605361bdf6b534bcf4ae551f3362176a31f2dfeef95b67a22c50e5858c2a6 diff --git a/qt6-svg/android-aarch64/PKGBUILD b/qt6-svg/android-aarch64/PKGBUILD index 17a8dbb4..08dc0b28 100644 --- a/qt6-svg/android-aarch64/PKGBUILD +++ b/qt6-svg/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-svg -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b') +sha256sums=('9a8c58fb48c1b64cf10ae22db44a638e892e0f93a28933d82e935a849e6445bb') build() { source android-env ${_android_arch} diff --git a/qt6-svg/android-aarch64/PKGBUILD.sh.ep b/qt6-svg/android-aarch64/PKGBUILD.sh.ep index 802c1b4d..7941f41e 100644 --- a/qt6-svg/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-svg/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-svg/android-aarch64/qtsvg-sha256.txt b/qt6-svg/android-aarch64/qtsvg-sha256.txt index 2a891cb5..2d6fe6d9 100644 --- a/qt6-svg/android-aarch64/qtsvg-sha256.txt +++ b/qt6-svg/android-aarch64/qtsvg-sha256.txt @@ -1 +1 @@ -9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b +9a8c58fb48c1b64cf10ae22db44a638e892e0f93a28933d82e935a849e6445bb diff --git a/qt6-svg/mingw-w64-static/PKGBUILD b/qt6-svg/mingw-w64-static/PKGBUILD index 4daae493..7f37c051 100644 --- a/qt6-svg/mingw-w64-static/PKGBUILD +++ b/qt6-svg/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-svg-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b') +sha256sums=('9a8c58fb48c1b64cf10ae22db44a638e892e0f93a28933d82e935a849e6445bb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -39,7 +39,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt index 2a891cb5..2d6fe6d9 100644 --- a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt @@ -1 +1 @@ -9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b +9a8c58fb48c1b64cf10ae22db44a638e892e0f93a28933d82e935a849e6445bb diff --git a/qt6-svg/mingw-w64/PKGBUILD b/qt6-svg/mingw-w64/PKGBUILD index 8d2a5597..83ccfe3f 100644 --- a/qt6-svg/mingw-w64/PKGBUILD +++ b/qt6-svg/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-svg -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b') +sha256sums=('9a8c58fb48c1b64cf10ae22db44a638e892e0f93a28933d82e935a849e6445bb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-svg/mingw-w64/PKGBUILD.sh.ep b/qt6-svg/mingw-w64/PKGBUILD.sh.ep index f6057669..718ffa75 100644 --- a/qt6-svg/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-svg/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-svg/mingw-w64/qtsvg-sha256.txt b/qt6-svg/mingw-w64/qtsvg-sha256.txt index 2a891cb5..2d6fe6d9 100644 --- a/qt6-svg/mingw-w64/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64/qtsvg-sha256.txt @@ -1 +1 @@ -9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b +9a8c58fb48c1b64cf10ae22db44a638e892e0f93a28933d82e935a849e6445bb diff --git a/qt6-tools/android-aarch64/0001-Make-windeployqt-an-optional-feature.patch b/qt6-tools/android-aarch64/0001-Make-windeployqt-an-optional-feature.patch deleted file mode 100644 index 76a8d8db..00000000 --- a/qt6-tools/android-aarch64/0001-Make-windeployqt-an-optional-feature.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 007674dc717498f33a8e30a558e8d6560369a0fd Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 26 Nov 2020 01:53:27 +0100 -Subject: [PATCH] Make windeployqt an optional feature - -Change-Id: I3c797df913c07ed80929b41d367b1ebb41d8400f ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 770f1cab..d5d34064 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -51,7 +51,7 @@ endif() - if(TARGET Qt::DBus) - add_subdirectory(qdbus) - endif() --if(WIN32) -+if(QT_FEATURE_windeployqt) - add_subdirectory(windeployqt) - endif() - if(QT_FEATURE_commandlineparser AND TARGET Qt::Gui AND NOT ANDROID AND NOT QNX AND NOT UIKIT AND NOT WASM) --- -2.29.2 - diff --git a/qt6-tools/android-aarch64/PKGBUILD b/qt6-tools/android-aarch64/PKGBUILD index 32a33abc..8cde93a2 100644 --- a/qt6-tools/android-aarch64/PKGBUILD +++ b/qt6-tools/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-tools -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,20 +17,8 @@ makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - '0001-Make-windeployqt-an-optional-feature.patch') -sha256sums=('b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae' - 'f316cdb87dcc84d1fe9ebd262812118e35571aa0fadd3da6ac3b9f42af19b8bb') - -prepare () { - cd $_pkgfqn - - # apply patches; further descriptions can be found in patch files itself - for patch in "$srcdir/"*.patch; do - msg2 "Applying patch $patch" - patch -p1 -i "$patch" - done -} +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('dc354358f7d2ed56d17190f4ad7e3fc3ad88185be1eb74b9132b8b66185c349f') build() { source android-env ${_android_arch} diff --git a/qt6-tools/android-aarch64/PKGBUILD.sh.ep b/qt6-tools/android-aarch64/PKGBUILD.sh.ep index 79b584be..c492fd10 100644 --- a/qt6-tools/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-tools/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-tools/android-aarch64/qttools-sha256.txt b/qt6-tools/android-aarch64/qttools-sha256.txt index 253cf3ba..a80646fd 100644 --- a/qt6-tools/android-aarch64/qttools-sha256.txt +++ b/qt6-tools/android-aarch64/qttools-sha256.txt @@ -1 +1 @@ -b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae +dc354358f7d2ed56d17190f4ad7e3fc3ad88185be1eb74b9132b8b66185c349f diff --git a/qt6-tools/mingw-w64-static/0001-Make-windeployqt-an-optional-feature.patch b/qt6-tools/mingw-w64-static/0001-Make-windeployqt-an-optional-feature.patch deleted file mode 120000 index a6b4fdab..00000000 --- a/qt6-tools/mingw-w64-static/0001-Make-windeployqt-an-optional-feature.patch +++ /dev/null @@ -1 +0,0 @@ -../mingw-w64/0001-Make-windeployqt-an-optional-feature.patch \ No newline at end of file diff --git a/qt6-tools/mingw-w64-static/PKGBUILD b/qt6-tools/mingw-w64-static/PKGBUILD index fbcf5fcd..d2037ea5 100644 --- a/qt6-tools/mingw-w64-static/PKGBUILD +++ b/qt6-tools/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-tools-static -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,23 +16,11 @@ makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulk options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - '0001-Make-windeployqt-an-optional-feature.patch') -sha256sums=('b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae' - 'f316cdb87dcc84d1fe9ebd262812118e35571aa0fadd3da6ac3b9f42af19b8bb') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('dc354358f7d2ed56d17190f4ad7e3fc3ad88185be1eb74b9132b8b66185c349f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' -prepare () { - cd $_pkgfqn - - # apply patches; further descriptions can be found in patch files itself - for patch in "$srcdir/"*.patch; do - msg2 "Applying patch $patch" - patch -p1 -i "$patch" - done -} - build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config @@ -52,7 +40,7 @@ package() { find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; - [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc" + [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc" done install -d "$pkgdir"/usr/share/licenses diff --git a/qt6-tools/mingw-w64-static/qttools-sha256.txt b/qt6-tools/mingw-w64-static/qttools-sha256.txt index 253cf3ba..a80646fd 100644 --- a/qt6-tools/mingw-w64-static/qttools-sha256.txt +++ b/qt6-tools/mingw-w64-static/qttools-sha256.txt @@ -1 +1 @@ -b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae +dc354358f7d2ed56d17190f4ad7e3fc3ad88185be1eb74b9132b8b66185c349f diff --git a/qt6-tools/mingw-w64/0001-Make-windeployqt-an-optional-feature.patch b/qt6-tools/mingw-w64/0001-Make-windeployqt-an-optional-feature.patch deleted file mode 100644 index 76a8d8db..00000000 --- a/qt6-tools/mingw-w64/0001-Make-windeployqt-an-optional-feature.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 007674dc717498f33a8e30a558e8d6560369a0fd Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 26 Nov 2020 01:53:27 +0100 -Subject: [PATCH] Make windeployqt an optional feature - -Change-Id: I3c797df913c07ed80929b41d367b1ebb41d8400f ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 770f1cab..d5d34064 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -51,7 +51,7 @@ endif() - if(TARGET Qt::DBus) - add_subdirectory(qdbus) - endif() --if(WIN32) -+if(QT_FEATURE_windeployqt) - add_subdirectory(windeployqt) - endif() - if(QT_FEATURE_commandlineparser AND TARGET Qt::Gui AND NOT ANDROID AND NOT QNX AND NOT UIKIT AND NOT WASM) --- -2.29.2 - diff --git a/qt6-tools/mingw-w64/PKGBUILD b/qt6-tools/mingw-w64/PKGBUILD index 15994cfd..6af6340d 100644 --- a/qt6-tools/mingw-w64/PKGBUILD +++ b/qt6-tools/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-tools -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,23 +16,11 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd- options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - '0001-Make-windeployqt-an-optional-feature.patch') -sha256sums=('b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae' - 'f316cdb87dcc84d1fe9ebd262812118e35571aa0fadd3da6ac3b9f42af19b8bb') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('dc354358f7d2ed56d17190f4ad7e3fc3ad88185be1eb74b9132b8b66185c349f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' -prepare () { - cd $_pkgfqn - - # apply patches; further descriptions can be found in patch files itself - for patch in "$srcdir/"*.patch; do - msg2 "Applying patch $patch" - patch -p1 -i "$patch" - done -} - build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config diff --git a/qt6-tools/mingw-w64/PKGBUILD.sh.ep b/qt6-tools/mingw-w64/PKGBUILD.sh.ep index 54cf7541..6565b7fd 100644 --- a/qt6-tools/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-tools/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-tools/mingw-w64/qttools-sha256.txt b/qt6-tools/mingw-w64/qttools-sha256.txt index 253cf3ba..a80646fd 100644 --- a/qt6-tools/mingw-w64/qttools-sha256.txt +++ b/qt6-tools/mingw-w64/qttools-sha256.txt @@ -1 +1 @@ -b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae +dc354358f7d2ed56d17190f4ad7e3fc3ad88185be1eb74b9132b8b66185c349f diff --git a/qt6-translations/android-aarch64/PKGBUILD b/qt6-translations/android-aarch64/PKGBUILD index f63bdf60..9302668e 100644 --- a/qt6-translations/android-aarch64/PKGBUILD +++ b/qt6-translations/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-translations -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qttranslations-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5') +sha256sums=('3799c7537b37a097cc605ef6dd6b12036c423307357892ff260875ea14f3e023') build() { source android-env ${_android_arch} diff --git a/qt6-translations/android-aarch64/PKGBUILD.sh.ep b/qt6-translations/android-aarch64/PKGBUILD.sh.ep index ae882078..c2a6ddc7 100644 --- a/qt6-translations/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-translations/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', no_libs => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/android-aarch64/qttranslations-sha256.txt b/qt6-translations/android-aarch64/qttranslations-sha256.txt index e8d931a9..edec9c92 100644 --- a/qt6-translations/android-aarch64/qttranslations-sha256.txt +++ b/qt6-translations/android-aarch64/qttranslations-sha256.txt @@ -1 +1 @@ -ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5 +3799c7537b37a097cc605ef6dd6b12036c423307357892ff260875ea14f3e023 diff --git a/qt6-translations/mingw-w64/PKGBUILD b/qt6-translations/mingw-w64/PKGBUILD index a86a1e30..96033bc9 100644 --- a/qt6-translations/mingw-w64/PKGBUILD +++ b/qt6-translations/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-translations -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttranslations-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5') +sha256sums=('3799c7537b37a097cc605ef6dd6b12036c423307357892ff260875ea14f3e023') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-translations/mingw-w64/PKGBUILD.sh.ep b/qt6-translations/mingw-w64/PKGBUILD.sh.ep index cd2a4101..a37b723e 100644 --- a/qt6-translations/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-translations/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', no_libs => 1; \ -_qtver=6.0.0 +_qtver=6.0.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/mingw-w64/qttranslations-sha256.txt b/qt6-translations/mingw-w64/qttranslations-sha256.txt index e8d931a9..edec9c92 100644 --- a/qt6-translations/mingw-w64/qttranslations-sha256.txt +++ b/qt6-translations/mingw-w64/qttranslations-sha256.txt @@ -1 +1 @@ -ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5 +3799c7537b37a097cc605ef6dd6b12036c423307357892ff260875ea14f3e023