Update Qt 6 packages to 6.5.2
This commit is contained in:
parent
2eed8bc1be
commit
ef6257dff9
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
|
||||
pkgname=<%= $package_name %>
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
% }
|
||||
|
||||
pkgname=<%= $package_name %>
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ build() {
|
|||
$_arch-cmake<%== $static_suffix %> -G Ninja -B build-$_arch -S $_pkgfqn \\
|
||||
% if ($static_variant) {
|
||||
-DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \\
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \\
|
||||
-DFEATURE_static_runtime=ON \\
|
||||
% }
|
||||
-DFEATURE_pkg_config=ON<%== content_for 'additional_cmake_args' %>
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
% }
|
||||
|
||||
pkgname=<%= $package_name %>
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ declare -A versions=(
|
|||
[dbus-soundrecorder]=1.2.3
|
||||
[geocoordinatecalculator]=1.1.3
|
||||
[qt5]=5.15.10
|
||||
[qt6]=6.5.1
|
||||
[qt6]=6.5.2
|
||||
)
|
||||
declare -A github_names=(
|
||||
[c++utilities]=cpp-utilities
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-$_android_arch-qt6-5compat
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
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=('ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83')
|
||||
sha256sums=('b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4')
|
||||
|
||||
build() {
|
||||
source android-env ${_android_arch}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'android-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83
|
||||
b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-5compat-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
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=('ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83')
|
||||
sha256sums=('b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -26,6 +26,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83
|
||||
b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-5compat
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
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=('ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83')
|
||||
sha256sums=('b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83
|
||||
b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=static-compat-qt6-5compat
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-qt6
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83')
|
||||
sha256sums=('b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4')
|
||||
|
||||
build() {
|
||||
check_buildoption ccache y && ccache_args='
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'static-compat-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83
|
||||
b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-activeqt-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -21,10 +21,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
|||
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
|
||||
'0002-Build-tools-for-the-target-platform.patch'
|
||||
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
||||
sha256sums=('cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a'
|
||||
'21c9e35e91976ecb60ee3dca50959a627d4a6b24c6d316fe5b5331bf8cf8d46e'
|
||||
'ff7a2c46386fcb57f10d7b5b6f2475d99131d84f99ff8b077123e24754140976'
|
||||
'6b8b5c7f712be029dcb4550798236c04367ce062d9dc220231a5546c50c00db7')
|
||||
sha256sums=('5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013'
|
||||
'946ed20134b4c84a360024fa1bb7dae7463b9635af361c4262afd439cc77a8d6'
|
||||
'28f74ae2412a42f10292964f0d1cdcfb8df86cda61e392e59e11240f4874e931'
|
||||
'1f41a0c8bd058e5bc8a5f6a107446f59c4b38cf266bef67793ab69794d757de9')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -43,6 +43,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a
|
||||
5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From fb4a08fae1f7c9188fa4b94025ab22095f0493ce Mon Sep 17 00:00:00 2001
|
||||
From ee8a2e9fcc6c3a85f49a2296a1fc8b6a08d4539c Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 2 Jun 2017 17:21:08 +0200
|
||||
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
|
||||
|
|
@ -52,5 +52,5 @@ index 9820a76..222aff0 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 6bb16d0311114122b2754b4288ebf6b4836e2b4d Mon Sep 17 00:00:00 2001
|
||||
From 38100921079202fb8f7b74f977f052c4b8219786 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 7 May 2021 16:10:47 +0200
|
||||
Subject: [PATCH 2/3] Build tools for the target platform
|
||||
|
|
@ -61,5 +61,5 @@ index 84b4018..1dc4b9e 100644
|
|||
main.cpp
|
||||
LIBRARIES
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From ef9e0a497fef1df8b10779cd4ba5a42309e36dfa Mon Sep 17 00:00:00 2001
|
||||
From abfb2bb0da2bc52a35a9a395d1a05ee3e35c68d0 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Mon, 12 Sep 2022 17:38:47 +0200
|
||||
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
|
||||
|
|
@ -33,5 +33,5 @@ index 222aff0..53d2a18 100644
|
|||
nextTypeAndForceComplete = startType + lengthType;
|
||||
} while (true);
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-activeqt
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -21,10 +21,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
|||
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
|
||||
'0002-Build-tools-for-the-target-platform.patch'
|
||||
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
||||
sha256sums=('cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a'
|
||||
'21c9e35e91976ecb60ee3dca50959a627d4a6b24c6d316fe5b5331bf8cf8d46e'
|
||||
'ff7a2c46386fcb57f10d7b5b6f2475d99131d84f99ff8b077123e24754140976'
|
||||
'6b8b5c7f712be029dcb4550798236c04367ce062d9dc220231a5546c50c00db7')
|
||||
sha256sums=('5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013'
|
||||
'946ed20134b4c84a360024fa1bb7dae7463b9635af361c4262afd439cc77a8d6'
|
||||
'28f74ae2412a42f10292964f0d1cdcfb8df86cda61e392e59e11240f4874e931'
|
||||
'1f41a0c8bd058e5bc8a5f6a107446f59c4b38cf266bef67793ab69794d757de9')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a
|
||||
5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../mingw-w64/0013-QTabBar-recalculate-scroll-offset-when-showing.patch
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-aarch64-qt6-base
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -39,22 +39,20 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
|||
'0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
|
||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
|
||||
'0013-QTabBar-recalculate-scroll-offset-when-showing.patch')
|
||||
sha256sums=('db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed'
|
||||
'283dc72fb579295a67c5d66a6da5e650a137e6c179f744e9a0ee0df8d4618794'
|
||||
'b42a97f117fc0d517eaedf26f4ebaff4ad764794f4d23dc8574e59f977da8d96'
|
||||
'8baa38d80fbba128d41c0620e6bc01b00b1b6c17b09989aeba6aed18b1f0cbb8'
|
||||
'624be4e17ee19815f8fe42c07e1e88cec89df091360842c432900a4b861947d4'
|
||||
'dfe3b54afe2366fee256825f19b2f2899404cf163968e8a9af1bef4a9764964a'
|
||||
'24ce57861b4b6b315634cd2a75b9ca4f4be5c6dec22868c0e8dd3d66d471bd4d'
|
||||
'842336b23d7aaa9d47d6f24846dd05720390be9cb27ab81cddc3142500754c8c'
|
||||
'b104e7fc6f3dd6dd3d74dad07423314310454e45ac8a779f4c3991417f7628ed'
|
||||
'fb5a9561214c941fd25a88df9ef53eae651e5fef757a6169500ff17cfb958ec2'
|
||||
'3942e3df5745c8ee513c6735c00fa2a993b906903939f72ae161a7a9de6de282'
|
||||
'20bf64f05496ad81cddf530d03e6805d10fb3a68411cb28c4b2cf3dbedd29147'
|
||||
'746abfd92394f48af9ac9ca67860305221e3248e1e2a99bc2c761ed84b02f024'
|
||||
'6e47dd529b22736bef04f53414096d1e18e911a150ae518053dfef0b21f2fa17')
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||
sha256sums=('3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269'
|
||||
'540ca3a030c75dd6494e58b1aef583ee706f4956f16e102f9f92aa22fed463d6'
|
||||
'337853ff69a460dc70968fb790d037f7ab013fdc940aca34ece23e0bab98c367'
|
||||
'9cda2dd1805a92e1dbb4730837a88393ce00349f2b559ad7ea5602a45bbbb924'
|
||||
'2917901a83e4f463a5a19387f4580c0f65233fd516f047812237aee791a4a394'
|
||||
'10ee1d9d8dad2b782e1cd671248748dc1b18ca584ca7d6ad43129b1a2a9a4476'
|
||||
'fb95cb0a5a6843048097e89ee903016d899d38a72788607718d23c319f9bd06e'
|
||||
'3c521c1ad55c9c34dfbd9275e3c493de33d9e7acf5788aef4e8853ed15fe6b6d'
|
||||
'39e353883a95122523488d5f75a9e54946f4df0aa248f87b722988a39015780f'
|
||||
'27bbf26f0d9ccf7f0a570983d681731d45f3fa6b36dc1beed467b5b361d43694'
|
||||
'099bd3a735ac31bbca468eb190de49e134ef3185d8617c3d6ded34be2780f7c8'
|
||||
'2ffae91bd81dc98f28860c337b72c55fd35e6706f934ffe1a5fb6c9c4c0c77cd'
|
||||
'186828cc651bbabe2c7082a092a0eb40b82e15b131172bd377f5ec7b95e0a8d9')
|
||||
|
||||
prepare () {
|
||||
cd $_pkgfqn
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
|
||||
3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../mingw-w64/0013-QTabBar-recalculate-scroll-offset-when-showing.patch
|
||||
|
|
@ -11,9 +11,9 @@
|
|||
# All patches are managed at https://github.com/Martchus/qtbase
|
||||
|
||||
pkgname=mingw-w64-qt6-base-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
@ -42,22 +42,20 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
|||
'0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
|
||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
|
||||
'0013-QTabBar-recalculate-scroll-offset-when-showing.patch')
|
||||
sha256sums=('db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed'
|
||||
'283dc72fb579295a67c5d66a6da5e650a137e6c179f744e9a0ee0df8d4618794'
|
||||
'b42a97f117fc0d517eaedf26f4ebaff4ad764794f4d23dc8574e59f977da8d96'
|
||||
'8baa38d80fbba128d41c0620e6bc01b00b1b6c17b09989aeba6aed18b1f0cbb8'
|
||||
'624be4e17ee19815f8fe42c07e1e88cec89df091360842c432900a4b861947d4'
|
||||
'dfe3b54afe2366fee256825f19b2f2899404cf163968e8a9af1bef4a9764964a'
|
||||
'24ce57861b4b6b315634cd2a75b9ca4f4be5c6dec22868c0e8dd3d66d471bd4d'
|
||||
'842336b23d7aaa9d47d6f24846dd05720390be9cb27ab81cddc3142500754c8c'
|
||||
'b104e7fc6f3dd6dd3d74dad07423314310454e45ac8a779f4c3991417f7628ed'
|
||||
'fb5a9561214c941fd25a88df9ef53eae651e5fef757a6169500ff17cfb958ec2'
|
||||
'3942e3df5745c8ee513c6735c00fa2a993b906903939f72ae161a7a9de6de282'
|
||||
'20bf64f05496ad81cddf530d03e6805d10fb3a68411cb28c4b2cf3dbedd29147'
|
||||
'746abfd92394f48af9ac9ca67860305221e3248e1e2a99bc2c761ed84b02f024'
|
||||
'6e47dd529b22736bef04f53414096d1e18e911a150ae518053dfef0b21f2fa17')
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||
sha256sums=('3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269'
|
||||
'540ca3a030c75dd6494e58b1aef583ee706f4956f16e102f9f92aa22fed463d6'
|
||||
'337853ff69a460dc70968fb790d037f7ab013fdc940aca34ece23e0bab98c367'
|
||||
'9cda2dd1805a92e1dbb4730837a88393ce00349f2b559ad7ea5602a45bbbb924'
|
||||
'2917901a83e4f463a5a19387f4580c0f65233fd516f047812237aee791a4a394'
|
||||
'10ee1d9d8dad2b782e1cd671248748dc1b18ca584ca7d6ad43129b1a2a9a4476'
|
||||
'fb95cb0a5a6843048097e89ee903016d899d38a72788607718d23c319f9bd06e'
|
||||
'3c521c1ad55c9c34dfbd9275e3c493de33d9e7acf5788aef4e8853ed15fe6b6d'
|
||||
'39e353883a95122523488d5f75a9e54946f4df0aa248f87b722988a39015780f'
|
||||
'27bbf26f0d9ccf7f0a570983d681731d45f3fa6b36dc1beed467b5b361d43694'
|
||||
'099bd3a735ac31bbca468eb190de49e134ef3185d8617c3d6ded34be2780f7c8'
|
||||
'2ffae91bd81dc98f28860c337b72c55fd35e6706f934ffe1a5fb6c9c4c0c77cd'
|
||||
'186828cc651bbabe2c7082a092a0eb40b82e15b131172bd377f5ec7b95e0a8d9')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
|
||||
3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 7686993d2f493019692d560c29af10da8543f136 Mon Sep 17 00:00:00 2001
|
||||
From e9ac5ed92f5bb2fe3b6c8cf03871fc18731e562b Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
||||
Subject: [PATCH 01/13] Use CMake's default import library suffix
|
||||
Subject: [PATCH 01/12] Use CMake's default import library suffix
|
||||
|
||||
Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
|
||||
---
|
||||
|
|
@ -98,7 +98,7 @@ index 24ed125f12..73ebe453d3 100644
|
|||
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
|
||||
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
|
||||
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
|
||||
index 383870061b..b252e76ae5 100644
|
||||
index d50ec5257a..44a173b5bc 100644
|
||||
--- a/src/corelib/Qt6CoreMacros.cmake
|
||||
+++ b/src/corelib/Qt6CoreMacros.cmake
|
||||
@@ -524,7 +524,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d567a4807d46e1e6036ffca340aecea6ab425de9 Mon Sep 17 00:00:00 2001
|
||||
From f597ecb1b6cc9e2bf5ba1bc700657f9503a4c597 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
||||
Subject: [PATCH 02/13] Fix finding D-Bus
|
||||
Subject: [PATCH 02/12] Fix finding D-Bus
|
||||
|
||||
Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 42064ddb36b78e14dd647850c7743b81da935752 Mon Sep 17 00:00:00 2001
|
||||
From 79f85317efa531350265cdcf176ffe4db4f9c19e Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
||||
Subject: [PATCH 03/13] Fix using static PCRE2 and DBus-1
|
||||
Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1
|
||||
|
||||
When making a static build of Qt we're using the static version of these
|
||||
libraries and must define the corresponding macros.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 6feafcc5b1d1df4fbfb35479d9b9224e2bb44f90 Mon Sep 17 00:00:00 2001
|
||||
From e78b44ab41a8689981ecda3cfc13f78a52c7e8c1 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
||||
Subject: [PATCH 04/13] Fix transitive dependencies (of static libraries)
|
||||
Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries)
|
||||
|
||||
The dependencies of these libraries are not reliably picked up by their
|
||||
corresponding find modules. This change allows adding the required
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 41a362273ce4e2872973e93b38b602277d304b25 Mon Sep 17 00:00:00 2001
|
||||
From 223fee0adbcb83250506c809b0aaf9411477ec1f Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
||||
Subject: [PATCH 05/13] Fix libjpeg workaround for conflict with rpcndr.h
|
||||
Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h
|
||||
|
||||
Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
|
||||
libjpeg seems to take care of the conflict already as long as jconfig.h is
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ad453dfe51bb1aea245bdd4344ede201d758e04d Mon Sep 17 00:00:00 2001
|
||||
From 56abbb095df23d85ec505e194ec48a8f77f8b736 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
||||
Subject: [PATCH 06/13] Support finding static MariaDB client library
|
||||
Subject: [PATCH 06/12] 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From a9cd104a380971b6da25dbe864f2b28482249e5b Mon Sep 17 00:00:00 2001
|
||||
From 724bbced93c552473874d620dc328485234b7884 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
||||
Subject: [PATCH 07/13] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
||||
Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
||||
static libraries
|
||||
|
||||
Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
|
||||
|
|
@ -10,7 +10,7 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
|
|||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
index 7a69a63501..5a7183c588 100644
|
||||
index 1c61c5fb01..45b0d8ded7 100644
|
||||
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||
@@ -4,6 +4,10 @@
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 7ea34331c7d3befa90c54a375d827b3d370c8691 Mon Sep 17 00:00:00 2001
|
||||
From 7dcf8d7aee9f42832c980f2fd6f6a78502d2f9be Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 26 Jun 2021 22:24:12 +0200
|
||||
Subject: [PATCH 08/13] Fix crashes in rasterization code using setjmp
|
||||
Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
|
|||
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
|
||||
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index b29be1a768..162273db6e 100644
|
||||
index 0e04b722b4..56941e6224 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -175,7 +175,7 @@ qt_internal_add_module(Gui
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 59d4ca0feffb15deb1bd605a9c305f4eed501415 Mon Sep 17 00:00:00 2001
|
||||
From 32e60a018448dadd0d614b9b8746e227526ab9be Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 24 Apr 2022 23:00:27 +0200
|
||||
Subject: [PATCH 09/13] Find fontconfig via pkg-config for correct handling of
|
||||
Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of
|
||||
its dependencies
|
||||
|
||||
CMake's own find module unforunately does not consider fontconfig's deps so
|
||||
|
|
@ -33,7 +33,7 @@ index 0000000000..1a52327ae6
|
|||
+ set(Fontconfig_FOUND 1)
|
||||
+endif()
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index 162273db6e..6d4680e194 100644
|
||||
index 56941e6224..90c0c0857c 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -696,7 +696,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 6b7eb6cfc9b704d7c343967db11025a95d5386e6 Mon Sep 17 00:00:00 2001
|
||||
From 8f1a6ca0758b0f75a0a5e34e170f0b8300ccddf4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 24 Apr 2022 23:49:36 +0200
|
||||
Subject: [PATCH 10/13] Fix dependency of xcb-image on xcb-util
|
||||
Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util
|
||||
|
||||
Considering this linker error, xcb-image apparently depends on xcb-util:
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c619e5dca0dc5178270039cabd5a429c1b576ef9 Mon Sep 17 00:00:00 2001
|
||||
From 809fa78bff6faa4fb6f26b11c967d0d24c2376d4 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Tue, 26 Apr 2022 20:16:31 +0200
|
||||
Subject: [PATCH 11/13] Allow using properties of PkgConfig targets for glib2
|
||||
Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2
|
||||
to handle deps of static glib2
|
||||
|
||||
Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 5be4478ee923d0ce4fdcd954f8e00bd1a8baf3f2 Mon Sep 17 00:00:00 2001
|
||||
From 5292bfc9a761e79de4b69f270661c9ed7f4d35dd Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 1 May 2022 23:28:26 +0200
|
||||
Subject: [PATCH 12/13] Allow using properties of PkgConfig targets for Wayland
|
||||
Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland
|
||||
to handle deps of static libs
|
||||
|
||||
Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
From 45cba8061ff504fc946382a1eae42f9e79b2fa23 Mon Sep 17 00:00:00 2001
|
||||
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||
Date: Mon, 5 Jun 2023 17:10:00 +0200
|
||||
Subject: [PATCH 13/13] QTabBar: recalculate scroll offset when showing
|
||||
|
||||
If an application sets the current index and resizes the tab widget
|
||||
before showing it, then the scroll offset might be calculated based on
|
||||
an old size. Since after ca15f650a1a914bb9a41131109c46c4e52c5ebb1,
|
||||
resizing explicitly avoids scrolling, this could result in tabs ending
|
||||
up scrolled outside of the tab bar when showing the tab widget.
|
||||
|
||||
Fix that by explicitly making the current tab visible in the tab bar's
|
||||
showEvent handler, which recalculates the scroll offset based on the
|
||||
actual size.
|
||||
|
||||
This is only reproducible with a tab widget, which lays out the tab bar
|
||||
for each change and resets the tab bar's layoutDirty flag. Add a test
|
||||
case there.
|
||||
|
||||
Fixes: QTBUG-114204
|
||||
Change-Id: I1e9506b9dde1dd892291d108dd2c7b675ef99509
|
||||
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
|
||||
Reviewed-by: Jonas Kvinge <jonas@jkvinge.net>
|
||||
(cherry picked from commit 2a7da1b3c8c4096d7c2b09f3fcc58e9cf47867cd)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
src/widgets/widgets/qtabbar.cpp | 2 +
|
||||
.../widgets/qtabwidget/tst_qtabwidget.cpp | 37 +++++++++++++++++++
|
||||
2 files changed, 39 insertions(+)
|
||||
|
||||
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
|
||||
index 7fd356280b..49137edf67 100644
|
||||
--- a/src/widgets/widgets/qtabbar.cpp
|
||||
+++ b/src/widgets/widgets/qtabbar.cpp
|
||||
@@ -1656,6 +1656,8 @@ void QTabBar::showEvent(QShowEvent *)
|
||||
d->refresh();
|
||||
if (!d->validIndex(d->currentIndex))
|
||||
setCurrentIndex(0);
|
||||
+ else
|
||||
+ d->makeVisible(d->currentIndex);
|
||||
d->updateMacBorderMetrics();
|
||||
}
|
||||
|
||||
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
|
||||
index 00cb26c2d3..eb29933fd1 100644
|
||||
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
|
||||
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
|
||||
@@ -79,6 +79,9 @@ private slots:
|
||||
void moveCurrentTab();
|
||||
void autoHide();
|
||||
|
||||
+ void setCurrentBeforeShow_data();
|
||||
+ void setCurrentBeforeShow();
|
||||
+
|
||||
private:
|
||||
int addPage();
|
||||
void removePage(int index);
|
||||
@@ -750,5 +753,39 @@ void tst_QTabWidget::autoHide()
|
||||
QVERIFY(heightForWidth1 > tabWidget.heightForWidth(20));
|
||||
}
|
||||
|
||||
+void tst_QTabWidget::setCurrentBeforeShow_data()
|
||||
+{
|
||||
+ QTest::addColumn<QTabWidget::TabPosition>("tabPosition");
|
||||
+ QTest::newRow("West") << QTabWidget::West;
|
||||
+ QTest::newRow("North") << QTabWidget::North;
|
||||
+ QTest::newRow("East") << QTabWidget::East;
|
||||
+ QTest::newRow("South") << QTabWidget::South;
|
||||
+}
|
||||
+
|
||||
+void tst_QTabWidget::setCurrentBeforeShow()
|
||||
+{
|
||||
+ QFETCH(QTabWidget::TabPosition, tabPosition);
|
||||
+
|
||||
+ QTabWidget tabWidget;
|
||||
+ tabWidget.setTabPosition(tabPosition);
|
||||
+
|
||||
+ QPixmap pm(50, 50);
|
||||
+ pm.fill(Qt::red);
|
||||
+ const QIcon icon(pm);
|
||||
+ for (int i = 0; i < 4; ++i)
|
||||
+ tabWidget.addTab(new QWidget, icon, QString("Tab %1").arg(i));
|
||||
+
|
||||
+ // the tab widget has space for the entire tab bar
|
||||
+ tabWidget.resize(tabWidget.tabBar()->sizeHint() + QSize(50, 50));
|
||||
+ tabWidget.setCurrentIndex(2);
|
||||
+ tabWidget.show();
|
||||
+ QVERIFY(QTest::qWaitForWindowExposed(&tabWidget));
|
||||
+
|
||||
+ QCOMPARE_GE(tabWidget.tabBar()->tabRect(0).x(), 0);
|
||||
+ QCOMPARE_GE(tabWidget.tabBar()->tabRect(0).y(), 0);
|
||||
+
|
||||
+ QTest::qWait(2000);
|
||||
+}
|
||||
+
|
||||
QTEST_MAIN(tst_QTabWidget)
|
||||
#include "tst_qtabwidget.moc"
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -11,9 +11,9 @@
|
|||
# All patches are managed at https://github.com/Martchus/qtbase
|
||||
|
||||
pkgname=mingw-w64-qt6-base
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
@ -42,22 +42,20 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
|||
'0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
|
||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
|
||||
'0013-QTabBar-recalculate-scroll-offset-when-showing.patch')
|
||||
sha256sums=('db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed'
|
||||
'283dc72fb579295a67c5d66a6da5e650a137e6c179f744e9a0ee0df8d4618794'
|
||||
'b42a97f117fc0d517eaedf26f4ebaff4ad764794f4d23dc8574e59f977da8d96'
|
||||
'8baa38d80fbba128d41c0620e6bc01b00b1b6c17b09989aeba6aed18b1f0cbb8'
|
||||
'624be4e17ee19815f8fe42c07e1e88cec89df091360842c432900a4b861947d4'
|
||||
'dfe3b54afe2366fee256825f19b2f2899404cf163968e8a9af1bef4a9764964a'
|
||||
'24ce57861b4b6b315634cd2a75b9ca4f4be5c6dec22868c0e8dd3d66d471bd4d'
|
||||
'842336b23d7aaa9d47d6f24846dd05720390be9cb27ab81cddc3142500754c8c'
|
||||
'b104e7fc6f3dd6dd3d74dad07423314310454e45ac8a779f4c3991417f7628ed'
|
||||
'fb5a9561214c941fd25a88df9ef53eae651e5fef757a6169500ff17cfb958ec2'
|
||||
'3942e3df5745c8ee513c6735c00fa2a993b906903939f72ae161a7a9de6de282'
|
||||
'20bf64f05496ad81cddf530d03e6805d10fb3a68411cb28c4b2cf3dbedd29147'
|
||||
'746abfd92394f48af9ac9ca67860305221e3248e1e2a99bc2c761ed84b02f024'
|
||||
'6e47dd529b22736bef04f53414096d1e18e911a150ae518053dfef0b21f2fa17')
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||
sha256sums=('3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269'
|
||||
'540ca3a030c75dd6494e58b1aef583ee706f4956f16e102f9f92aa22fed463d6'
|
||||
'337853ff69a460dc70968fb790d037f7ab013fdc940aca34ece23e0bab98c367'
|
||||
'9cda2dd1805a92e1dbb4730837a88393ce00349f2b559ad7ea5602a45bbbb924'
|
||||
'2917901a83e4f463a5a19387f4580c0f65233fd516f047812237aee791a4a394'
|
||||
'10ee1d9d8dad2b782e1cd671248748dc1b18ca584ca7d6ad43129b1a2a9a4476'
|
||||
'fb95cb0a5a6843048097e89ee903016d899d38a72788607718d23c319f9bd06e'
|
||||
'3c521c1ad55c9c34dfbd9275e3c493de33d9e7acf5788aef4e8853ed15fe6b6d'
|
||||
'39e353883a95122523488d5f75a9e54946f4df0aa248f87b722988a39015780f'
|
||||
'27bbf26f0d9ccf7f0a570983d681731d45f3fa6b36dc1beed467b5b361d43694'
|
||||
'099bd3a735ac31bbca468eb190de49e134ef3185d8617c3d6ded34be2780f7c8'
|
||||
'2ffae91bd81dc98f28860c337b72c55fd35e6706f934ffe1a5fb6c9c4c0c77cd'
|
||||
'186828cc651bbabe2c7082a092a0eb40b82e15b131172bd377f5ec7b95e0a8d9')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
|
||||
3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
../mingw-w64/0013-QTabBar-recalculate-scroll-offset-when-showing.patch
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
# All patches are managed at https://github.com/Martchus/qtbase
|
||||
|
||||
pkgname=static-compat-qt6-base
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
@ -41,22 +41,20 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
|||
'0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch'
|
||||
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
|
||||
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
|
||||
'0013-QTabBar-recalculate-scroll-offset-when-showing.patch')
|
||||
sha256sums=('db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed'
|
||||
'283dc72fb579295a67c5d66a6da5e650a137e6c179f744e9a0ee0df8d4618794'
|
||||
'b42a97f117fc0d517eaedf26f4ebaff4ad764794f4d23dc8574e59f977da8d96'
|
||||
'8baa38d80fbba128d41c0620e6bc01b00b1b6c17b09989aeba6aed18b1f0cbb8'
|
||||
'624be4e17ee19815f8fe42c07e1e88cec89df091360842c432900a4b861947d4'
|
||||
'dfe3b54afe2366fee256825f19b2f2899404cf163968e8a9af1bef4a9764964a'
|
||||
'24ce57861b4b6b315634cd2a75b9ca4f4be5c6dec22868c0e8dd3d66d471bd4d'
|
||||
'842336b23d7aaa9d47d6f24846dd05720390be9cb27ab81cddc3142500754c8c'
|
||||
'b104e7fc6f3dd6dd3d74dad07423314310454e45ac8a779f4c3991417f7628ed'
|
||||
'fb5a9561214c941fd25a88df9ef53eae651e5fef757a6169500ff17cfb958ec2'
|
||||
'3942e3df5745c8ee513c6735c00fa2a993b906903939f72ae161a7a9de6de282'
|
||||
'20bf64f05496ad81cddf530d03e6805d10fb3a68411cb28c4b2cf3dbedd29147'
|
||||
'746abfd92394f48af9ac9ca67860305221e3248e1e2a99bc2c761ed84b02f024'
|
||||
'6e47dd529b22736bef04f53414096d1e18e911a150ae518053dfef0b21f2fa17')
|
||||
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
|
||||
sha256sums=('3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269'
|
||||
'540ca3a030c75dd6494e58b1aef583ee706f4956f16e102f9f92aa22fed463d6'
|
||||
'337853ff69a460dc70968fb790d037f7ab013fdc940aca34ece23e0bab98c367'
|
||||
'9cda2dd1805a92e1dbb4730837a88393ce00349f2b559ad7ea5602a45bbbb924'
|
||||
'2917901a83e4f463a5a19387f4580c0f65233fd516f047812237aee791a4a394'
|
||||
'10ee1d9d8dad2b782e1cd671248748dc1b18ca584ca7d6ad43129b1a2a9a4476'
|
||||
'fb95cb0a5a6843048097e89ee903016d899d38a72788607718d23c319f9bd06e'
|
||||
'3c521c1ad55c9c34dfbd9275e3c493de33d9e7acf5788aef4e8853ed15fe6b6d'
|
||||
'39e353883a95122523488d5f75a9e54946f4df0aa248f87b722988a39015780f'
|
||||
'27bbf26f0d9ccf7f0a570983d681731d45f3fa6b36dc1beed467b5b361d43694'
|
||||
'099bd3a735ac31bbca468eb190de49e134ef3185d8617c3d6ded34be2780f7c8'
|
||||
'2ffae91bd81dc98f28860c337b72c55fd35e6706f934ffe1a5fb6c9c4c0c77cd'
|
||||
'186828cc651bbabe2c7082a092a0eb40b82e15b131172bd377f5ec7b95e0a8d9')
|
||||
|
||||
prepare () {
|
||||
cd $_pkgfqn
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-$_android_arch-qt6-charts
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(android-${_android_arch}-qt6)
|
||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75')
|
||||
sha256sums=('775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d')
|
||||
|
||||
build() {
|
||||
source android-env ${_android_arch}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'android-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75
|
||||
775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-charts-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75')
|
||||
sha256sums=('775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -26,6 +26,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75
|
||||
775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-charts
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75')
|
||||
sha256sums=('775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75
|
||||
775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=static-compat-qt6-charts
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
@ -16,7 +16,7 @@ makedepends=(static-compat-cmake static-compat-vulkan-headers ninja)
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75')
|
||||
sha256sums=('775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d')
|
||||
|
||||
build() {
|
||||
check_buildoption ccache y && ccache_args='
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'static-compat-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b15b500fc7e75b8881d5fe19bd13418213bc5f7834eadc9fb00edc084e92cf75
|
||||
775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-$_android_arch-qt6-connectivity
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(android-${_android_arch}-qt6)
|
||||
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('2fd74c9b78c4df2b9b2efe5e48fa6c9689f6c200ee4a90edd5bfedda3089827a')
|
||||
sha256sums=('db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99')
|
||||
|
||||
build() {
|
||||
source android-env ${_android_arch}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'android-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
2fd74c9b78c4df2b9b2efe5e48fa6c9689f6c200ee4a90edd5bfedda3089827a
|
||||
db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-connectivity-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('2fd74c9b78c4df2b9b2efe5e48fa6c9689f6c200ee4a90edd5bfedda3089827a')
|
||||
sha256sums=('db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -27,6 +27,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
2fd74c9b78c4df2b9b2efe5e48fa6c9689f6c200ee4a90edd5bfedda3089827a
|
||||
db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-connectivity
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('2fd74c9b78c4df2b9b2efe5e48fa6c9689f6c200ee4a90edd5bfedda3089827a')
|
||||
sha256sums=('db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
2fd74c9b78c4df2b9b2efe5e48fa6c9689f6c200ee4a90edd5bfedda3089827a
|
||||
db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=static-compat-qt6-connectivity
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'static-compat-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-$_android_arch-qt6-datavis3d
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(android-${_android_arch}-qt6)
|
||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333')
|
||||
sha256sums=('68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9')
|
||||
|
||||
build() {
|
||||
source android-env ${_android_arch}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'android-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333
|
||||
68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-datavis3d-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333')
|
||||
sha256sums=('68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -27,6 +27,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333
|
||||
68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-datavis3d
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333')
|
||||
sha256sums=('68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333
|
||||
68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=static-compat-qt6-datavis3d
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-vul
|
|||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333')
|
||||
sha256sums=('68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9')
|
||||
|
||||
build() {
|
||||
check_buildoption ccache y && ccache_args='
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'static-compat-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
52332abc3131c518fc73cd64e3562bc7ba45b4532fdc5f1249c983c7575da333
|
||||
68c13918dcbbc49d06fff561c3253176ce5654ebaaf6099fea76454bd8a51ce9
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-$_android_arch-qt6-declarative
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -23,8 +23,8 @@ groups=(android-${_android_arch}-qt6)
|
|||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||
sha256sums=('201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79'
|
||||
'8b1d5499d6ebdf046780e737a191c316c483f3dd2e161d559025adb5af6bfa96')
|
||||
sha256sums=('f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719'
|
||||
'8fb0047a8dd719b3ad22963392d65c4f5e15f9eae331422ca6d2bf2caa3137aa')
|
||||
|
||||
prepare () {
|
||||
cd $_pkgfqn
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'android-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
|
||||
f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-declarative-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -22,8 +22,8 @@ groups=(mingw-w64-qt6)
|
|||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||
sha256sums=('201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79'
|
||||
'8b1d5499d6ebdf046780e737a191c316c483f3dd2e161d559025adb5af6bfa96')
|
||||
sha256sums=('f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719'
|
||||
'8fb0047a8dd719b3ad22963392d65c4f5e15f9eae331422ca6d2bf2caa3137aa')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -42,6 +42,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
|
||||
f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From da07643b35d6b97a3338f38c44de012dca9aabc1 Mon Sep 17 00:00:00 2001
|
||||
From dfe78ec0131eb273dda65292b601427f470b5487 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 5 Feb 2021 02:22:45 +0100
|
||||
Subject: [PATCH] Exclude qmltime when cross compiling
|
||||
|
|
@ -14,10 +14,10 @@ That's likely also why upstream did not notice this problem so far.
|
|||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
||||
index a99cd33c24..56243e28e8 100644
|
||||
index 75b240aeea..ccf82a457d 100644
|
||||
--- a/tools/CMakeLists.txt
|
||||
+++ b/tools/CMakeLists.txt
|
||||
@@ -40,7 +40,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
|
||||
@@ -38,7 +38,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 IOS AND NOT rtems)
|
||||
add_subdirectory(qmlscene)
|
||||
|
|
@ -29,5 +29,5 @@ index a99cd33c24..56243e28e8 100644
|
|||
if(QT_BUILD_SHARED_LIBS
|
||||
AND QT_FEATURE_process
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-declarative
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -22,8 +22,8 @@ groups=(mingw-w64-qt6)
|
|||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||
sha256sums=('201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79'
|
||||
'8b1d5499d6ebdf046780e737a191c316c483f3dd2e161d559025adb5af6bfa96')
|
||||
sha256sums=('f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719'
|
||||
'8fb0047a8dd719b3ad22963392d65c4f5e15f9eae331422ca6d2bf2caa3137aa')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
|
||||
f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=static-compat-qt6-declarative
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
@ -17,8 +17,8 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||
sha256sums=('201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79'
|
||||
'8b1d5499d6ebdf046780e737a191c316c483f3dd2e161d559025adb5af6bfa96')
|
||||
sha256sums=('f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719'
|
||||
'8fb0047a8dd719b3ad22963392d65c4f5e15f9eae331422ca6d2bf2caa3137aa')
|
||||
|
||||
prepare () {
|
||||
cd $_pkgfqn
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'static-compat-qt6-module', has_binaries => 1;
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
|
||||
f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_android_arch=aarch64
|
||||
pkgname=android-$_android_arch-qt6-imageformats
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(android-${_android_arch}-qt6)
|
||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('897f7fc299ad03580dee91920644dc43cb5d32e1b8c97e8b594fac9aa68c5db5')
|
||||
sha256sums=('aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743')
|
||||
|
||||
build() {
|
||||
source android-env ${_android_arch}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'android-qt6-module';
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
897f7fc299ad03580dee91920644dc43cb5d32e1b8c97e8b594fac9aa68c5db5
|
||||
aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-imageformats-static
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -20,7 +20,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('897f7fc299ad03580dee91920644dc43cb5d32e1b8c97e8b594fac9aa68c5db5')
|
||||
sha256sums=('aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
@ -29,6 +29,7 @@ build() {
|
|||
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" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
|
||||
-DFEATURE_static_runtime=ON \
|
||||
-DFEATURE_pkg_config=ON
|
||||
cmake --build build-$_arch
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
897f7fc299ad03580dee91920644dc43cb5d32e1b8c97e8b594fac9aa68c5db5
|
||||
aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-qt6-imageformats
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
@ -20,7 +20,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
|||
groups=(mingw-w64-qt6)
|
||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||
sha256sums=('897f7fc299ad03580dee91920644dc43cb5d32e1b8c97e8b594fac9aa68c5db5')
|
||||
sha256sums=('aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||
\
|
||||
_qtver=6.5.1
|
||||
_qtver=6.5.2
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
arch=(any)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
897f7fc299ad03580dee91920644dc43cb5d32e1b8c97e8b594fac9aa68c5db5
|
||||
aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue