From bb9b4c83255d1126621e6881340adbb59829e153 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 10 Nov 2020 17:31:01 +0100 Subject: [PATCH] Update Qt 6 packages to beta4 --- .../templates/layouts/mingw-w64-qt6-base.sh.ep | 2 +- devel/versions.sh | 2 +- passwordmanager/qt6/PKGBUILD | 6 +++--- qt6-5compat/default/PKGBUILD | 4 ++-- qt6-5compat/default/PKGBUILD.sh.ep | 2 +- qt6-5compat/default/qt5compat-sha256.txt | 2 +- qt6-5compat/mingw-w64-static/PKGBUILD | 4 ++-- .../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 +- qt6-base/default/PKGBUILD | 4 ++-- qt6-base/default/qtbase-sha256.txt | 2 +- ...CMake-s-default-import-library-suffix.patch | 8 ++++---- .../0002-Fix-finding-D-Bus.patch | 2 +- ...003-Fix-using-static-PCRE2-and-DBus-1.patch | 2 +- ...tive-dependencies-of-static-libraries.patch | 2 +- ...workaround-for-conflict-with-rpcndr.h.patch | 2 +- .../0006-Support-finding-MariaDB.patch | 2 +- ...g-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | 6 +++--- qt6-base/mingw-w64-static/PKGBUILD | 18 +++++++++--------- qt6-base/mingw-w64-static/qtbase-sha256.txt | 2 +- ...CMake-s-default-import-library-suffix.patch | 8 ++++---- .../mingw-w64/0002-Fix-finding-D-Bus.patch | 2 +- ...003-Fix-using-static-PCRE2-and-DBus-1.patch | 2 +- ...tive-dependencies-of-static-libraries.patch | 2 +- ...workaround-for-conflict-with-rpcndr.h.patch | 2 +- .../0006-Support-finding-MariaDB.patch | 2 +- ...g-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | 6 +++--- qt6-base/mingw-w64/PKGBUILD | 18 +++++++++--------- qt6-base/mingw-w64/qtbase-sha256.txt | 2 +- qt6-declarative/default/PKGBUILD | 4 ++-- qt6-declarative/default/PKGBUILD.sh.ep | 2 +- .../default/qtdeclarative-sha256.txt | 2 +- qt6-declarative/mingw-w64-static/PKGBUILD | 4 ++-- .../mingw-w64-static/qtdeclarative-sha256.txt | 2 +- qt6-declarative/mingw-w64/PKGBUILD | 4 ++-- qt6-declarative/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtdeclarative-sha256.txt | 2 +- qt6-imageformats/default/PKGBUILD | 4 ++-- qt6-imageformats/default/PKGBUILD.sh.ep | 4 ++-- qt6-imageformats/mingw-w64-static/PKGBUILD | 4 ++-- qt6-imageformats/mingw-w64/PKGBUILD | 4 ++-- qt6-imageformats/mingw-w64/PKGBUILD.sh.ep | 4 ++-- qt6-quick3d/default/PKGBUILD | 4 ++-- qt6-quick3d/default/PKGBUILD.sh.ep | 2 +- qt6-quick3d/default/qtquick3d-sha256.txt | 2 +- qt6-quick3d/mingw-w64-static/PKGBUILD | 4 ++-- .../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/default/PKGBUILD | 4 ++-- qt6-quickcontrols2/default/PKGBUILD.sh.ep | 2 +- .../default/qtquickcontrols2-sha256.txt | 2 +- qt6-quickcontrols2/mingw-w64-static/PKGBUILD | 4 ++-- .../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/default/PKGBUILD | 4 ++-- qt6-quicktimeline/default/PKGBUILD.sh.ep | 2 +- .../default/qtquicktimeline-sha256.txt | 2 +- qt6-quicktimeline/mingw-w64-static/PKGBUILD | 4 ++-- .../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/default/PKGBUILD | 4 ++-- qt6-shadertools/default/PKGBUILD.sh.ep | 2 +- .../default/qtshadertools-sha256.txt | 2 +- qt6-shadertools/mingw-w64-static/PKGBUILD | 4 ++-- .../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/default/PKGBUILD | 4 ++-- qt6-svg/default/PKGBUILD.sh.ep | 2 +- qt6-svg/default/qtsvg-sha256.txt | 2 +- qt6-svg/mingw-w64-static/PKGBUILD | 4 ++-- 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 +- qt6-tools/default/PKGBUILD | 4 ++-- qt6-tools/default/PKGBUILD.sh.ep | 2 +- qt6-tools/default/qttools-sha256.txt | 2 +- ...oyqt-Fix-name-of-qt6CoreName-variable.patch | 2 +- qt6-tools/mingw-w64-static/PKGBUILD | 6 +++--- qt6-tools/mingw-w64-static/qttools-sha256.txt | 2 +- ...oyqt-Fix-name-of-qt6CoreName-variable.patch | 2 +- qt6-tools/mingw-w64/PKGBUILD | 6 +++--- qt6-tools/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-tools/mingw-w64/qttools-sha256.txt | 2 +- qt6-translations/default/PKGBUILD | 4 ++-- qt6-translations/default/PKGBUILD.sh.ep | 2 +- .../default/qttranslations-sha256.txt | 2 +- qt6-translations/mingw-w64/PKGBUILD | 4 ++-- qt6-translations/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qttranslations-sha256.txt | 2 +- qt6-wayland/default/PKGBUILD | 4 ++-- qt6-wayland/default/PKGBUILD.sh.ep | 2 +- qt6-wayland/default/qtwayland-sha256.txt | 2 +- qt6ct/default/PKGBUILD | 2 +- qtutilities/qt6/PKGBUILD | 6 +++--- syncthingtray/qt6/PKGBUILD | 6 +++--- tageditor/qt6/PKGBUILD | 4 ++-- 107 files changed, 175 insertions(+), 175 deletions(-) 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 77b57aad..ea3a5b19 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/devel/versions.sh b/devel/versions.sh index e9049065..0bf049ff 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.1 - [qt6]=6.0.0-beta3 + [qt6]=6.0.0-beta4 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/passwordmanager/qt6/PKGBUILD b/passwordmanager/qt6/PKGBUILD index bf5e3be1..63677c89 100644 --- a/passwordmanager/qt6/PKGBUILD +++ b/passwordmanager/qt6/PKGBUILD @@ -11,12 +11,12 @@ _cfg=qt6 pkgname=passwordmanager-$_cfg _name=${pkgname%-$_cfg} pkgver=4.1.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL' license=('GPL') depends=('qt6-base' 'qtutilities-qt6' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils') -makedepends=('cmake' 'ninja' 'qt6-tools' 'mesa' 'kirigami2') +makedepends=('cmake' 'ninja' 'qt6-tools' 'clang' 'mesa' 'kirigami2') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('4e5ef1c6dfcf9b642c4552cd4be2f88344238956f157f69defab24db655f5cda') @@ -37,7 +37,7 @@ build() { -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \ -DPASSWORD_MANAGER_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \ -DQT_PACKAGE_PREFIX:STRING='Qt6' \ - -DENABLE_QT_TRANSLATIONS:BOOL=OFF \ + -DBUILTIN_TRANSLATIONS:BOOL=ON \ -DQUICK_GUI="$_quick_gui" . ninja } diff --git a/qt6-5compat/default/PKGBUILD b/qt6-5compat/default/PKGBUILD index ebe6ef02..2dd7ab97 100644 --- a/qt6-5compat/default/PKGBUILD +++ b/qt6-5compat/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-5compat -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab') +sha256sums=('3d453b278fd44290bda3d688b7699e0f243675517b3c3109aa4ee0be6cf8e81d') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-5compat/default/PKGBUILD.sh.ep b/qt6-5compat/default/PKGBUILD.sh.ep index 51d7283e..feaec066 100644 --- a/qt6-5compat/default/PKGBUILD.sh.ep +++ b/qt6-5compat/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-5compat/default/qt5compat-sha256.txt b/qt6-5compat/default/qt5compat-sha256.txt index c0cf1170..593dec08 100644 --- a/qt6-5compat/default/qt5compat-sha256.txt +++ b/qt6-5compat/default/qt5compat-sha256.txt @@ -1 +1 @@ -94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab +3d453b278fd44290bda3d688b7699e0f243675517b3c3109aa4ee0be6cf8e81d diff --git a/qt6-5compat/mingw-w64-static/PKGBUILD b/qt6-5compat/mingw-w64-static/PKGBUILD index 41427128..457bfbe8 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab') +sha256sums=('3d453b278fd44290bda3d688b7699e0f243675517b3c3109aa4ee0be6cf8e81d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt index c0cf1170..593dec08 100644 --- a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt @@ -1 +1 @@ -94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab +3d453b278fd44290bda3d688b7699e0f243675517b3c3109aa4ee0be6cf8e81d diff --git a/qt6-5compat/mingw-w64/PKGBUILD b/qt6-5compat/mingw-w64/PKGBUILD index c3952481..5b312ae9 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab') +sha256sums=('3d453b278fd44290bda3d688b7699e0f243675517b3c3109aa4ee0be6cf8e81d') _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 976f907f..41c8094b 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-beta3 +_qtver=6.0.0-beta4 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 c0cf1170..593dec08 100644 --- a/qt6-5compat/mingw-w64/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64/qt5compat-sha256.txt @@ -1 +1 @@ -94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab +3d453b278fd44290bda3d688b7699e0f243675517b3c3109aa4ee0be6cf8e81d diff --git a/qt6-base/default/PKGBUILD b/qt6-base/default/PKGBUILD index b81874ab..1bb4fe86 100644 --- a/qt6-base/default/PKGBUILD +++ b/qt6-base/default/PKGBUILD @@ -5,7 +5,7 @@ # you also find the URL of a binary repository. pkgname=qt6-base -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -27,7 +27,7 @@ optdepends=('postgresql-libs: PostgreSQL driver' groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268') +sha256sums=('5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e') build() { cmake -G Ninja -B build -S $_pkgfqn \ diff --git a/qt6-base/default/qtbase-sha256.txt b/qt6-base/default/qtbase-sha256.txt index 5057e6d9..3f14737b 100644 --- a/qt6-base/default/qtbase-sha256.txt +++ b/qt6-base/default/qtbase-sha256.txt @@ -1 +1 @@ -37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 +5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e diff --git a/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch index 6df14894..bbce7829 100644 --- a/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,4 +1,4 @@ -From 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001 +From 302744ea356871a22f9cb6819bf0a9baf0e8211c 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 56c60b1b18..18e1aeddb1 100644 +index 5fc0a5877b..5782de0f91 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -320,9 +320,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -330,9 +330,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 56c60b1b18..18e1aeddb1 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( -@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined} +@@ -737,9 +741,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() diff --git a/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch index 28c24248..d5947a85 100644 --- a/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch +++ b/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch @@ -1,4 +1,4 @@ -From 5c192c74f9f5fd7369742a413fe26bdd67ed677f Mon Sep 17 00:00:00 2001 +From 8a975011cc6b9fa6277ad4bb9015d5d509ad769a 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-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch index d8a3748a..7605922a 100644 --- a/qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch +++ b/qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -1,4 +1,4 @@ -From 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001 +From 7a839b449645c8978889c0a09f2c149398c833e3 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 diff --git a/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch index 3e4cbd99..8012f1d6 100644 --- a/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,4 +1,4 @@ -From 4341f7b4267e1287fa6c41ba0a4afddf505408dc Mon Sep 17 00:00:00 2001 +From 7c05fdef291be4b1819c15845116005f865b185e 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) diff --git a/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch index b528b949..4cf130ce 100644 --- a/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,4 +1,4 @@ -From 0f92aeca18858e11ddaa25b7cdad7d89303052ea Mon Sep 17 00:00:00 2001 +From 2e806336a1053599c6b9b2fb1bcd541b256506b2 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-static/0006-Support-finding-MariaDB.patch b/qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch index ab1defa7..fa869f50 100644 --- a/qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch +++ b/qt6-base/mingw-w64-static/0006-Support-finding-MariaDB.patch @@ -1,4 +1,4 @@ -From 757964d9bf2e3d2f315f4210cedd7be6cac54c3f Mon Sep 17 00:00:00 2001 +From e8cb07cbabefc1bf1acfd238b3298c7fa7a6c536 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 diff --git a/qt6-base/mingw-w64-static/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/qt6-base/mingw-w64-static/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch index c1013acb..5b830016 100644 --- a/qt6-base/mingw-w64-static/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch +++ b/qt6-base/mingw-w64-static/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch @@ -1,4 +1,4 @@ -From 9bae5f17b9371f03d5075f596bc3d5e50018759d Mon Sep 17 00:00:00 2001 +From dd3d798d4c338164db0ff41ba09af66c43a9d2ab 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,7 +10,7 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c 1 file changed, 5 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index 56e7e99d63..e3025fb2c0 100644 +index 5e49a99f5d..dd8ffc1972 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -24,7 +24,7 @@ index 56e7e99d63..e3025fb2c0 100644 ###################################### # # Macros for building Qt modules -@@ -220,6 +224,7 @@ macro(qt_prepare_standalone_project) +@@ -224,6 +228,7 @@ macro(qt_prepare_standalone_project) endmacro() macro(qt_build_repo_begin) diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD index ac07f6a8..7193d4a8 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -38,14 +38,14 @@ source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/s '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' '0006-Support-finding-MariaDB.patch' '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch') -sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268' - '272d7231b65b6af60c897ff9ac645929976f75c30a9229670da98333fa598811' - 'f95f407ce4ec738ee98b9219e197d4c1e0926cca35f63179114d598b2591e80a' - 'cb8f9ef03daf86444572f21e38b514794aa23e4419983edde1118e93287750bf' - '399b81b9fd5bedfe135f60b1e91721a8edbaf267539754e27849532130b7077b' - '4311c05baf1da78f5acec304dbc53c402542aaa81268939251bda81cc004afd0' - '1200b9c57290fcb9e54e0bddf88536fe58b39ae2a24a3e2fd802cd16c7bfeb62' - '45201209696cce59d9e4f0358889eafb68c8e10b314892fac05692b24c301db7') +sha256sums=('5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e' + 'bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f' + '9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579' + '37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847' + '3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8' + 'f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1' + 'bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657' + 'df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-base/mingw-w64-static/qtbase-sha256.txt b/qt6-base/mingw-w64-static/qtbase-sha256.txt index 5057e6d9..3f14737b 100644 --- a/qt6-base/mingw-w64-static/qtbase-sha256.txt +++ b/qt6-base/mingw-w64-static/qtbase-sha256.txt @@ -1 +1 @@ -37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 +5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e 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 6df14894..bbce7829 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 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001 +From 302744ea356871a22f9cb6819bf0a9baf0e8211c 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 56c60b1b18..18e1aeddb1 100644 +index 5fc0a5877b..5782de0f91 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -320,9 +320,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -330,9 +330,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 56c60b1b18..18e1aeddb1 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( -@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined} +@@ -737,9 +741,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() 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 28c24248..d5947a85 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 5c192c74f9f5fd7369742a413fe26bdd67ed677f Mon Sep 17 00:00:00 2001 +From 8a975011cc6b9fa6277ad4bb9015d5d509ad769a 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 d8a3748a..7605922a 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 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001 +From 7a839b449645c8978889c0a09f2c149398c833e3 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 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 3e4cbd99..8012f1d6 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 4341f7b4267e1287fa6c41ba0a4afddf505408dc Mon Sep 17 00:00:00 2001 +From 7c05fdef291be4b1819c15845116005f865b185e 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) 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 b528b949..4cf130ce 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 0f92aeca18858e11ddaa25b7cdad7d89303052ea Mon Sep 17 00:00:00 2001 +From 2e806336a1053599c6b9b2fb1bcd541b256506b2 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 index ab1defa7..fa869f50 100644 --- a/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch +++ b/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch @@ -1,4 +1,4 @@ -From 757964d9bf2e3d2f315f4210cedd7be6cac54c3f Mon Sep 17 00:00:00 2001 +From e8cb07cbabefc1bf1acfd238b3298c7fa7a6c536 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 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 c1013acb..5b830016 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 9bae5f17b9371f03d5075f596bc3d5e50018759d Mon Sep 17 00:00:00 2001 +From dd3d798d4c338164db0ff41ba09af66c43a9d2ab 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,7 +10,7 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c 1 file changed, 5 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index 56e7e99d63..e3025fb2c0 100644 +index 5e49a99f5d..dd8ffc1972 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -24,7 +24,7 @@ index 56e7e99d63..e3025fb2c0 100644 ###################################### # # Macros for building Qt modules -@@ -220,6 +224,7 @@ macro(qt_prepare_standalone_project) +@@ -224,6 +228,7 @@ macro(qt_prepare_standalone_project) endmacro() macro(qt_build_repo_begin) diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD index 92d567c0..3e73b34e 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -38,14 +38,14 @@ source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/s '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' '0006-Support-finding-MariaDB.patch' '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch') -sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268' - '272d7231b65b6af60c897ff9ac645929976f75c30a9229670da98333fa598811' - 'f95f407ce4ec738ee98b9219e197d4c1e0926cca35f63179114d598b2591e80a' - 'cb8f9ef03daf86444572f21e38b514794aa23e4419983edde1118e93287750bf' - '399b81b9fd5bedfe135f60b1e91721a8edbaf267539754e27849532130b7077b' - '4311c05baf1da78f5acec304dbc53c402542aaa81268939251bda81cc004afd0' - '1200b9c57290fcb9e54e0bddf88536fe58b39ae2a24a3e2fd802cd16c7bfeb62' - '45201209696cce59d9e4f0358889eafb68c8e10b314892fac05692b24c301db7') +sha256sums=('5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e' + 'bb9bec76506c3425d6fa2394c2c15cf8c8e84d6ce090f8cd9136c77e7a286d8f' + '9ba0563f3c47327ca2f51c864fc1916a4355f56f82da77dea81c8a90cf315579' + '37e533855b3b498bd1e93879aac05cc77dad3b2df64f9a61440aa2bcb73e9847' + '3bdb93179f5258aa87ce3c2b8e560e2ff9fc9446bfd4688b2faf46c5deb45fc8' + 'f2f64e7b6bc2a3b7c4414fc4c857b206c597ee7174cdaadaccc51ca4c0f5ada1' + 'bd3a50b6a034e647a36cc4bf6a37532d892561255cda3e6cbdaf5849e710b657' + 'df804bde0b39e507f07cbedc18001ea8eb939497c89586e93dc1cbb8c878fbed') _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 5057e6d9..3f14737b 100644 --- a/qt6-base/mingw-w64/qtbase-sha256.txt +++ b/qt6-base/mingw-w64/qtbase-sha256.txt @@ -1 +1 @@ -37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 +5cb57bf0c513eb48cf57115dc1f1792eb3092a412806b46b836b960f82e31b3e diff --git a/qt6-declarative/default/PKGBUILD b/qt6-declarative/default/PKGBUILD index e6f43e0c..2444310c 100644 --- a/qt6-declarative/default/PKGBUILD +++ b/qt6-declarative/default/PKGBUILD @@ -5,7 +5,7 @@ # you also find the URL of a binary repository. pkgname=qt6-declarative -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ makedepends=(cmake python vulkan-headers at-spi2-core ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279') +sha256sums=('615eb2eacf0319f3c0ba6c0bd7a82cc0a4a19d4b9e22c0fe656715765cd5aadf') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-declarative/default/PKGBUILD.sh.ep b/qt6-declarative/default/PKGBUILD.sh.ep index 17bb331b..5634cac4 100644 --- a/qt6-declarative/default/PKGBUILD.sh.ep +++ b/qt6-declarative/default/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Based on: AUR package qt6-declarative-git, official qt5-declarative package % end \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-declarative/default/qtdeclarative-sha256.txt b/qt6-declarative/default/qtdeclarative-sha256.txt index b5875011..291c2a2c 100644 --- a/qt6-declarative/default/qtdeclarative-sha256.txt +++ b/qt6-declarative/default/qtdeclarative-sha256.txt @@ -1 +1 @@ -fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279 +615eb2eacf0319f3c0ba6c0bd7a82cc0a4a19d4b9e22c0fe656715765cd5aadf diff --git a/qt6-declarative/mingw-w64-static/PKGBUILD b/qt6-declarative/mingw-w64-static/PKGBUILD index 10ad7573..9e252435 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279') +sha256sums=('615eb2eacf0319f3c0ba6c0bd7a82cc0a4a19d4b9e22c0fe656715765cd5aadf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt index b5875011..291c2a2c 100644 --- a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt @@ -1 +1 @@ -fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279 +615eb2eacf0319f3c0ba6c0bd7a82cc0a4a19d4b9e22c0fe656715765cd5aadf diff --git a/qt6-declarative/mingw-w64/PKGBUILD b/qt6-declarative/mingw-w64/PKGBUILD index 3c908fd0..ebfe6e29 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279') +sha256sums=('615eb2eacf0319f3c0ba6c0bd7a82cc0a4a19d4b9e22c0fe656715765cd5aadf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep index 6fc382e9..7a66076b 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-beta3 +_qtver=6.0.0-beta4 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 b5875011..291c2a2c 100644 --- a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt @@ -1 +1 @@ -fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279 +615eb2eacf0319f3c0ba6c0bd7a82cc0a4a19d4b9e22c0fe656715765cd5aadf diff --git a/qt6-imageformats/default/PKGBUILD b/qt6-imageformats/default/PKGBUILD index 87851fef..ee7cabec 100644 --- a/qt6-imageformats/default/PKGBUILD +++ b/qt6-imageformats/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-imageformats -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -18,7 +18,7 @@ depends=(qt6-base jasper libwebp) makedepends=(cmake ninja git) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" -source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=c98a77599e01b14064277a2da4c26322bd750f54") +source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=1cca5f2fdbabbfca96978b8cc18e80135e0a9406") sha256sums=('SKIP') build() { diff --git a/qt6-imageformats/default/PKGBUILD.sh.ep b/qt6-imageformats/default/PKGBUILD.sh.ep index 1702b651..bf461ab3 100644 --- a/qt6-imageformats/default/PKGBUILD.sh.ep +++ b/qt6-imageformats/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ -% layout 'qt6-module', git_commit => 'c98a77599e01b14064277a2da4c26322bd750f54'; +% layout 'qt6-module', git_commit => '1cca5f2fdbabbfca96978b8cc18e80135e0a9406'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-imageformats/mingw-w64-static/PKGBUILD b/qt6-imageformats/mingw-w64-static/PKGBUILD index 17d5eae5..f227eb6e 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ 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#commit=c98a77599e01b14064277a2da4c26322bd750f54") +source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=1cca5f2fdbabbfca96978b8cc18e80135e0a9406") sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-imageformats/mingw-w64/PKGBUILD b/qt6-imageformats/mingw-w64/PKGBUILD index 7c89764c..4193a6ef 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ 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#commit=c98a77599e01b14064277a2da4c26322bd750f54") +source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=1cca5f2fdbabbfca96978b8cc18e80135e0a9406") sha256sums=('SKIP') _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 d332eb5c..371f64dc 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_commit => 'c98a77599e01b14064277a2da4c26322bd750f54'; +% layout 'mingw-w64-qt6-module', git_commit => '1cca5f2fdbabbfca96978b8cc18e80135e0a9406'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quick3d/default/PKGBUILD b/qt6-quick3d/default/PKGBUILD index 953dcf41..26d2f3c5 100644 --- a/qt6-quick3d/default/PKGBUILD +++ b/qt6-quick3d/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-quick3d -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ optdepends=('assimp: Import from assimp') groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39') +sha256sums=('d47e1e5d8cf10f37f2933b60ca97ca2ae55c9a0d18f1ca22a0ddd0e2c3c6908e') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-quick3d/default/PKGBUILD.sh.ep b/qt6-quick3d/default/PKGBUILD.sh.ep index 97b40e86..57c14ef6 100644 --- a/qt6-quick3d/default/PKGBUILD.sh.ep +++ b/qt6-quick3d/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-quick3d/default/qtquick3d-sha256.txt b/qt6-quick3d/default/qtquick3d-sha256.txt index 28b32c3c..994fbe3d 100644 --- a/qt6-quick3d/default/qtquick3d-sha256.txt +++ b/qt6-quick3d/default/qtquick3d-sha256.txt @@ -1 +1 @@ -dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39 +d47e1e5d8cf10f37f2933b60ca97ca2ae55c9a0d18f1ca22a0ddd0e2c3c6908e diff --git a/qt6-quick3d/mingw-w64-static/PKGBUILD b/qt6-quick3d/mingw-w64-static/PKGBUILD index 0a41e76e..6c33ff04 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39') +sha256sums=('d47e1e5d8cf10f37f2933b60ca97ca2ae55c9a0d18f1ca22a0ddd0e2c3c6908e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt index 28b32c3c..994fbe3d 100644 --- a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt @@ -1 +1 @@ -dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39 +d47e1e5d8cf10f37f2933b60ca97ca2ae55c9a0d18f1ca22a0ddd0e2c3c6908e diff --git a/qt6-quick3d/mingw-w64/PKGBUILD b/qt6-quick3d/mingw-w64/PKGBUILD index 2d3b250b..390b6b2c 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39') +sha256sums=('d47e1e5d8cf10f37f2933b60ca97ca2ae55c9a0d18f1ca22a0ddd0e2c3c6908e') _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 2962cc75..52f23c60 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-beta3 +_qtver=6.0.0-beta4 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 28b32c3c..994fbe3d 100644 --- a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt @@ -1 +1 @@ -dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39 +d47e1e5d8cf10f37f2933b60ca97ca2ae55c9a0d18f1ca22a0ddd0e2c3c6908e diff --git a/qt6-quickcontrols2/default/PKGBUILD b/qt6-quickcontrols2/default/PKGBUILD index 4363977d..ce1f5ea2 100644 --- a/qt6-quickcontrols2/default/PKGBUILD +++ b/qt6-quickcontrols2/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-quickcontrols2 -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846') +sha256sums=('6b069eec4cbacec74c1ba8fd71d0e15edbe8e4ad5a37cca60e5b706b79d7f0e3') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-quickcontrols2/default/PKGBUILD.sh.ep b/qt6-quickcontrols2/default/PKGBUILD.sh.ep index 60431c1f..9711f314 100644 --- a/qt6-quickcontrols2/default/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt index 91876223..e1d20567 100644 --- a/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846 +6b069eec4cbacec74c1ba8fd71d0e15edbe8e4ad5a37cca60e5b706b79d7f0e3 diff --git a/qt6-quickcontrols2/mingw-w64-static/PKGBUILD b/qt6-quickcontrols2/mingw-w64-static/PKGBUILD index 173e326e..b9bae731 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846') +sha256sums=('6b069eec4cbacec74c1ba8fd71d0e15edbe8e4ad5a37cca60e5b706b79d7f0e3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt index 91876223..e1d20567 100644 --- a/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846 +6b069eec4cbacec74c1ba8fd71d0e15edbe8e4ad5a37cca60e5b706b79d7f0e3 diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD b/qt6-quickcontrols2/mingw-w64/PKGBUILD index 95f611f0..8de161c6 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846') +sha256sums=('6b069eec4cbacec74c1ba8fd71d0e15edbe8e4ad5a37cca60e5b706b79d7f0e3') _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 dddde640..45af9077 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-beta3 +_qtver=6.0.0-beta4 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 91876223..e1d20567 100644 --- a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846 +6b069eec4cbacec74c1ba8fd71d0e15edbe8e4ad5a37cca60e5b706b79d7f0e3 diff --git a/qt6-quicktimeline/default/PKGBUILD b/qt6-quicktimeline/default/PKGBUILD index a37d27a8..31baa21f 100644 --- a/qt6-quicktimeline/default/PKGBUILD +++ b/qt6-quicktimeline/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-quicktimeline -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89') +sha256sums=('b3f6859cef67f0b2e21f75672b72110f9636b084dd0987ec1b2f54bc8212b322') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-quicktimeline/default/PKGBUILD.sh.ep b/qt6-quicktimeline/default/PKGBUILD.sh.ep index 3db5af05..26e80490 100644 --- a/qt6-quicktimeline/default/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-quicktimeline/default/qtquicktimeline-sha256.txt b/qt6-quicktimeline/default/qtquicktimeline-sha256.txt index cca246dc..6968e3ed 100644 --- a/qt6-quicktimeline/default/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/default/qtquicktimeline-sha256.txt @@ -1 +1 @@ -7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89 +b3f6859cef67f0b2e21f75672b72110f9636b084dd0987ec1b2f54bc8212b322 diff --git a/qt6-quicktimeline/mingw-w64-static/PKGBUILD b/qt6-quicktimeline/mingw-w64-static/PKGBUILD index 287ce0d7..5032f17e 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89') +sha256sums=('b3f6859cef67f0b2e21f75672b72110f9636b084dd0987ec1b2f54bc8212b322') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt b/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt index cca246dc..6968e3ed 100644 --- a/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt @@ -1 +1 @@ -7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89 +b3f6859cef67f0b2e21f75672b72110f9636b084dd0987ec1b2f54bc8212b322 diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD b/qt6-quicktimeline/mingw-w64/PKGBUILD index 29507384..2fd8f2b3 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89') +sha256sums=('b3f6859cef67f0b2e21f75672b72110f9636b084dd0987ec1b2f54bc8212b322') _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 6852262b..8aaca35a 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-beta3 +_qtver=6.0.0-beta4 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 cca246dc..6968e3ed 100644 --- a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt @@ -1 +1 @@ -7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89 +b3f6859cef67f0b2e21f75672b72110f9636b084dd0987ec1b2f54bc8212b322 diff --git a/qt6-shadertools/default/PKGBUILD b/qt6-shadertools/default/PKGBUILD index 4a643e56..8b11d5f0 100644 --- a/qt6-shadertools/default/PKGBUILD +++ b/qt6-shadertools/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-shadertools -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728') +sha256sums=('44277c1a1c607fd3393578b3078c2f20b622479154c8c8a4ee001595badfe187') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-shadertools/default/PKGBUILD.sh.ep b/qt6-shadertools/default/PKGBUILD.sh.ep index 3bc2b3e3..96ea442b 100644 --- a/qt6-shadertools/default/PKGBUILD.sh.ep +++ b/qt6-shadertools/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-shadertools/default/qtshadertools-sha256.txt b/qt6-shadertools/default/qtshadertools-sha256.txt index bbf880c5..8aecd585 100644 --- a/qt6-shadertools/default/qtshadertools-sha256.txt +++ b/qt6-shadertools/default/qtshadertools-sha256.txt @@ -1 +1 @@ -19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728 +44277c1a1c607fd3393578b3078c2f20b622479154c8c8a4ee001595badfe187 diff --git a/qt6-shadertools/mingw-w64-static/PKGBUILD b/qt6-shadertools/mingw-w64-static/PKGBUILD index ed360751..06df46e4 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728') +sha256sums=('44277c1a1c607fd3393578b3078c2f20b622479154c8c8a4ee001595badfe187') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt b/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt index bbf880c5..8aecd585 100644 --- a/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt @@ -1 +1 @@ -19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728 +44277c1a1c607fd3393578b3078c2f20b622479154c8c8a4ee001595badfe187 diff --git a/qt6-shadertools/mingw-w64/PKGBUILD b/qt6-shadertools/mingw-w64/PKGBUILD index e4784a13..9e7639fe 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728') +sha256sums=('44277c1a1c607fd3393578b3078c2f20b622479154c8c8a4ee001595badfe187') _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 56a2b9fc..4f239fb2 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-beta3 +_qtver=6.0.0-beta4 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 bbf880c5..8aecd585 100644 --- a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt @@ -1 +1 @@ -19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728 +44277c1a1c607fd3393578b3078c2f20b622479154c8c8a4ee001595badfe187 diff --git a/qt6-svg/default/PKGBUILD b/qt6-svg/default/PKGBUILD index 718dd57d..d1fb7423 100644 --- a/qt6-svg/default/PKGBUILD +++ b/qt6-svg/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-svg -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011') +sha256sums=('77f8b6477be8b63300e475d87d9a720c1fd28ec0809292297abf5a00fc572ced') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-svg/default/PKGBUILD.sh.ep b/qt6-svg/default/PKGBUILD.sh.ep index 702eacde..fba630b9 100644 --- a/qt6-svg/default/PKGBUILD.sh.ep +++ b/qt6-svg/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-svg/default/qtsvg-sha256.txt b/qt6-svg/default/qtsvg-sha256.txt index 78fae6f7..7cf1e2a9 100644 --- a/qt6-svg/default/qtsvg-sha256.txt +++ b/qt6-svg/default/qtsvg-sha256.txt @@ -1 +1 @@ -4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011 +77f8b6477be8b63300e475d87d9a720c1fd28ec0809292297abf5a00fc572ced diff --git a/qt6-svg/mingw-w64-static/PKGBUILD b/qt6-svg/mingw-w64-static/PKGBUILD index bb35d8ae..52f1623d 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011') +sha256sums=('77f8b6477be8b63300e475d87d9a720c1fd28ec0809292297abf5a00fc572ced') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt index 78fae6f7..7cf1e2a9 100644 --- a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt @@ -1 +1 @@ -4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011 +77f8b6477be8b63300e475d87d9a720c1fd28ec0809292297abf5a00fc572ced diff --git a/qt6-svg/mingw-w64/PKGBUILD b/qt6-svg/mingw-w64/PKGBUILD index cbfa5749..72a495cc 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011') +sha256sums=('77f8b6477be8b63300e475d87d9a720c1fd28ec0809292297abf5a00fc572ced') _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 358645a6..ac093fa2 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-beta3 +_qtver=6.0.0-beta4 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 78fae6f7..7cf1e2a9 100644 --- a/qt6-svg/mingw-w64/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64/qtsvg-sha256.txt @@ -1 +1 @@ -4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011 +77f8b6477be8b63300e475d87d9a720c1fd28ec0809292297abf5a00fc572ced diff --git a/qt6-tools/default/PKGBUILD b/qt6-tools/default/PKGBUILD index 293ee6a3..593fe5cc 100644 --- a/qt6-tools/default/PKGBUILD +++ b/qt6-tools/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-tools -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ optdepends=('clang: for qdoc and lupdate') groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8') +sha256sums=('cd15384ed635fc9efa0f5f6679040082f138f28748a17f65b4b415a3d2e639ca') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-tools/default/PKGBUILD.sh.ep b/qt6-tools/default/PKGBUILD.sh.ep index 98871987..caf2dfd1 100644 --- a/qt6-tools/default/PKGBUILD.sh.ep +++ b/qt6-tools/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module', has_binaries => 1; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-tools/default/qttools-sha256.txt b/qt6-tools/default/qttools-sha256.txt index 06b3bacb..2038fb6c 100644 --- a/qt6-tools/default/qttools-sha256.txt +++ b/qt6-tools/default/qttools-sha256.txt @@ -1 +1 @@ -8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8 +cd15384ed635fc9efa0f5f6679040082f138f28748a17f65b4b415a3d2e639ca diff --git a/qt6-tools/mingw-w64-static/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch b/qt6-tools/mingw-w64-static/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch index 0ce2aad9..e58ef2aa 100644 --- a/qt6-tools/mingw-w64-static/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch +++ b/qt6-tools/mingw-w64-static/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch @@ -1,4 +1,4 @@ -From 60a7db7b539515ba8f0fcff6cbc31435797f4b86 Mon Sep 17 00:00:00 2001 +From b675d7e907c0a0cd415322879fa1738e5f7323c8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 17:10:15 +0100 Subject: [PATCH] windeployqt: Fix name of qt6CoreName variable diff --git a/qt6-tools/mingw-w64-static/PKGBUILD b/qt6-tools/mingw-w64-static/PKGBUILD index df0d5731..9f62ecf9 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,8 +18,8 @@ groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" '0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch') -sha256sums=('8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8' - '03ed0cf3fb604d773cae1de19c862e65e8a44a8245db0bfba750557e541f5620') +sha256sums=('cd15384ed635fc9efa0f5f6679040082f138f28748a17f65b4b415a3d2e639ca' + '1f428c44520364d9a0dd03c4f017739fcaccec13a6800e69183c08c91a8d2f57') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-tools/mingw-w64-static/qttools-sha256.txt b/qt6-tools/mingw-w64-static/qttools-sha256.txt index 06b3bacb..2038fb6c 100644 --- a/qt6-tools/mingw-w64-static/qttools-sha256.txt +++ b/qt6-tools/mingw-w64-static/qttools-sha256.txt @@ -1 +1 @@ -8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8 +cd15384ed635fc9efa0f5f6679040082f138f28748a17f65b4b415a3d2e639ca diff --git a/qt6-tools/mingw-w64/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch b/qt6-tools/mingw-w64/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch index 0ce2aad9..e58ef2aa 100644 --- a/qt6-tools/mingw-w64/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch +++ b/qt6-tools/mingw-w64/0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch @@ -1,4 +1,4 @@ -From 60a7db7b539515ba8f0fcff6cbc31435797f4b86 Mon Sep 17 00:00:00 2001 +From b675d7e907c0a0cd415322879fa1738e5f7323c8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 17:10:15 +0100 Subject: [PATCH] windeployqt: Fix name of qt6CoreName variable diff --git a/qt6-tools/mingw-w64/PKGBUILD b/qt6-tools/mingw-w64/PKGBUILD index e6364469..8663cff5 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-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,8 +18,8 @@ groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" '0001-windeployqt-Fix-name-of-qt6CoreName-variable.patch') -sha256sums=('8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8' - '03ed0cf3fb604d773cae1de19c862e65e8a44a8245db0bfba750557e541f5620') +sha256sums=('cd15384ed635fc9efa0f5f6679040082f138f28748a17f65b4b415a3d2e639ca' + '1f428c44520364d9a0dd03c4f017739fcaccec13a6800e69183c08c91a8d2f57') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-tools/mingw-w64/PKGBUILD.sh.ep b/qt6-tools/mingw-w64/PKGBUILD.sh.ep index fc5906e2..9d539c71 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-beta3 +_qtver=6.0.0-beta4 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 06b3bacb..2038fb6c 100644 --- a/qt6-tools/mingw-w64/qttools-sha256.txt +++ b/qt6-tools/mingw-w64/qttools-sha256.txt @@ -1 +1 @@ -8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8 +cd15384ed635fc9efa0f5f6679040082f138f28748a17f65b4b415a3d2e639ca diff --git a/qt6-translations/default/PKGBUILD b/qt6-translations/default/PKGBUILD index 8746fa12..b80d5f30 100644 --- a/qt6-translations/default/PKGBUILD +++ b/qt6-translations/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-translations -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,7 +16,7 @@ makedepends=(cmake qt6-tools ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f') +sha256sums=('63ffd26df581cef6b2a47122917a241f6d4568f193a2907c9b57dd3013dce47e') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-translations/default/PKGBUILD.sh.ep b/qt6-translations/default/PKGBUILD.sh.ep index 6a9df89b..dfd78b4e 100644 --- a/qt6-translations/default/PKGBUILD.sh.ep +++ b/qt6-translations/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module', no_libs => 1; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/default/qttranslations-sha256.txt b/qt6-translations/default/qttranslations-sha256.txt index 67b7fa73..83812324 100644 --- a/qt6-translations/default/qttranslations-sha256.txt +++ b/qt6-translations/default/qttranslations-sha256.txt @@ -1 +1 @@ -d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f +63ffd26df581cef6b2a47122917a241f6d4568f193a2907c9b57dd3013dce47e diff --git a/qt6-translations/mingw-w64/PKGBUILD b/qt6-translations/mingw-w64/PKGBUILD index f3020af6..d59c582a 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-beta3 +_qtver=6.0.0-beta4 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f') +sha256sums=('63ffd26df581cef6b2a47122917a241f6d4568f193a2907c9b57dd3013dce47e') _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 a567005b..08a02ed1 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-beta3 +_qtver=6.0.0-beta4 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 67b7fa73..83812324 100644 --- a/qt6-translations/mingw-w64/qttranslations-sha256.txt +++ b/qt6-translations/mingw-w64/qttranslations-sha256.txt @@ -1 +1 @@ -d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f +63ffd26df581cef6b2a47122917a241f6d4568f193a2907c9b57dd3013dce47e diff --git a/qt6-wayland/default/PKGBUILD b/qt6-wayland/default/PKGBUILD index df7674d6..0f5eabc5 100644 --- a/qt6-wayland/default/PKGBUILD +++ b/qt6-wayland/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-wayland -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('29d106a0eaecf1976b319e7fef30c8ef7b52260d56384046ac477f6974de37a3') +sha256sums=('4ccc1119b030689f2c5c6ef9d11d19af12eaaa6e7cfe903ef741c42b05020db2') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-wayland/default/PKGBUILD.sh.ep b/qt6-wayland/default/PKGBUILD.sh.ep index a9c96bab..d8e9bab1 100644 --- a/qt6-wayland/default/PKGBUILD.sh.ep +++ b/qt6-wayland/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta3 +_qtver=6.0.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-wayland/default/qtwayland-sha256.txt b/qt6-wayland/default/qtwayland-sha256.txt index 56bf5f92..44f5a515 100644 --- a/qt6-wayland/default/qtwayland-sha256.txt +++ b/qt6-wayland/default/qtwayland-sha256.txt @@ -1 +1 @@ -29d106a0eaecf1976b319e7fef30c8ef7b52260d56384046ac477f6974de37a3 +4ccc1119b030689f2c5c6ef9d11d19af12eaaa6e7cfe903ef741c42b05020db2 diff --git a/qt6ct/default/PKGBUILD b/qt6ct/default/PKGBUILD index b2b6090e..21e0dcba 100644 --- a/qt6ct/default/PKGBUILD +++ b/qt6ct/default/PKGBUILD @@ -2,7 +2,7 @@ pkgname=qt6ct pkgver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc='Qt 6 Configuration Utility' arch=(x86_64) url='https://github.com/trialuser02/qt6ct' diff --git a/qtutilities/qt6/PKGBUILD b/qtutilities/qt6/PKGBUILD index 67e19a1b..dbc8cc59 100644 --- a/qtutilities/qt6/PKGBUILD +++ b/qtutilities/qt6/PKGBUILD @@ -8,12 +8,12 @@ _cfg=qt6 pkgname=qtutilities-$_cfg _name=${pkgname%-$_cfg} pkgver=6.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (using Qt 6)' license=('GPL') depends=('c++utilities' 'qt6-base') -makedepends=('cmake' 'ninja' 'qt6-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt6-tools' 'clang' 'mesa') optdepends=("$_name-doc: API documentation") url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -29,7 +29,7 @@ build() { -DCONFIGURATION_DISPLAY_NAME="Qt 6" \ -DCONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \ -DQT_PACKAGE_PREFIX:STRING='Qt6' \ - -DENABLE_QT_TRANSLATIONS:BOOL=OFF \ + -DBUILTIN_TRANSLATIONS:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ . ninja diff --git a/syncthingtray/qt6/PKGBUILD b/syncthingtray/qt6/PKGBUILD index b2e9ad58..df6cfe88 100644 --- a/syncthingtray/qt6/PKGBUILD +++ b/syncthingtray/qt6/PKGBUILD @@ -27,7 +27,7 @@ _cfg=qt6 pkgname=syncthingtray-$_cfg _name=${pkgname%-$_cfg} pkgver=1.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tray application for Syncthing (using Qt 6)' license=('GPL') @@ -39,7 +39,7 @@ depends=('qtutilities-qt6' 'qt6-svg' 'openssl' 'desktop-file-utils' 'xdg-utils') [[ $_js_provider == qml ]] && depends+=('qt6-declarative') [[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin') [[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 6 desktop') -makedepends=('cmake' 'ninja' 'qt6-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt6-tools' 'clang' 'mesa') checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_kio_plugin ]] && makedepends+=('kio') [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules') @@ -73,7 +73,7 @@ build() { -DSYNCTHINGCTL_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \ -DSYNCTHINGTRAY_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \ -DQT_PACKAGE_PREFIX:STRING='Qt6' \ - -DENABLE_QT_TRANSLATIONS:BOOL=OFF \ + -DBUILTIN_TRANSLATIONS:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DWEBVIEW_PROVIDER="${_webview_provider}" \ -DJS_PROVIDER="${_js_provider}" \ diff --git a/tageditor/qt6/PKGBUILD b/tageditor/qt6/PKGBUILD index 338f4c21..3eca0432 100644 --- a/tageditor/qt6/PKGBUILD +++ b/tageditor/qt6/PKGBUILD @@ -27,7 +27,7 @@ depends=('qtutilities-qt6' 'tagparser' 'desktop-file-utils' 'xdg-utils') [[ $_webview_provider == webengine ]] && depends+=('qt6-webengine') [[ $_js_provider == script ]] && depends+=('qt6-script') [[ $_js_provider == qml ]] && depends+=('qt6-declarative') -makedepends=('cmake' 'ninja' 'qt6-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt6-tools' 'clang' 'mesa') [[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson') checkdepends=('cppunit' 'jq') url="https://github.com/Martchus/${_reponame}" @@ -45,7 +45,7 @@ build() { -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \ -DTAGEDITOR_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \ -DQT_PACKAGE_PREFIX:STRING='Qt6' \ - -DENABLE_QT_TRANSLATIONS:BOOL=OFF \ + -DBUILTIN_TRANSLATIONS:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DWEBVIEW_PROVIDER="${_webview_provider}" \ -DJS_PROVIDER="${_js_provider}" \