Update Qt 6 packages to 6.6.3
No rebuild and update of checksums has been done (except for static-compat variant); waiting for regular Qt 6 packages to updated first.
This commit is contained in:
parent
83ef873922
commit
d3fe1ca09e
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
|
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
|
||||||
pkgname=<%= $package_name %>
|
pkgname=<%= $package_name %>
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
% }
|
% }
|
||||||
|
|
||||||
pkgname=<%= $package_name %>
|
pkgname=<%= $package_name %>
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
url='https://www.qt.io'
|
url='https://www.qt.io'
|
||||||
license=(GPL3 LGPL3 FDL custom)
|
license=(GPL3 LGPL3 FDL custom)
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
% }
|
% }
|
||||||
|
|
||||||
pkgname=<%= $package_name %>
|
pkgname=<%= $package_name %>
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -14,7 +14,7 @@ declare -A versions=(
|
||||||
[dbus-soundrecorder]=1.2.3
|
[dbus-soundrecorder]=1.2.3
|
||||||
[geocoordinatecalculator]=1.1.3
|
[geocoordinatecalculator]=1.1.3
|
||||||
[qt5]=5.15.13
|
[qt5]=5.15.13
|
||||||
[qt6]=6.6.2
|
[qt6]=6.6.3
|
||||||
)
|
)
|
||||||
declare -A github_names=(
|
declare -A github_names=(
|
||||||
[c++utilities]=cpp-utilities
|
[c++utilities]=cpp-utilities
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-3d-static
|
pkgname=mingw-w64-qt6-3d-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-3d
|
pkgname=mingw-w64-qt6-3d
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-5compat
|
pkgname=android-$_android_arch-qt6-5compat
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-5compat-static
|
pkgname=mingw-w64-qt6-5compat-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-5compat
|
pkgname=mingw-w64-qt6-5compat
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-5compat
|
pkgname=static-compat-qt6-5compat
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-qt6
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('e07b08ab7658e4856f07e3262ab342df4ed7e7a69f2720e56bb2128729191967')
|
sha256sums=('68c2cf4e5eabfea27626fe40d088cb0dbb2c0414d3961ef132b7e06c60ceec0b')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
e07b08ab7658e4856f07e3262ab342df4ed7e7a69f2720e56bb2128729191967
|
68c2cf4e5eabfea27626fe40d088cb0dbb2c0414d3961ef132b7e06c60ceec0b
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-activeqt-static
|
pkgname=mingw-w64-qt6-activeqt-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -22,9 +22,9 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0002-Build-tools-for-the-target-platform.patch'
|
'0002-Build-tools-for-the-target-platform.patch'
|
||||||
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
||||||
sha256sums=('87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b'
|
sha256sums=('87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b'
|
||||||
'ea4b89818dd07d2fae698d4ecd09bf426c437ab4d0e16ef18722bd6db2c0f6f5'
|
'5ca3b087c33ab376313e4ae0c49bb9c4a7ddf63154e6a8ee424ea014539148ce'
|
||||||
'c70fe8796dac5ea4bebca1a7b97a509a43a9968524abd1b052ad501201e1afd3'
|
'c46b725679903f93636c60d1bc0717310f6f36c8c6f902cb0ff8831bee1881e4'
|
||||||
'd1ad0556750309a13e90e61882ca2c1ada4ef01a9920a12f2a554af53d9b8240')
|
'4ad45f98a81117f50dde10b9dc52af88e2e2e7b3ca9505f5b2055b13d344eac6')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ce766e27093dd76e58c6233434c869dfb6ff7c67 Mon Sep 17 00:00:00 2001
|
From 286e61dab769d0858a4a2e7ebdfa883e3504c414 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Fri, 2 Jun 2017 17:21:08 +0200
|
Date: Fri, 2 Jun 2017 17:21:08 +0200
|
||||||
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
|
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
|
||||||
|
@ -52,5 +52,5 @@ index 1b6fbeb..679bf9e 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.43.0
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From fc012c87b599cca39c9dcaaf2e48da9afbc729b9 Mon Sep 17 00:00:00 2001
|
From 6bc80ca098ad18394ecdfa1c36df1b0d633d8876 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Fri, 7 May 2021 16:10:47 +0200
|
Date: Fri, 7 May 2021 16:10:47 +0200
|
||||||
Subject: [PATCH 2/3] Build tools for the target platform
|
Subject: [PATCH 2/3] Build tools for the target platform
|
||||||
|
@ -61,5 +61,5 @@ index 84b4018..1dc4b9e 100644
|
||||||
main.cpp
|
main.cpp
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
--
|
--
|
||||||
2.43.0
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 8cdb1f8bb457dc5e7d978da3bb8fbfdb7ae37800 Mon Sep 17 00:00:00 2001
|
From a68e47fd6691cb019e5cc2b4190c60b796334dca Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Mon, 12 Sep 2022 17:38:47 +0200
|
Date: Mon, 12 Sep 2022 17:38:47 +0200
|
||||||
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
|
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
|
||||||
|
@ -33,5 +33,5 @@ index 679bf9e..d73457a 100644
|
||||||
nextTypeAndForceComplete = startType + lengthType;
|
nextTypeAndForceComplete = startType + lengthType;
|
||||||
} while (true);
|
} while (true);
|
||||||
--
|
--
|
||||||
2.43.0
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-activeqt
|
pkgname=mingw-w64-qt6-activeqt
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -22,9 +22,9 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0002-Build-tools-for-the-target-platform.patch'
|
'0002-Build-tools-for-the-target-platform.patch'
|
||||||
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
|
||||||
sha256sums=('87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b'
|
sha256sums=('87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b'
|
||||||
'ea4b89818dd07d2fae698d4ecd09bf426c437ab4d0e16ef18722bd6db2c0f6f5'
|
'5ca3b087c33ab376313e4ae0c49bb9c4a7ddf63154e6a8ee424ea014539148ce'
|
||||||
'c70fe8796dac5ea4bebca1a7b97a509a43a9968524abd1b052ad501201e1afd3'
|
'c46b725679903f93636c60d1bc0717310f6f36c8c6f902cb0ff8831bee1881e4'
|
||||||
'd1ad0556750309a13e90e61882ca2c1ada4ef01a9920a12f2a554af53d9b8240')
|
'4ad45f98a81117f50dde10b9dc52af88e2e2e7b3ca9505f5b2055b13d344eac6')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-aarch64-qt6-base
|
pkgname=android-aarch64-qt6-base
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -46,23 +46,23 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
||||||
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
||||||
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
|
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
|
||||||
'7691272ccd272a6b0a750777a7d8d738588145cefce1f250d6ad756fcf1fe3d4'
|
'4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562'
|
||||||
'7dcb792c97098b44857e4932088b4164a85dc702f5f519654937ee38c98e5ffc'
|
'5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5'
|
||||||
'140904d07d65e77080040337536f4ccd5285672e0d8867a3807a8b1f80c430a5'
|
'c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e'
|
||||||
'17a09b620fc06518167f04fc5b28bd453c58ca3d32c70ef10e09802160843639'
|
'9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696'
|
||||||
'eeb14b5298ec1b9b564ee78edc41670470e0efa68755f954b79ac83c684ea387'
|
'2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d'
|
||||||
'5f1780805561985c9f575dbbefe704f5c61b622ce75bb4a30532f51c95ae1436'
|
'9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11'
|
||||||
'adc1b10e565b10944951df9e10ce6999c0210071b75b7a4dd230f617d88aab4f'
|
'721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743'
|
||||||
'54646442b7a00aa59d6be6ec7be95b2424fb4b152b0ee801451b38e8252c2c2f'
|
'e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1'
|
||||||
'a8971b7c21da5ed1f7fcd02a69d4f1491303d991b0f84b83ed97367bb9778247'
|
'25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e'
|
||||||
'9e97d8c5487c9212ffb00a1e90c7ccd11cb400696b77c94306e65360d2c11ede'
|
'7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85'
|
||||||
'6d31790b364ce516d82b78f78146076d1f6b8fdf9adaa90c63aeb4cfb8dc00ee'
|
'e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09'
|
||||||
'7be1875458af031925d2e91e262782f15801f6f5deff8babd0685037a7588d1f'
|
'e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85'
|
||||||
'a73a8fbdbd14a132e97a58abf0b58270d2af43d86ba238a236265d1341e84d06'
|
'4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504'
|
||||||
'c7c30f1da326b07abae0ab1c3f257cee0691c8b1ca26d1266978e77d6a769272'
|
'd3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89'
|
||||||
'a316377d963838af16c02645b88ac16cb49714e6df998a44675f8536dea72301'
|
'3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78'
|
||||||
'fd77316b643ebde5bb607e871c1d7983273b1292798d510c848aa2873037ab9e'
|
'022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6'
|
||||||
'120e463090b99b70235a722fb1a671b7b742cb77f5c400a3856da534fcfae356')
|
'1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
# All patches are managed at https://github.com/Martchus/qtbase
|
# All patches are managed at https://github.com/Martchus/qtbase
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-base-static
|
pkgname=mingw-w64-qt6-base-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
url='https://www.qt.io'
|
url='https://www.qt.io'
|
||||||
license=(GPL3 LGPL3 FDL custom)
|
license=(GPL3 LGPL3 FDL custom)
|
||||||
|
@ -49,23 +49,23 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
||||||
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
||||||
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
|
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
|
||||||
'7691272ccd272a6b0a750777a7d8d738588145cefce1f250d6ad756fcf1fe3d4'
|
'4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562'
|
||||||
'7dcb792c97098b44857e4932088b4164a85dc702f5f519654937ee38c98e5ffc'
|
'5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5'
|
||||||
'140904d07d65e77080040337536f4ccd5285672e0d8867a3807a8b1f80c430a5'
|
'c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e'
|
||||||
'17a09b620fc06518167f04fc5b28bd453c58ca3d32c70ef10e09802160843639'
|
'9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696'
|
||||||
'eeb14b5298ec1b9b564ee78edc41670470e0efa68755f954b79ac83c684ea387'
|
'2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d'
|
||||||
'5f1780805561985c9f575dbbefe704f5c61b622ce75bb4a30532f51c95ae1436'
|
'9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11'
|
||||||
'adc1b10e565b10944951df9e10ce6999c0210071b75b7a4dd230f617d88aab4f'
|
'721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743'
|
||||||
'54646442b7a00aa59d6be6ec7be95b2424fb4b152b0ee801451b38e8252c2c2f'
|
'e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1'
|
||||||
'a8971b7c21da5ed1f7fcd02a69d4f1491303d991b0f84b83ed97367bb9778247'
|
'25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e'
|
||||||
'9e97d8c5487c9212ffb00a1e90c7ccd11cb400696b77c94306e65360d2c11ede'
|
'7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85'
|
||||||
'6d31790b364ce516d82b78f78146076d1f6b8fdf9adaa90c63aeb4cfb8dc00ee'
|
'e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09'
|
||||||
'7be1875458af031925d2e91e262782f15801f6f5deff8babd0685037a7588d1f'
|
'e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85'
|
||||||
'a73a8fbdbd14a132e97a58abf0b58270d2af43d86ba238a236265d1341e84d06'
|
'4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504'
|
||||||
'c7c30f1da326b07abae0ab1c3f257cee0691c8b1ca26d1266978e77d6a769272'
|
'd3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89'
|
||||||
'a316377d963838af16c02645b88ac16cb49714e6df998a44675f8536dea72301'
|
'3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78'
|
||||||
'fd77316b643ebde5bb607e871c1d7983273b1292798d510c848aa2873037ab9e'
|
'022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6'
|
||||||
'120e463090b99b70235a722fb1a671b7b742cb77f5c400a3856da534fcfae356')
|
'1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ab531280437a9ea29a579c6cf6303850b3cf3af3 Mon Sep 17 00:00:00 2001
|
From 30fa1f27688dd6b7263479bdfaefb266102427c3 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
Date: Thu, 5 Nov 2020 22:08:10 +0100
|
||||||
Subject: [PATCH 01/17] Use CMake's default import library suffix
|
Subject: [PATCH 01/17] Use CMake's default import library suffix
|
||||||
|
@ -13,7 +13,7 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
|
||||||
5 files changed, 21 insertions(+), 6 deletions(-)
|
5 files changed, 21 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
|
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
|
||||||
index f1d45cdcf6..32ca058969 100644
|
index f1d45cdcf6c..32ca0589699 100644
|
||||||
--- a/cmake/QtPriHelpers.cmake
|
--- a/cmake/QtPriHelpers.cmake
|
||||||
+++ b/cmake/QtPriHelpers.cmake
|
+++ b/cmake/QtPriHelpers.cmake
|
||||||
@@ -523,9 +523,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
|
@@ -523,9 +523,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
|
||||||
|
@ -47,7 +47,7 @@ index f1d45cdcf6..32ca058969 100644
|
||||||
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
||||||
index 45bfaedcdf..a433c98fe8 100644
|
index 45bfaedcdf6..a433c98fe8c 100644
|
||||||
--- a/cmake/QtPrlHelpers.cmake
|
--- a/cmake/QtPrlHelpers.cmake
|
||||||
+++ b/cmake/QtPrlHelpers.cmake
|
+++ b/cmake/QtPrlHelpers.cmake
|
||||||
@@ -123,11 +123,17 @@ ${prl_step1_content_libs}
|
@@ -123,11 +123,17 @@ ${prl_step1_content_libs}
|
||||||
|
@ -70,7 +70,7 @@ index 45bfaedcdf..a433c98fe8 100644
|
||||||
if(QT_GENERATOR_IS_MULTI_CONFIG)
|
if(QT_GENERATOR_IS_MULTI_CONFIG)
|
||||||
set(configs ${CMAKE_CONFIGURATION_TYPES})
|
set(configs ${CMAKE_CONFIGURATION_TYPES})
|
||||||
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
|
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
|
||||||
index 67ad1e3b8c..b98c7121f6 100644
|
index 67ad1e3b8c1..b98c7121f6f 100644
|
||||||
--- a/mkspecs/common/g++-win32.conf
|
--- a/mkspecs/common/g++-win32.conf
|
||||||
+++ b/mkspecs/common/g++-win32.conf
|
+++ b/mkspecs/common/g++-win32.conf
|
||||||
@@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB =
|
@@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB =
|
||||||
|
@ -82,7 +82,7 @@ index 67ad1e3b8c..b98c7121f6 100644
|
||||||
|
|
||||||
QMAKE_LIBS =
|
QMAKE_LIBS =
|
||||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||||
index 24ed125f12..73ebe453d3 100644
|
index 24ed125f12b..73ebe453d3d 100644
|
||||||
--- a/mkspecs/features/create_cmake.prf
|
--- a/mkspecs/features/create_cmake.prf
|
||||||
+++ b/mkspecs/features/create_cmake.prf
|
+++ b/mkspecs/features/create_cmake.prf
|
||||||
@@ -332,8 +332,9 @@ mac {
|
@@ -332,8 +332,9 @@ mac {
|
||||||
|
@ -98,7 +98,7 @@ index 24ed125f12..73ebe453d3 100644
|
||||||
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
|
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
|
||||||
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
|
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
|
||||||
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
|
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
|
||||||
index e082e586a6..791c580c73 100644
|
index 32d0693311d..566cbac3799 100644
|
||||||
--- a/src/corelib/Qt6CoreMacros.cmake
|
--- a/src/corelib/Qt6CoreMacros.cmake
|
||||||
+++ b/src/corelib/Qt6CoreMacros.cmake
|
+++ b/src/corelib/Qt6CoreMacros.cmake
|
||||||
@@ -550,7 +550,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
|
@@ -550,7 +550,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
|
||||||
|
@ -110,5 +110,5 @@ index e082e586a6..791c580c73 100644
|
||||||
get_target_property(target_type ${target} TYPE)
|
get_target_property(target_type ${target} TYPE)
|
||||||
if(target_type STREQUAL "STATIC_LIBRARY")
|
if(target_type STREQUAL "STATIC_LIBRARY")
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From df5d77a3a0ab5cd0c4237a65cbdedc0825910544 Mon Sep 17 00:00:00 2001
|
From 238012eaa343098ec97473788bec60cc74587800 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
Date: Wed, 7 Oct 2020 12:13:37 +0200
|
||||||
Subject: [PATCH 02/17] Fix finding D-Bus
|
Subject: [PATCH 02/17] Fix finding D-Bus
|
||||||
|
@ -9,7 +9,7 @@ Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
|
||||||
1 file changed, 3 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
||||||
index e2a58790c4..8e0ed81f89 100644
|
index e2a58790c4e..8e0ed81f893 100644
|
||||||
--- a/cmake/FindWrapDBus1.cmake
|
--- a/cmake/FindWrapDBus1.cmake
|
||||||
+++ b/cmake/FindWrapDBus1.cmake
|
+++ b/cmake/FindWrapDBus1.cmake
|
||||||
@@ -48,3 +48,6 @@ include(FindPackageHandleStandardArgs)
|
@@ -48,3 +48,6 @@ include(FindPackageHandleStandardArgs)
|
||||||
|
@ -20,5 +20,5 @@ index e2a58790c4..8e0ed81f89 100644
|
||||||
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
|
||||||
+endif()
|
+endif()
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From a061819f2b68392ecff422c54d80cedb529acc15 Mon Sep 17 00:00:00 2001
|
From a77593b453a5361feb0dd053dbe389fdd5501cdd Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
Date: Thu, 5 Nov 2020 21:13:19 +0100
|
||||||
Subject: [PATCH 03/17] Fix using static PCRE2 and DBus-1
|
Subject: [PATCH 03/17] Fix using static PCRE2 and DBus-1
|
||||||
|
@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
|
||||||
2 files changed, 9 insertions(+)
|
2 files changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
|
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
|
||||||
index 93e4f7d1f9..23299af94b 100644
|
index b00d263b710..032812ae861 100644
|
||||||
--- a/src/corelib/text/qregularexpression.cpp
|
--- a/src/corelib/text/qregularexpression.cpp
|
||||||
+++ b/src/corelib/text/qregularexpression.cpp
|
+++ b/src/corelib/text/qregularexpression.cpp
|
||||||
@@ -20,6 +20,11 @@
|
@@ -20,6 +20,11 @@
|
||||||
|
@ -29,7 +29,7 @@ index 93e4f7d1f9..23299af94b 100644
|
||||||
#include <pcre2.h>
|
#include <pcre2.h>
|
||||||
|
|
||||||
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
|
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
|
||||||
index e3008be761..9c745c16c4 100644
|
index e3008be7619..9c745c16c41 100644
|
||||||
--- a/src/dbus/qdbus_symbols_p.h
|
--- a/src/dbus/qdbus_symbols_p.h
|
||||||
+++ b/src/dbus/qdbus_symbols_p.h
|
+++ b/src/dbus/qdbus_symbols_p.h
|
||||||
@@ -21,6 +21,10 @@
|
@@ -21,6 +21,10 @@
|
||||||
|
@ -44,5 +44,5 @@ index e3008be761..9c745c16c4 100644
|
||||||
# include <dbus/dbus.h>
|
# include <dbus/dbus.h>
|
||||||
#else
|
#else
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 76a37b0e210b0199388d1ddf8697ba2d055db32c Mon Sep 17 00:00:00 2001
|
From f54f12d78abb6cd209f79c2309d6b50cff64c06e Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
Date: Thu, 5 Nov 2020 21:59:33 +0100
|
||||||
Subject: [PATCH 04/17] Fix transitive dependencies (of static libraries)
|
Subject: [PATCH 04/17] Fix transitive dependencies (of static libraries)
|
||||||
|
@ -23,7 +23,7 @@ Change-Id: I3baec612ee071eec77f756b18bbb9af87663527c
|
||||||
8 files changed, 9 insertions(+), 7 deletions(-)
|
8 files changed, 9 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||||
index 24a194c9cb..a6a16b494f 100644
|
index 24a194c9cb3..a6a16b494fd 100644
|
||||||
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||||
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||||
@@ -135,7 +135,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
|
@@ -135,7 +135,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
|
||||||
|
@ -36,7 +36,7 @@ index 24a194c9cb..a6a16b494f 100644
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||||
index d191d1ac0a..b61d0107f2 100644
|
index d191d1ac0a3..b61d0107f25 100644
|
||||||
--- a/cmake/FindMySQL.cmake
|
--- a/cmake/FindMySQL.cmake
|
||||||
+++ b/cmake/FindMySQL.cmake
|
+++ b/cmake/FindMySQL.cmake
|
||||||
@@ -83,6 +83,7 @@ if(MySQL_FOUND)
|
@@ -83,6 +83,7 @@ if(MySQL_FOUND)
|
||||||
|
@ -48,7 +48,7 @@ index d191d1ac0a..b61d0107f2 100644
|
||||||
if(MySQL_LIBRARY_DEBUG)
|
if(MySQL_LIBRARY_DEBUG)
|
||||||
set_target_properties(MySQL::MySQL PROPERTIES
|
set_target_properties(MySQL::MySQL PROPERTIES
|
||||||
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
|
||||||
index 8e0ed81f89..0aec7dbb77 100644
|
index 8e0ed81f893..0aec7dbb776 100644
|
||||||
--- a/cmake/FindWrapDBus1.cmake
|
--- a/cmake/FindWrapDBus1.cmake
|
||||||
+++ b/cmake/FindWrapDBus1.cmake
|
+++ b/cmake/FindWrapDBus1.cmake
|
||||||
@@ -50,4 +50,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
@@ -50,4 +50,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
|
||||||
|
@ -58,7 +58,7 @@ index 8e0ed81f89..0aec7dbb77 100644
|
||||||
+ set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
|
+ set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
|
||||||
endif()
|
endif()
|
||||||
diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
|
diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
|
||||||
index a4341271fe..be6ac7003a 100644
|
index a4341271fee..be6ac7003a1 100644
|
||||||
--- a/cmake/FindWrapOpenSSL.cmake
|
--- a/cmake/FindWrapOpenSSL.cmake
|
||||||
+++ b/cmake/FindWrapOpenSSL.cmake
|
+++ b/cmake/FindWrapOpenSSL.cmake
|
||||||
@@ -14,7 +14,7 @@ set(WrapOpenSSL_FOUND OFF)
|
@@ -14,7 +14,7 @@ set(WrapOpenSSL_FOUND OFF)
|
||||||
|
@ -80,7 +80,7 @@ index a4341271fe..be6ac7003a 100644
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
|
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
|
||||||
index d0c27a9f0f..64e14c584c 100644
|
index d0c27a9f0f7..64e14c584c2 100644
|
||||||
--- a/cmake/FindWrapSystemFreetype.cmake
|
--- a/cmake/FindWrapSystemFreetype.cmake
|
||||||
+++ b/cmake/FindWrapSystemFreetype.cmake
|
+++ b/cmake/FindWrapSystemFreetype.cmake
|
||||||
@@ -47,7 +47,7 @@ find_package_handle_standard_args(WrapSystemFreetype
|
@@ -47,7 +47,7 @@ find_package_handle_standard_args(WrapSystemFreetype
|
||||||
|
@ -93,7 +93,7 @@ index d0c27a9f0f..64e14c584c 100644
|
||||||
unset(__freetype_target_name)
|
unset(__freetype_target_name)
|
||||||
unset(__freetype_found)
|
unset(__freetype_found)
|
||||||
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
|
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
|
||||||
index 07b3405bc0..10fb738d7c 100644
|
index 07b3405bc07..10fb738d7cb 100644
|
||||||
--- a/cmake/FindWrapSystemHarfbuzz.cmake
|
--- a/cmake/FindWrapSystemHarfbuzz.cmake
|
||||||
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
|
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
|
||||||
@@ -73,7 +73,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
|
@@ -73,7 +73,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
|
||||||
|
@ -106,7 +106,7 @@ index 07b3405bc0..10fb738d7c 100644
|
||||||
unset(__harfbuzz_target_name)
|
unset(__harfbuzz_target_name)
|
||||||
unset(__harfbuzz_find_include_dirs_hints)
|
unset(__harfbuzz_find_include_dirs_hints)
|
||||||
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
|
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
|
||||||
index 967ccc5c02..9a7d5150dc 100644
|
index 967ccc5c026..9a7d5150dcf 100644
|
||||||
--- a/cmake/FindWrapSystemPNG.cmake
|
--- a/cmake/FindWrapSystemPNG.cmake
|
||||||
+++ b/cmake/FindWrapSystemPNG.cmake
|
+++ b/cmake/FindWrapSystemPNG.cmake
|
||||||
@@ -36,7 +36,7 @@ find_package_handle_standard_args(WrapSystemPNG
|
@@ -36,7 +36,7 @@ find_package_handle_standard_args(WrapSystemPNG
|
||||||
|
@ -119,7 +119,7 @@ index 967ccc5c02..9a7d5150dc 100644
|
||||||
unset(__png_target_name)
|
unset(__png_target_name)
|
||||||
unset(__png_found)
|
unset(__png_found)
|
||||||
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||||
index d392f4dfa5..165c345e1b 100644
|
index d392f4dfa55..165c345e1ba 100644
|
||||||
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
|
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||||
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
|
||||||
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
|
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
|
||||||
|
@ -132,5 +132,5 @@ index d392f4dfa5..165c345e1b 100644
|
||||||
Qt::CorePrivate
|
Qt::CorePrivate
|
||||||
Qt::SqlPrivate
|
Qt::SqlPrivate
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From a17fb43c9257fe1e7a1c57f7c968103ed4ee4c7b Mon Sep 17 00:00:00 2001
|
From 9304a56442c6af9deec0a4d084477e0daf63e24e Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
Date: Mon, 2 Nov 2020 13:47:45 +0100
|
||||||
Subject: [PATCH 05/17] Fix libjpeg workaround for conflict with rpcndr.h
|
Subject: [PATCH 05/17] Fix libjpeg workaround for conflict with rpcndr.h
|
||||||
|
@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||||
index 0d72ba01d0..a706fb4cea 100644
|
index 0d72ba01d04..a706fb4cea3 100644
|
||||||
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||||
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
|
||||||
@@ -26,6 +26,7 @@
|
@@ -26,6 +26,7 @@
|
||||||
|
@ -25,5 +25,5 @@ index 0d72ba01d0..a706fb4cea 100644
|
||||||
#ifdef const
|
#ifdef const
|
||||||
# undef const // remove crazy C hackery in jconfig.h
|
# undef const // remove crazy C hackery in jconfig.h
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ef17546b4c93fdc922db5655586149af8137e99c Mon Sep 17 00:00:00 2001
|
From 5e59b3c67062118177e0e4370db7d06b05c276da Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
||||||
Subject: [PATCH 06/17] Support finding static MariaDB client library
|
Subject: [PATCH 06/17] Support finding static MariaDB client library
|
||||||
|
@ -14,7 +14,7 @@ Change-Id: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||||
index b61d0107f2..6fb26e51f1 100644
|
index b61d0107f25..6fb26e51f13 100644
|
||||||
--- a/cmake/FindMySQL.cmake
|
--- a/cmake/FindMySQL.cmake
|
||||||
+++ b/cmake/FindMySQL.cmake
|
+++ b/cmake/FindMySQL.cmake
|
||||||
@@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
|
@@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
|
||||||
|
@ -34,5 +34,5 @@ index b61d0107f2..6fb26e51f1 100644
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From dc4b23c50ba75b9bffc397c38f73496d7bf04100 Mon Sep 17 00:00:00 2001
|
From ee08e83b5a8bc4960326f15229ee9f033be8134b Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
||||||
Subject: [PATCH 07/17] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
Subject: [PATCH 07/17] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
||||||
|
@ -10,7 +10,7 @@ Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa
|
||||||
1 file changed, 4 insertions(+)
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||||
index 129f1ebb77..9bae62d879 100644
|
index 129f1ebb771..9bae62d8795 100644
|
||||||
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||||
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
||||||
@@ -4,6 +4,10 @@
|
@@ -4,6 +4,10 @@
|
||||||
|
@ -25,5 +25,5 @@ index 129f1ebb77..9bae62d879 100644
|
||||||
|
|
||||||
# This depends on qt_internal_read_repo_dependencies existing.
|
# This depends on qt_internal_read_repo_dependencies existing.
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6a3ba9e734570288c5a6127c201524c92149dff9 Mon Sep 17 00:00:00 2001
|
From cc87940ac0e524bc249bc79c343eaa1502d8bbc1 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sat, 26 Jun 2021 22:24:12 +0200
|
Date: Sat, 26 Jun 2021 22:24:12 +0200
|
||||||
Subject: [PATCH 08/17] Fix crashes in rasterization code using setjmp
|
Subject: [PATCH 08/17] Fix crashes in rasterization code using setjmp
|
||||||
|
@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
|
||||||
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
|
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
|
||||||
|
|
||||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||||
index dded14bb31..820b943f16 100644
|
index dded14bb313..820b943f16d 100644
|
||||||
--- a/src/gui/CMakeLists.txt
|
--- a/src/gui/CMakeLists.txt
|
||||||
+++ b/src/gui/CMakeLists.txt
|
+++ b/src/gui/CMakeLists.txt
|
||||||
@@ -174,7 +174,7 @@ qt_internal_add_module(Gui
|
@@ -174,7 +174,7 @@ qt_internal_add_module(Gui
|
||||||
|
@ -56,7 +56,7 @@ diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.cpp
|
||||||
similarity index 98%
|
similarity index 98%
|
||||||
rename from src/gui/painting/qgrayraster.c
|
rename from src/gui/painting/qgrayraster.c
|
||||||
rename to src/gui/painting/qgrayraster.cpp
|
rename to src/gui/painting/qgrayraster.cpp
|
||||||
index 3c222c49e1..813cfc08dc 100644
|
index 3c222c49e16..813cfc08dcf 100644
|
||||||
--- a/src/gui/painting/qgrayraster.c
|
--- a/src/gui/painting/qgrayraster.c
|
||||||
+++ b/src/gui/painting/qgrayraster.cpp
|
+++ b/src/gui/painting/qgrayraster.cpp
|
||||||
@@ -3,7 +3,7 @@
|
@@ -3,7 +3,7 @@
|
||||||
|
@ -235,7 +235,7 @@ index 3c222c49e1..813cfc08dc 100644
|
||||||
*araster = 0;
|
*araster = 0;
|
||||||
return ErrRaster_Memory_Overflow;
|
return ErrRaster_Memory_Overflow;
|
||||||
diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
|
diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
|
||||||
index 33ed2fd5c7..658547ce4a 100644
|
index 33ed2fd5c7b..658547ce4a8 100644
|
||||||
--- a/src/gui/painting/qt_attribution.json
|
--- a/src/gui/painting/qt_attribution.json
|
||||||
+++ b/src/gui/painting/qt_attribution.json
|
+++ b/src/gui/painting/qt_attribution.json
|
||||||
@@ -4,7 +4,7 @@
|
@@ -4,7 +4,7 @@
|
||||||
|
@ -248,5 +248,5 @@ index 33ed2fd5c7..658547ce4a 100644
|
||||||
"Description": "FreeType is a freely available software library to render fonts.",
|
"Description": "FreeType is a freely available software library to render fonts.",
|
||||||
"Homepage": "http://www.freetype.org",
|
"Homepage": "http://www.freetype.org",
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From d4c8e46503f4037e6203dbfd31106ec16ffce434 Mon Sep 17 00:00:00 2001
|
From 3e13be5576b33773f16a4a4cdddbaab6235eae85 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 24 Apr 2022 23:00:27 +0200
|
Date: Sun, 24 Apr 2022 23:00:27 +0200
|
||||||
Subject: [PATCH 09/17] Find fontconfig via pkg-config for correct handling of
|
Subject: [PATCH 09/17] Find fontconfig via pkg-config for correct handling of
|
||||||
|
@ -17,7 +17,7 @@ Change-Id: I331cd6b1af4f2857279c90920d777977e80fdce5
|
||||||
|
|
||||||
diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
|
diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000..1a52327ae6
|
index 00000000000..1a52327ae6f
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/cmake/FindFontconfig.cmake
|
+++ b/cmake/FindFontconfig.cmake
|
||||||
@@ -0,0 +1,11 @@
|
@@ -0,0 +1,11 @@
|
||||||
|
@ -33,7 +33,7 @@ index 0000000000..1a52327ae6
|
||||||
+ set(Fontconfig_FOUND 1)
|
+ set(Fontconfig_FOUND 1)
|
||||||
+endif()
|
+endif()
|
||||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||||
index 820b943f16..c6eb55f0a5 100644
|
index 820b943f16d..c6eb55f0a56 100644
|
||||||
--- a/src/gui/CMakeLists.txt
|
--- a/src/gui/CMakeLists.txt
|
||||||
+++ b/src/gui/CMakeLists.txt
|
+++ b/src/gui/CMakeLists.txt
|
||||||
@@ -710,7 +710,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
|
@@ -710,7 +710,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
|
||||||
|
@ -46,7 +46,7 @@ index 820b943f16..c6eb55f0a5 100644
|
||||||
|
|
||||||
qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
|
qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
|
||||||
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
|
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
|
||||||
index 222073adcd..27cdac0dbf 100644
|
index 222073adcdd..27cdac0dbf5 100644
|
||||||
--- a/src/gui/configure.cmake
|
--- a/src/gui/configure.cmake
|
||||||
+++ b/src/gui/configure.cmake
|
+++ b/src/gui/configure.cmake
|
||||||
@@ -43,7 +43,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
|
@@ -43,7 +43,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
|
||||||
|
@ -59,5 +59,5 @@ index 222073adcd..27cdac0dbf 100644
|
||||||
qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
|
qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
|
||||||
qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
|
qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From af9caa1b9cc22f2534755d0754404f8b20a0c82c Mon Sep 17 00:00:00 2001
|
From 1f7ead09cc41d8be6f60b03ace9d6583be130bbe Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 24 Apr 2022 23:49:36 +0200
|
Date: Sun, 24 Apr 2022 23:49:36 +0200
|
||||||
Subject: [PATCH 10/17] Fix dependency of xcb-image on xcb-util
|
Subject: [PATCH 10/17] Fix dependency of xcb-image on xcb-util
|
||||||
|
@ -15,7 +15,7 @@ Change-Id: Ic87a94ec664c126a5af1012d31b068d3dc7ec947
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
||||||
index 26b9bf8963..0ae21f774c 100644
|
index 26b9bf89633..0ae21f774c6 100644
|
||||||
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
||||||
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
|
||||||
@@ -108,6 +108,7 @@ set(XCB_known_components
|
@@ -108,6 +108,7 @@ set(XCB_known_components
|
||||||
|
@ -44,5 +44,5 @@ index 26b9bf8963..0ae21f774c 100644
|
||||||
set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
|
set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
|
||||||
set(XCB_XVMC_component_deps XCB XV)
|
set(XCB_XVMC_component_deps XCB XV)
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From c67988c5f36623d9ac326bbb86fdcea4265da815 Mon Sep 17 00:00:00 2001
|
From b372fe6ab04d2ab06c173f16f8f116f477ff025b Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Tue, 26 Apr 2022 20:16:31 +0200
|
Date: Tue, 26 Apr 2022 20:16:31 +0200
|
||||||
Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for glib2
|
Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for glib2
|
||||||
|
@ -10,7 +10,7 @@ Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
|
||||||
1 file changed, 18 insertions(+), 4 deletions(-)
|
1 file changed, 18 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||||
index a6a16b494f..a5da57824c 100644
|
index a6a16b494fd..a5da57824c9 100644
|
||||||
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||||
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
|
||||||
@@ -52,7 +52,7 @@
|
@@ -52,7 +52,7 @@
|
||||||
|
@ -70,5 +70,5 @@ index a6a16b494f..a5da57824c 100644
|
||||||
set_package_properties(GLIB2 PROPERTIES
|
set_package_properties(GLIB2 PROPERTIES
|
||||||
URL "https://wiki.gnome.org/Projects/GLib"
|
URL "https://wiki.gnome.org/Projects/GLib"
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 003a0762443d8b8cfdf8a33c2a15163ac5c4d346 Mon Sep 17 00:00:00 2001
|
From 02b48c168d191668a4b22a950ed507aafdaf8c55 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sun, 1 May 2022 23:28:26 +0200
|
Date: Sun, 1 May 2022 23:28:26 +0200
|
||||||
Subject: [PATCH 12/17] Allow using properties of PkgConfig targets for Wayland
|
Subject: [PATCH 12/17] Allow using properties of PkgConfig targets for Wayland
|
||||||
|
@ -10,7 +10,7 @@ Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
|
||||||
1 file changed, 21 insertions(+)
|
1 file changed, 21 insertions(+)
|
||||||
|
|
||||||
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
|
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
|
||||||
index 233cc88d02..875c71377c 100644
|
index 233cc88d020..875c71377c6 100644
|
||||||
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
|
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
|
||||||
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
|
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
|
||||||
@@ -75,6 +75,13 @@
|
@@ -75,6 +75,13 @@
|
||||||
|
@ -49,5 +49,5 @@ index 233cc88d02..875c71377c 100644
|
||||||
set_package_properties(Wayland PROPERTIES
|
set_package_properties(Wayland PROPERTIES
|
||||||
URL "http://wayland.freedesktop.org"
|
URL "http://wayland.freedesktop.org"
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ee14993094cc62d1a819bfe37f4447512f2a265c Mon Sep 17 00:00:00 2001
|
From 4e1a0159903caec1b32ed1556dffecb66eba5298 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Tue, 7 Nov 2023 23:58:54 +0100
|
Date: Tue, 7 Nov 2023 23:58:54 +0100
|
||||||
Subject: [PATCH 13/17] Allow overriding preference for shared libzstd library
|
Subject: [PATCH 13/17] Allow overriding preference for shared libzstd library
|
||||||
|
@ -14,7 +14,7 @@ Change-Id: I38b8a15929e6b7044d827c095f13a27e0adf11da
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/FindWrapZSTD.cmake b/cmake/FindWrapZSTD.cmake
|
diff --git a/cmake/FindWrapZSTD.cmake b/cmake/FindWrapZSTD.cmake
|
||||||
index fb424236b8..12a3178518 100644
|
index fb424236b89..12a3178518e 100644
|
||||||
--- a/cmake/FindWrapZSTD.cmake
|
--- a/cmake/FindWrapZSTD.cmake
|
||||||
+++ b/cmake/FindWrapZSTD.cmake
|
+++ b/cmake/FindWrapZSTD.cmake
|
||||||
@@ -28,10 +28,12 @@ include(FindPackageHandleStandardArgs)
|
@@ -28,10 +28,12 @@ include(FindPackageHandleStandardArgs)
|
||||||
|
@ -34,5 +34,5 @@ index fb424236b8..12a3178518 100644
|
||||||
if(NOT TARGET WrapZSTD::WrapZSTD)
|
if(NOT TARGET WrapZSTD::WrapZSTD)
|
||||||
add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
|
add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 4ec6da0dcc50cc48271cf0cf53fe8f6ba32fcea2 Mon Sep 17 00:00:00 2001
|
From 3cb82f403853a4e18280f369394fc2da36b29a01 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sat, 17 Feb 2024 20:31:12 +0100
|
Date: Sat, 17 Feb 2024 20:31:12 +0100
|
||||||
Subject: [PATCH 14/17] Fix errors due to disabled exceptions with cpp_winrt
|
Subject: [PATCH 14/17] Fix errors due to disabled exceptions with cpp_winrt
|
||||||
|
@ -13,7 +13,7 @@ Change-Id: I216f65b260062ff2020f8a288ddda78c3e9fc3c9
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
|
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
|
||||||
index ca1bbcb758..16fd2cd2be 100644
|
index ca1bbcb758c..16fd2cd2be9 100644
|
||||||
--- a/src/plugins/platforms/windows/CMakeLists.txt
|
--- a/src/plugins/platforms/windows/CMakeLists.txt
|
||||||
+++ b/src/plugins/platforms/windows/CMakeLists.txt
|
+++ b/src/plugins/platforms/windows/CMakeLists.txt
|
||||||
@@ -9,6 +9,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
@@ -9,6 +9,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
||||||
|
@ -25,5 +25,5 @@ index ca1bbcb758..16fd2cd2be 100644
|
||||||
main.cpp
|
main.cpp
|
||||||
qtwindowsglobal.h
|
qtwindowsglobal.h
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From fd204d57b5304a4fced6921dc10e2be55334a026 Mon Sep 17 00:00:00 2001
|
From 16270d06822ab9ad3f0aa179c32607ad7260a6ad Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sat, 17 Feb 2024 20:48:21 +0100
|
Date: Sat, 17 Feb 2024 20:48:21 +0100
|
||||||
Subject: [PATCH 15/17] Fix setting exception flags of plugin targets
|
Subject: [PATCH 15/17] Fix setting exception flags of plugin targets
|
||||||
|
@ -9,10 +9,10 @@ Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8
|
||||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
|
diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
|
||||||
index 2db9d4628a..da71a07715 100644
|
index bc0f651b99c..0a832a71f08 100644
|
||||||
--- a/cmake/QtPluginHelpers.cmake
|
--- a/cmake/QtPluginHelpers.cmake
|
||||||
+++ b/cmake/QtPluginHelpers.cmake
|
+++ b/cmake/QtPluginHelpers.cmake
|
||||||
@@ -369,8 +369,11 @@ function(qt_internal_add_plugin target)
|
@@ -376,8 +376,11 @@ function(qt_internal_add_plugin target)
|
||||||
|
|
||||||
qt_internal_add_repo_local_defines("${target}")
|
qt_internal_add_repo_local_defines("${target}")
|
||||||
|
|
||||||
|
@ -27,5 +27,5 @@ index 2db9d4628a..da71a07715 100644
|
||||||
set(qt_libs_private "")
|
set(qt_libs_private "")
|
||||||
qt_internal_get_qt_all_known_modules(known_modules)
|
qt_internal_get_qt_all_known_modules(known_modules)
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 63a51d8dc13ad219b56ba1f6adae92a8c90b25c7 Mon Sep 17 00:00:00 2001
|
From 31f9863d7d2228baaea7be1debf94d1e272c6768 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sat, 17 Feb 2024 21:39:39 +0100
|
Date: Sat, 17 Feb 2024 21:39:39 +0100
|
||||||
Subject: [PATCH 16/17] Link corelib correctly against runtimeobject when
|
Subject: [PATCH 16/17] Link corelib correctly against runtimeobject when
|
||||||
|
@ -14,7 +14,7 @@ Change-Id: Ie3bd0290bb2f1c0d227c60a6cf6580efddd837fd
|
||||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
|
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
|
||||||
index 1296ff0408..31030159f2 100644
|
index f4bd31b55d4..ba7c025d722 100644
|
||||||
--- a/src/corelib/CMakeLists.txt
|
--- a/src/corelib/CMakeLists.txt
|
||||||
+++ b/src/corelib/CMakeLists.txt
|
+++ b/src/corelib/CMakeLists.txt
|
||||||
@@ -779,8 +779,7 @@ qt_internal_extend_target(Core CONDITION WIN32
|
@@ -779,8 +779,7 @@ qt_internal_extend_target(Core CONDITION WIN32
|
||||||
|
@ -28,7 +28,7 @@ index 1296ff0408..31030159f2 100644
|
||||||
runtimeobject
|
runtimeobject
|
||||||
)
|
)
|
||||||
diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
||||||
index a9acc465f3..acd3754f4e 100644
|
index a9acc465f36..acd3754f4e5 100644
|
||||||
--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
||||||
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
||||||
@@ -14,7 +14,7 @@ qt_internal_add_plugin(QNLMNIPlugin
|
@@ -14,7 +14,7 @@ qt_internal_add_plugin(QNLMNIPlugin
|
||||||
|
@ -41,5 +41,5 @@ index a9acc465f3..acd3754f4e 100644
|
||||||
runtimeobject
|
runtimeobject
|
||||||
oleaut32
|
oleaut32
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 1bcb7df3e6d7027df3cc242acb14c036b0df1ad5 Mon Sep 17 00:00:00 2001
|
From 267f6ff8b49fca1b16463864fe18accbf81d6e37 Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Sat, 17 Feb 2024 23:11:18 +0100
|
Date: Sat, 17 Feb 2024 23:11:18 +0100
|
||||||
Subject: [PATCH 17/17] Workaround linker error about missing symbol
|
Subject: [PATCH 17/17] Workaround linker error about missing symbol
|
||||||
|
@ -19,7 +19,7 @@ Change-Id: I02c47c386d80e5f8a21bb2a4cee83e2141dee481
|
||||||
4 files changed, 20 insertions(+)
|
4 files changed, 20 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
|
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
|
||||||
index 31030159f2..5390f1e5e4 100644
|
index ba7c025d722..fbb40bb8305 100644
|
||||||
--- a/src/corelib/CMakeLists.txt
|
--- a/src/corelib/CMakeLists.txt
|
||||||
+++ b/src/corelib/CMakeLists.txt
|
+++ b/src/corelib/CMakeLists.txt
|
||||||
@@ -779,6 +779,11 @@ qt_internal_extend_target(Core CONDITION WIN32
|
@@ -779,6 +779,11 @@ qt_internal_extend_target(Core CONDITION WIN32
|
||||||
|
@ -35,7 +35,7 @@ index 31030159f2..5390f1e5e4 100644
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
runtimeobject
|
runtimeobject
|
||||||
diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
||||||
index acd3754f4e..0557c60afd 100644
|
index acd3754f4e5..0557c60afd1 100644
|
||||||
--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
||||||
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
|
||||||
@@ -20,6 +20,11 @@ qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32
|
@@ -20,6 +20,11 @@ qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32
|
||||||
|
@ -51,7 +51,7 @@ index acd3754f4e..0557c60afd 100644
|
||||||
set_property(TARGET QNLMNIPlugin PROPERTY
|
set_property(TARGET QNLMNIPlugin PROPERTY
|
||||||
AUTOGEN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/autogen")
|
AUTOGEN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/autogen")
|
||||||
diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
|
diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
|
||||||
index e21b230cd7..e44587af74 100644
|
index e21b230cd78..e44587af743 100644
|
||||||
--- a/src/plugins/platforms/direct2d/CMakeLists.txt
|
--- a/src/plugins/platforms/direct2d/CMakeLists.txt
|
||||||
+++ b/src/plugins/platforms/direct2d/CMakeLists.txt
|
+++ b/src/plugins/platforms/direct2d/CMakeLists.txt
|
||||||
@@ -82,6 +82,11 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
|
@@ -82,6 +82,11 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
|
||||||
|
@ -67,7 +67,7 @@ index e21b230cd7..e44587af74 100644
|
||||||
set_source_files_properties("../windows/openglblacklists/default.json"
|
set_source_files_properties("../windows/openglblacklists/default.json"
|
||||||
PROPERTIES QT_RESOURCE_ALIAS "default.json"
|
PROPERTIES QT_RESOURCE_ALIAS "default.json"
|
||||||
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
|
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
|
||||||
index 16fd2cd2be..2521707dda 100644
|
index 16fd2cd2be9..2521707ddae 100644
|
||||||
--- a/src/plugins/platforms/windows/CMakeLists.txt
|
--- a/src/plugins/platforms/windows/CMakeLists.txt
|
||||||
+++ b/src/plugins/platforms/windows/CMakeLists.txt
|
+++ b/src/plugins/platforms/windows/CMakeLists.txt
|
||||||
@@ -70,6 +70,11 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
@@ -70,6 +70,11 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
||||||
|
@ -83,5 +83,5 @@ index 16fd2cd2be..2521707dda 100644
|
||||||
set_source_files_properties("openglblacklists/default.json"
|
set_source_files_properties("openglblacklists/default.json"
|
||||||
PROPERTIES QT_RESOURCE_ALIAS "default.json"
|
PROPERTIES QT_RESOURCE_ALIAS "default.json"
|
||||||
--
|
--
|
||||||
2.43.2
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
# All patches are managed at https://github.com/Martchus/qtbase
|
# All patches are managed at https://github.com/Martchus/qtbase
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-base
|
pkgname=mingw-w64-qt6-base
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
url='https://www.qt.io'
|
url='https://www.qt.io'
|
||||||
license=(GPL3 LGPL3 FDL custom)
|
license=(GPL3 LGPL3 FDL custom)
|
||||||
|
@ -48,24 +48,24 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0015-Fix-setting-exception-flags-of-plugin-targets.patch'
|
'0015-Fix-setting-exception-flags-of-plugin-targets.patch'
|
||||||
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
||||||
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
||||||
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
|
sha256sums=('0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462'
|
||||||
'7691272ccd272a6b0a750777a7d8d738588145cefce1f250d6ad756fcf1fe3d4'
|
'4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562'
|
||||||
'7dcb792c97098b44857e4932088b4164a85dc702f5f519654937ee38c98e5ffc'
|
'5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5'
|
||||||
'140904d07d65e77080040337536f4ccd5285672e0d8867a3807a8b1f80c430a5'
|
'c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e'
|
||||||
'17a09b620fc06518167f04fc5b28bd453c58ca3d32c70ef10e09802160843639'
|
'9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696'
|
||||||
'eeb14b5298ec1b9b564ee78edc41670470e0efa68755f954b79ac83c684ea387'
|
'2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d'
|
||||||
'5f1780805561985c9f575dbbefe704f5c61b622ce75bb4a30532f51c95ae1436'
|
'9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11'
|
||||||
'adc1b10e565b10944951df9e10ce6999c0210071b75b7a4dd230f617d88aab4f'
|
'721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743'
|
||||||
'54646442b7a00aa59d6be6ec7be95b2424fb4b152b0ee801451b38e8252c2c2f'
|
'e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1'
|
||||||
'a8971b7c21da5ed1f7fcd02a69d4f1491303d991b0f84b83ed97367bb9778247'
|
'25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e'
|
||||||
'9e97d8c5487c9212ffb00a1e90c7ccd11cb400696b77c94306e65360d2c11ede'
|
'7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85'
|
||||||
'6d31790b364ce516d82b78f78146076d1f6b8fdf9adaa90c63aeb4cfb8dc00ee'
|
'e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09'
|
||||||
'7be1875458af031925d2e91e262782f15801f6f5deff8babd0685037a7588d1f'
|
'e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85'
|
||||||
'a73a8fbdbd14a132e97a58abf0b58270d2af43d86ba238a236265d1341e84d06'
|
'4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504'
|
||||||
'c7c30f1da326b07abae0ab1c3f257cee0691c8b1ca26d1266978e77d6a769272'
|
'd3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89'
|
||||||
'a316377d963838af16c02645b88ac16cb49714e6df998a44675f8536dea72301'
|
'3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78'
|
||||||
'fd77316b643ebde5bb607e871c1d7983273b1292798d510c848aa2873037ab9e'
|
'022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6'
|
||||||
'120e463090b99b70235a722fb1a671b7b742cb77f5c400a3856da534fcfae356')
|
'1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
|
0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# All patches are managed at https://github.com/Martchus/qtbase
|
# All patches are managed at https://github.com/Martchus/qtbase
|
||||||
|
|
||||||
pkgname=static-compat-qt6-base
|
pkgname=static-compat-qt6-base
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -47,24 +47,24 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
|
||||||
'0015-Fix-setting-exception-flags-of-plugin-targets.patch'
|
'0015-Fix-setting-exception-flags-of-plugin-targets.patch'
|
||||||
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
'0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
|
||||||
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
'0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
|
||||||
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
|
sha256sums=('0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462'
|
||||||
'7691272ccd272a6b0a750777a7d8d738588145cefce1f250d6ad756fcf1fe3d4'
|
'4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562'
|
||||||
'7dcb792c97098b44857e4932088b4164a85dc702f5f519654937ee38c98e5ffc'
|
'5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5'
|
||||||
'140904d07d65e77080040337536f4ccd5285672e0d8867a3807a8b1f80c430a5'
|
'c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e'
|
||||||
'17a09b620fc06518167f04fc5b28bd453c58ca3d32c70ef10e09802160843639'
|
'9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696'
|
||||||
'eeb14b5298ec1b9b564ee78edc41670470e0efa68755f954b79ac83c684ea387'
|
'2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d'
|
||||||
'5f1780805561985c9f575dbbefe704f5c61b622ce75bb4a30532f51c95ae1436'
|
'9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11'
|
||||||
'adc1b10e565b10944951df9e10ce6999c0210071b75b7a4dd230f617d88aab4f'
|
'721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743'
|
||||||
'54646442b7a00aa59d6be6ec7be95b2424fb4b152b0ee801451b38e8252c2c2f'
|
'e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1'
|
||||||
'a8971b7c21da5ed1f7fcd02a69d4f1491303d991b0f84b83ed97367bb9778247'
|
'25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e'
|
||||||
'9e97d8c5487c9212ffb00a1e90c7ccd11cb400696b77c94306e65360d2c11ede'
|
'7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85'
|
||||||
'6d31790b364ce516d82b78f78146076d1f6b8fdf9adaa90c63aeb4cfb8dc00ee'
|
'e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09'
|
||||||
'7be1875458af031925d2e91e262782f15801f6f5deff8babd0685037a7588d1f'
|
'e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85'
|
||||||
'a73a8fbdbd14a132e97a58abf0b58270d2af43d86ba238a236265d1341e84d06'
|
'4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504'
|
||||||
'c7c30f1da326b07abae0ab1c3f257cee0691c8b1ca26d1266978e77d6a769272'
|
'd3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89'
|
||||||
'a316377d963838af16c02645b88ac16cb49714e6df998a44675f8536dea72301'
|
'3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78'
|
||||||
'fd77316b643ebde5bb607e871c1d7983273b1292798d510c848aa2873037ab9e'
|
'022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6'
|
||||||
'120e463090b99b70235a722fb1a671b7b742cb77f5c400a3856da534fcfae356')
|
'1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-charts
|
pkgname=android-$_android_arch-qt6-charts
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-charts-static
|
pkgname=mingw-w64-qt6-charts-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-charts
|
pkgname=mingw-w64-qt6-charts
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-charts
|
pkgname=static-compat-qt6-charts
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -16,7 +16,7 @@ makedepends=(static-compat-cmake static-compat-vulkan-headers ninja)
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('b1486262ee07b4420b8cdd1525c01800186b15d4fee0669cf544fdd5e941f5f4')
|
sha256sums=('50968886148fd2564ba52c702cfbf260e35956327a6bcd8001ae658eaa157fe5')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
b1486262ee07b4420b8cdd1525c01800186b15d4fee0669cf544fdd5e941f5f4
|
50968886148fd2564ba52c702cfbf260e35956327a6bcd8001ae658eaa157fe5
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-connectivity
|
pkgname=android-$_android_arch-qt6-connectivity
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-connectivity-static
|
pkgname=mingw-w64-qt6-connectivity-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-connectivity
|
pkgname=mingw-w64-qt6-connectivity
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-connectivity
|
pkgname=static-compat-qt6-connectivity
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-datavis3d
|
pkgname=android-$_android_arch-qt6-datavis3d
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-datavis3d-static
|
pkgname=mingw-w64-qt6-datavis3d-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-datavis3d
|
pkgname=mingw-w64-qt6-datavis3d
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-datavis3d
|
pkgname=static-compat-qt6-datavis3d
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-vul
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('314a6b2904006d151c2ec7d753814c8c63903ff814069baf9c4978d49d2a1c47')
|
sha256sums=('9b1781e464901996b56f31a5cef3e50aac051906e0e535b21b36ca3ae140dfbf')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
314a6b2904006d151c2ec7d753814c8c63903ff814069baf9c4978d49d2a1c47
|
9b1781e464901996b56f31a5cef3e50aac051906e0e535b21b36ca3ae140dfbf
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-declarative
|
pkgname=android-$_android_arch-qt6-declarative
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -24,7 +24,7 @@ _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
||||||
'df9a596ff2773b66ca77462fe495fcd0a9e3e441e5ea3ae580d5340adecf536c')
|
'e12a6de49432cb4c37a26e12e3a533f56f34ec8822986fd3a648e4c0036fb7e7')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module', has_binaries => 1;
|
% layout 'android-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-declarative-static
|
pkgname=mingw-w64-qt6-declarative-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -23,7 +23,7 @@ _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
||||||
'df9a596ff2773b66ca77462fe495fcd0a9e3e441e5ea3ae580d5340adecf536c')
|
'e12a6de49432cb4c37a26e12e3a533f56f34ec8822986fd3a648e4c0036fb7e7')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 5cf0ff8aafd77691530680b38f4808ade5359cd0 Mon Sep 17 00:00:00 2001
|
From a5ece21690ba2114e6ca93ebe2673a59651a2b3e Mon Sep 17 00:00:00 2001
|
||||||
From: Martchus <martchus@gmx.net>
|
From: Martchus <martchus@gmx.net>
|
||||||
Date: Fri, 5 Feb 2021 02:22:45 +0100
|
Date: Fri, 5 Feb 2021 02:22:45 +0100
|
||||||
Subject: [PATCH] Exclude qmltime when cross compiling
|
Subject: [PATCH] Exclude qmltime when cross compiling
|
||||||
|
@ -29,5 +29,5 @@ index b86d3251a3..2c60ac3352 100644
|
||||||
if(QT_BUILD_SHARED_LIBS
|
if(QT_BUILD_SHARED_LIBS
|
||||||
AND QT_FEATURE_process
|
AND QT_FEATURE_process
|
||||||
--
|
--
|
||||||
2.43.0
|
2.44.0
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-declarative
|
pkgname=mingw-w64-qt6-declarative
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
@ -23,7 +23,7 @@ _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
||||||
'df9a596ff2773b66ca77462fe495fcd0a9e3e441e5ea3ae580d5340adecf536c')
|
'e12a6de49432cb4c37a26e12e3a533f56f34ec8822986fd3a648e4c0036fb7e7')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
% layout 'mingw-w64-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-declarative
|
pkgname=static-compat-qt6-declarative
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -17,8 +17,8 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
|
||||||
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
'0001-Exclude-qmltime-when-cross-compiling.patch')
|
||||||
sha256sums=('c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c'
|
sha256sums=('05207b2cfcf2ca74321165e81fc382ca289340d52de74ca2bad4c2b124a792f3'
|
||||||
'df9a596ff2773b66ca77462fe495fcd0a9e3e441e5ea3ae580d5340adecf536c')
|
'e12a6de49432cb4c37a26e12e3a533f56f34ec8822986fd3a648e4c0036fb7e7')
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
cd $_pkgfqn
|
cd $_pkgfqn
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module', has_binaries => 1;
|
% layout 'static-compat-qt6-module', has_binaries => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c
|
05207b2cfcf2ca74321165e81fc382ca289340d52de74ca2bad4c2b124a792f3
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-grpc
|
pkgname=android-$_android_arch-qt6-grpc
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-grpc-static
|
pkgname=mingw-w64-qt6-grpc-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-grpc
|
pkgname=mingw-w64-qt6-grpc
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-grpc
|
pkgname=static-compat-qt6-grpc
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-httpserver
|
pkgname=android-$_android_arch-qt6-httpserver
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-httpserver-static
|
pkgname=mingw-w64-qt6-httpserver-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-httpserver
|
pkgname=mingw-w64-qt6-httpserver
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module';
|
% layout 'mingw-w64-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-httpserver
|
pkgname=static-compat-qt6-httpserver
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-imageformats
|
pkgname=android-$_android_arch-qt6-imageformats
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-imageformats-static
|
pkgname=mingw-w64-qt6-imageformats-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-imageformats
|
pkgname=mingw-w64-qt6-imageformats
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
% layout 'mingw-w64-qt6-module', no_libs => 1;
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=static-compat-qt6-imageformats
|
pkgname=static-compat-qt6-imageformats
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
@ -19,7 +19,7 @@ makedepends=(static-compat-cmake ninja)
|
||||||
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
|
||||||
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
|
||||||
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
|
||||||
sha256sums=('71584c9136d4983ad19fa2d017abbae57b055eb90c62a36bf3f45d6d21a87cb3')
|
sha256sums=('3ca5ea60176603ce6ffc1bff59a4dcea139375233ce8e5e86c38f4e84c44627c')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
check_buildoption ccache y && ccache_args='
|
check_buildoption ccache y && ccache_args='
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'static-compat-qt6-module';
|
% layout 'static-compat-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
71584c9136d4983ad19fa2d017abbae57b055eb90c62a36bf3f45d6d21a87cb3
|
3ca5ea60176603ce6ffc1bff59a4dcea139375233ce8e5e86c38f4e84c44627c
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
_android_arch=aarch64
|
_android_arch=aarch64
|
||||||
pkgname=android-$_android_arch-qt6-location
|
pkgname=android-$_android_arch-qt6-location
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
% layout 'android-qt6-module';
|
% layout 'android-qt6-module';
|
||||||
\
|
\
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-qt6-location-static
|
pkgname=mingw-w64-qt6-location-static
|
||||||
_qtver=6.6.2
|
_qtver=6.6.3
|
||||||
pkgver=${_qtver/-/}
|
pkgver=${_qtver/-/}
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue