diff --git a/devel/generator/generate.pl b/devel/generator/generate.pl index 9aff451f..fb837d93 100755 --- a/devel/generator/generate.pl +++ b/devel/generator/generate.pl @@ -75,12 +75,43 @@ $mojolicious->helper(expand_libs => sub { # define revisions of Qt modules from KDE fork my %kde_fork_revisions = ( - # module => [rev, 'commit on KDE fork', 'version bump to be reverted' ], - base => [274, '98aa64af7e1e677bd107bfb0c432cabf7c3a5e32', '6344955d17e17e2398720fe60c34cfc2a4a95208'], - declarative => [42, '8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4', '568763928a78b52373932b01be17e040f7c3fa50'], - tools => [17, '33693a928986006d79c1ee743733cde5966ac402', 'dbe0567470db2b369a9fdb28d9fbac38be3e2d60'], - svg => [14, '5b9285c34731e67f9f1d61ec804740991f2a0380', '9aac88424a1b76e0198b52437af58a6d94aff8e9'], - wayland => [23, 'fcc2f57cefa66339c8cb6632f45a47fbb99bb60d', '30cb2a87fcc6265232cb5a3ffce9836da6e531d6'], + # module => [rev, 'commit on KDE fork', 'version bump to be reverted' ], + '3d' => [18, '6d926ec2739f2289c6b0bbfbc325700046e1ceee', ], + activeqt => [0, '2c53a16f431bbb950bfca8ac32ddabf217a0bf04', ], + base => [133, 'e68ca8e51375d963b2391715f70b42707992dbd8', ], + charts => [0, 'f13988aa1ad9de5d92e7b0ba4d0d947dd019d759', ], + connectivity => [0, '8a377440b37f5633156a8e40c9f0dce5f4d5a665', ], + connnectivity => [5, '8a377440b37f5633156a8e40c9f0dce5f4d5a665', ], + datavis3d => [0, '19af9584f7b80928ee49950c573c770af68c9519', ], + declarative => [20, '02105099301450c890e1caba977ef44efdc43da7', ], + gamepad => [0, '6b7a6303439f83147680723f4d8142d676cdb928', ], + graphicaleffects => [0, '379577925766385991f413a2b0d0d46831381ffa', ], + imageformats => [0, '90038c936763645610fe1e5f05cfc025e4d98631', ], + location => [0, '1bf01b84e30aab2b87a19184ce42160e6c92d8b1', ], + lottie => [0, 'fca3f80f0ce389271e5bd9af864ce56a313d359a', ], + multimedia => [0, 'fa6c3d653682f9fd331d859c7196a291a8a4d8d5', ], + networkauth => [0, '958db00a2064f77b354b573102ca2c2b2e07529c', ], + purchasing => [0, '255b9e16f286003bbfaff9d48e4548fb0cb3b398', ], + quick3d => [2, '1ede2ac20170357b3e8d7d9810e5474e08170827', ], + quickcontrols => [0, 'd054de15b3c9ead0f96655ddfb1a6381ed7a0e2b', ], + quickcontrols2 => [4, '26bd7f5414dc592ab5277e2bb4ad0199faa889de', ], + quicktimeline => [0, '98b1ff53458887061b4bcc183efcce899f432394', ], + remoteobjects => [0, '581475dfeb44c8b51c0be86e0f2f57df7d117a80', ], + scxml => [0, '50d2da3965ed8e85f3f5f5760393c42b12d34a9f', ], + sensors => [0, '975ba788d3d0ee87aa08bb5301cd33dcbf00521b', ], + serialbus => [0, '22b3cad193232ab379a0c9e16989a7db1fdc9234', ], + serialport => [0, 'f95e2411d7c978def87846ea7cedf3dc5fd7c8b8', ], + speech => [1, '08b27c29aadc0cc0303cca97c9a3baa2a690dfe4', ], + svg => [12, '2f42157cabbd1db6249ccb1d14e6eede80451e0c', ], + tools => [1, 'a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4', ], + translations => [2, 'a6d5e7f84a57394db4c8b069f81c56cfeb802e19', ], + virtualkeyboard => [3, 'bb40dee811333929dd467a480dce24ab7af84ef9', ], + wayland => [40, '118674630cdb5933e66a8b4415afe7c716ad4662', ], + webchannel => [3, '611016a49f3a9ba7b58bef29bc295323e06373ae', ], + webglplugin => [0, '4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1', ], + websockets => [3, '7196d2cc34adf9f45b50a9488f4ff95b36092993', ], + winextras => [0, '051202df9c553d7c0a384f07bd67fde98f3b02c4', ], + xmlpatterns => [0, 'af4958af9d628d6124e64abd9743abce42f15a6f', ], ); # $rev := git rev-list --count v5.15.2..$commit_on_kde_fork diff --git a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep index 7384529a..c2efddcb 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep @@ -31,9 +31,10 @@ _qt_module=qt<%== $qt_module %> pkgname=<%= $package_name %> -pkgver=5.15.2<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %> +pkgver=5.15.3<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %> pkgrel=1 % if ($kde_fork_revision) { +_basever=${pkgver%%+*} _commit=<%== $kde_fork_revision->[1] %> % } pkgdesc='A cross-platform application and UI framework, <%= $opengl_backend %> OpenGL backend (mingw-w64)' @@ -87,14 +88,14 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' % if ($kde_fork_revision) { pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } % } prepare() { cd "${srcdir}/${_pkgfqn}" -% if ($kde_fork_revision) { +% if ($kde_fork_revision && defined $kde_fork_revision->[2]) { git revert -n <%== $kde_fork_revision->[2] %> # Revert version bump % } diff --git a/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep index 6a192d25..c5f7eb89 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep @@ -23,8 +23,11 @@ pkgname=mingw-w64-qt5-<%== $qt_module %><%== $static_variant ? '-static' : '' %> <%== content %>\ % if ($kde_fork_revision) { _commit=<%== $kde_fork_revision->[1] %> +_basever=$pkgver pkgver+=+kde+r<%== $kde_fork_revision->[0] %> makedepends+=('git') +% } elsif (stash('is_lts')) { +makedepends+=('git') % } options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -32,12 +35,15 @@ url='https://www.qt.io/' % if ($kde_fork_revision) { _pkgfqn=${_qt_module} source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit\ +% } elsif (stash('is_lts')) { +_pkgfqn=${_qt_module} +source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts\ % } else { _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"\ % } <%== include 'fragments/source_file_list', relevant_files => $patch_files %>) -% if ($kde_fork_revision) { +% if ($kde_fork_revision || stash('is_lts')) { sha256sums=('SKIP'\ % } else { sha256sums=('<%== $qt_module_sha256 %>'\ @@ -70,14 +76,14 @@ _configurations+=('CONFIG+=actually_a_shared_build <%== content_for 'shared_conf % if ($kde_fork_revision) { pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } % } % if ($patch_files->size || content_for('prepare')->size || $kde_fork_revision) { prepare() { cd "${srcdir}/${_pkgfqn}" -% if ($kde_fork_revision) { +% if ($kde_fork_revision && defined $kde_fork_revision->[2]) { git revert -n <%== $kde_fork_revision->[2] %> # Revert version bump % } diff --git a/devel/versions.sh b/devel/versions.sh index 8ae395a3..f36d2dfd 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -13,7 +13,7 @@ declare -A versions=( [blackwidowcontrol]=1.0.2 [dbus-soundrecorder]=1.2.3 [geocoordinatecalculator]=1.1.3 - [qt5]=5.15.2 + [qt5]=5.15.3 [qt6]=6.2.3 ) declare -A github_names=( diff --git a/qt5-3d/mingw-w64-static/PKGBUILD b/qt5-3d/mingw-w64-static/PKGBUILD index eec7ddcf..3f617caf 100644 --- a/qt5-3d/mingw-w64-static/PKGBUILD +++ b/qt5-3d/mingw-w64-static/PKGBUILD @@ -10,30 +10,41 @@ _qt_module=qt3d pkgname=mingw-w64-qt5-3d-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" -depends=('mingw-w64-qt5-declarative-static') -makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers') +depends=('mingw-w64-qt5-declarative-static' 'mingw-w64-assimp') +makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee +_basever=$pkgver +pkgver+=+kde+r18 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" - # ensure qgltf is linked against zlib - echo 'LIBS += -L/usr/lib -lz' >> tools/qgltf/qgltf.pro + # ensure qgltf is linked against assimp and zlib + echo 'LIBS += -L/usr/lib -lassimp -lz' >> tools/qgltf/qgltf.pro + # avoid linker errors related to an attempt to use Qt's bundled zlib by enforcing use of system assimp + sed -i 's|include.*||g' tools/qgltf/qgltf.pro } build() { diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index ffa600fc..5e8ff1c8 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -10,29 +10,40 @@ _qt_module=qt3d pkgname=mingw-w64-qt5-3d -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" -depends=('mingw-w64-qt5-declarative') -makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers') +depends=('mingw-w64-qt5-declarative' 'mingw-w64-assimp') +makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee +_basever=$pkgver +pkgver+=+kde+r18 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" - # ensure qgltf is linked against zlib - echo 'LIBS += -L/usr/lib -lz' >> tools/qgltf/qgltf.pro + # ensure qgltf is linked against assimp and zlib + echo 'LIBS += -L/usr/lib -lassimp -lz' >> tools/qgltf/qgltf.pro + # avoid linker errors related to an attempt to use Qt's bundled zlib by enforcing use of system assimp + sed -i 's|include.*||g' tools/qgltf/qgltf.pro } build() { diff --git a/qt5-3d/mingw-w64/PKGBUILD.sh.ep b/qt5-3d/mingw-w64/PKGBUILD.sh.ep index 6af63ac0..8d44eebf 100644 --- a/qt5-3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-3d/mingw-w64/PKGBUILD.sh.ep @@ -4,18 +4,20 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" -depends=(<%== qt5deps qw(declarative) %>) -makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers') +depends=(<%== qt5deps qw(declarative) %> 'mingw-w64-assimp') +makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp') license=('GPL3' 'LGPL3' 'FDL' 'custom') \ % content_for prepare => begin - # ensure qgltf is linked against zlib - echo 'LIBS += -L/usr/lib -lz' >> tools/qgltf/qgltf.pro + # ensure qgltf is linked against assimp and zlib + echo 'LIBS += -L/usr/lib -lassimp -lz' >> tools/qgltf/qgltf.pro + # avoid linker errors related to an attempt to use Qt's bundled zlib by enforcing use of system assimp + sed -i 's|include.*||g' tools/qgltf/qgltf.pro % end \ % content_for build_config_before_make => begin diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index 817252f4..f6dd4769 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -15,21 +15,25 @@ _qt_module=qtactiveqt pkgname=mingw-w64-qt5-activeqt -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'python') license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom') +_commit=2c53a16f431bbb950bfca8ac32ddabf217a0bf04 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch' '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch') -sha256sums=('868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c' +sha256sums=('SKIP' '05443c9a67b30160a7d4264da9c57b1a2fdbc3c74bab8e9f69c51ac8feeac2cb' '06aa9413f31edd4f8c51d65cf6a8e1add8d5a6af2588f18bdc2e67164ebdaea7') @@ -40,6 +44,11 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \ _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep index c1ea7068..230b91ab 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep @@ -10,7 +10,7 @@ % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index 5bb85f08..aa6dfd64 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -17,9 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.2+kde+r274 +pkgver=5.15.3+kde+r133 pkgrel=1 -_commit=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32 +_basever=${pkgver%%+*} +_commit=e68ca8e51375d963b2391715f70b42707992dbd8 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -70,51 +71,49 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') sha256sums=('SKIP' - '8ec72a1bb610e30a06c5bd301e0f502a4b1098e4f7709950d42f8d4f6b4529b1' - '3e2150bf9fd9b7bf4e02a7355b3316f1129159de4523dd56e2e002c17461a06b' - 'e18708d7a35920fff7b366cd98fabf87dda254b940581df2a3768dd22be86989' - '8be908199db7ed2d11dfa5b1a8b037a183e1a331b818e511a62ed366e56e322b' - 'ea9abbd04d03beb28682824750449ec734d0cd5980d18e43ee8c43a081522a39' - 'ede654c3021e9b2b5672fe67e6f3c8841dc3e9f59a16e1119adc5581021b6584' - '238a37d318d46d02e6a0632e58824ec64e323bf1a80f04fd2ca673eeb7eac167' - '1afa605f868eb859192c9e4a36474e2c9d3fd9808b8bbe83bf28fe44a0c5354a' - '3c9c7d80b88d7da333c13b366e0807d3d1bea7641a6e8540142c2197e00fb177' - 'ca065a912f79b3b8bd511d076e8d15e18802a7dc4baeb4f9af2a9ad1b2d65b25' - '519cf065067d7d1a15d02735457576f85d3d32ed2548650e93866e0e903e88bc' - '0811548a8f4c533f3b0df2b6114de673754aa269264a7bc99cc69db4228e24a8' - 'e8e754415d38b286c94f4227a372ef9d875d5f7d5493a88815903d0d9425f198' - 'ddddd2c328870aa66feed1415a34437cdbb6e086e6309fe5ac640cd551fdbc8d' - '9cf7eac11820012cedd0f5da75e7690e83a80e7002af0dec283d4b424142c22d' - '24e7863c621ab360c392b29244fcb2ffc4d116b8a5ef1f4e2a40841218c9bee1' - '790fb8562e2eee0b80bf23d6123e2f2c537021d8bbbec45053b12b8330244f93' - '6ff67b6c2c17478096409a90ee3e00b2a34b3e64dc8ecf24af8c4f33fbe9b083' - '3ce30f710591ba5dddb7c3a5cf0f9743da203ecc84d2e727e6d0f6a2a9502db6' - '80e5af98f00d73ad4210aa4fd4aed5f3259d7b965b2933568c30e539bb8a3fe3' - '9409620a23301e6410310ef9c865f19b185b35fa52593fc75f3674c1c95be81d' - 'd5fe2bcaa51e96ae1254d4596aabd4635d31959d15c2e5e6eefd238f824f1cf2' - '2bfd85eb2dad9ffbd3ca0920208091e85792c3b3673beff3467929ef3f7c399d' - '11d8dc525166ccbbc431fb3ed3a56540bfe26ad69b180c99ab6d3d9322d85ccc' - 'a633e33bf22e33ba549bd7bec1dbb3c1896922ed9041239f70fe13b32162c836' - '0057e150aed1f2119dd7dff27d21ed7f160ba398e9a4630c4f8ff979203dc8c2' - '30395cee07666b2cab06051033e3532140e8c4258ab6d576ef6514b90731bc8d' - 'a7ee924a26424c15f4a639f7e11ef154e70325c67e78d7d9231e7cff51fc01b2' - '431bd1f62600f985a4160fcdb2e44a6d8fec807eadb2f68738f941a649335150' - 'ba978e69e897e5ada1dce268517a5aeb356250052738c61730718f5014a39490' - 'f6c3027f58205167f6a18e51463ee0702c1f4a57106ff6a75dff6c3a9e654ebc' - '0f6796e6c7e0436b61bbc3947197f821732a07db900d440772054cf25a9ca9de') + 'afba71c5989978f286179a49607976a35237496d86ac89be8757c899a40d537e' + 'b030be6a881a7e1398676079581b7aa72d439989eb1f19092630c43ce0ea95d5' + '8f964778a3c1d88643e9264e883b8733a8c7b0f4b02cf939e90fdf68842caa98' + '2bed971bda26f4f0dfec4cce6e3ced11c47b310de50672f68a0dda287a588849' + 'dfb2dff89fd4e40622212f042165156fa3ed2d469b6531f942199de33caad14f' + 'a12a73536da03752abbdb30d4a9cc969ff428e9e3152980cd021640f905ce03b' + '254f0b967ba8084880542dcd27b7fb641d36969006d1f5f0da9d54e1969b30a1' + 'b8806f862bce296d55da97cb3273f6a7dcb92e7d1266b9610f88b994e1a3ad25' + '6eb966cfeb80b5170fbd36e51f968a86d89dff532d1bef9daccbcf720b0474f2' + '9da382aca0cf299d1f736c1adff9033706e4047be419264c6b9ae78370a04756' + '7c8a923aa2bf5600c0f2993e4e869dab663f3dd2ab27c15035310c06661e4aed' + 'ee873b1f6a6e543cb288b39f135b6450f861f5ebcc8b4a7d367ea1bdb197170a' + 'b4ca4c64daf48cd1a7ca9d55e91d53294b719c50dd392ba84e0bdc1a8acc597f' + '8f840fb187612cb28a94bd4a8083c83e29a42b2731e28f8686dcb37411cc69a9' + '867e7ad44c2aac86f858d973a7af6514385a4f50d200f4259b30d470a3551b35' + '13443e40d4a470219a2f6dc2dedcd988dd481ebe724f74fb5f1e7fa4fbe29e6e' + '47b0f93c86108c03641efbdd97b54809a4ac0b575b86f27b7c6217e87320cda3' + 'fcac1dd8349e98b20ac4041856fd1d22c56326697fae5ab53e1823caeba10b01' + 'd4a31f994dbc39c9267bd2378f10212a5606a78d60956218349a4dc0faa4f215' + '03dc0efe46cc96984c971e0e744bbf32cadc9fa65a58a9d6435f0ed59169409d' + 'd1432fe90e63616e898d7f0c541fe28588101230ca3fe2e20da39365967a64f4' + 'd9b68a39699e83674738d507bbe35290893085c8cee5f947ba74d3ef8eaa0a36' + '6711df068cc141a72ec9a9d1d8d7afa0f718c2fe9799523d03ce47d1574efad0' + 'ea2d56b4f2eebd9a83c13706f9e4e37dfe4ba92af76195b97a81230734cbb300' + 'b872519418f451d8196fe22182a26994fb9b81c49ad6ca151b895e23e274cc7c' + '4e7f7cfd9e0ab4f7251f32c5a6cf81b05e2435172f145b5caad64a5e12487116' + 'e69332fb658d70256ba232726db853d55372a4f45a5a5b9479a21a10fe807d67' + '19c5cc4283416942f1575284357a3c3a74bc625f95aecb80d2a8dcc7d2d8c08f' + 'b924d45463042e345630b9d54460a8547749f3fa3a3ffb7de3c4e514e92a9a9b' + '97657b673e434befb42ccb1c153d1094a6d1c23044eb7725aea3a64aaf2ec5b1' + '562da92bdb7bf27dd44c2ae4f45381668fc80f1e8a0241b8c039c7e2884cfbae' + '6cd22e4e73ecf402af473859aaedcb4ec62173605a2e4127d72ef73c6882b323') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump - # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do msg2 "Applying patch $patch" diff --git a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 13738b37..c953a2df 100644 --- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 927aade0a5128c794f2d43c938b4d215061f7019 Mon Sep 17 00:00:00 2001 +From 07e6639a6c703155baeb18fef4924289ad635746 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with @@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 8e660843..f4d6020c 100644 --- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From e3642b6a82884670a4be3b0ad6921ce513083cb6 Mon Sep 17 00:00:00 2001 +From b0451c4c8ab8e1640172658d2dd70c142680fa8a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 11951332..603c535a 100644 --- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 21a3c586ea36240566a19ae97f8f53bbd31a86fc Mon Sep 17 00:00:00 2001 +From 148b5050b73fb0b90d18662731c0da7e83dc51df Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch index 8194b394..ad9f53a5 100644 --- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 89b22a5f59e9896363e4903bdcce4b9695b8400b Mon Sep 17 00:00:00 2001 +From 868525161830dfdb98ad2ae9b8a01b7778b3d133 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/32] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index a901332312..f1e8966123 100644 +index dfbbde3b26..a33017e19d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3218,7 +3218,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index a901332312..f1e8966123 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3243,7 +3243,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -36,7 +36,7 @@ index a901332312..f1e8966123 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index dc612c392c..7bfd2e1953 100644 +index 0ea587f607..6bf24d4708 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index cbaf468a..6b0badb1 100644 --- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 92edc381d36a1d6842c5e7369538e9208e87bc0d Mon Sep 17 00:00:00 2001 +From c9293396ea6dad4f014c03d2b1e187e5027cb013 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/32] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch index a1bccf59..2e321aea 100644 --- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 425dab657c6268a8408182dba60429cafff1a237 Mon Sep 17 00:00:00 2001 +From 8a31b70973aed143bc85bcace439a626f3dac7ac Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/32] Prevent debug library names in pkg-config files @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index f1e8966123..f45b6c9fd5 100644 +index a33017e19d..62a06d3560 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index f1e8966123..f45b6c9fd5 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch index d437a8aa..ea40917b 100644 --- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 634a78d7be8e14aa00eaa07315999890539a9bc1 Mon Sep 17 00:00:00 2001 +From 1ce5d69a238d74fdaa042060b75d2b35e94c5e8c Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/32] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644 ], "use": [ -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch index eb3cbd89..e974aeb9 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 7babbe2dd76fd091b09b5aae1b5b0e70287a5763 Mon Sep 17 00:00:00 2001 +From f96c7e9b07643459104d381d3de77170ed5c10ba Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/32] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include #else -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 2f3cb912..4de8bfdf 100644 --- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 14db0a00799e773d98f75f70d829047fc9edaedd Mon Sep 17 00:00:00 2001 +From 57b2037ddf96f1254bc8c8e239bfeddd0383c916 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library @@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644 }, "condition": "config.win32 && features.shared" -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch index 090ae4f3..f8118c17 100644 --- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From ab442dec4f84e5c206f4dcb17de8b8152dd18e40 Mon Sep 17 00:00:00 2001 +From b53ca6006f70650ccb5d9c7565c4d784d859241e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/32] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index e0043542ec..2fe0a018b1 100644 { "libs": "-lfreetype" } ], -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch index c0e67f54..1b52479f 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From ec1db76a3ea8531b253dfec1d3f2e79679691994 Mon Sep 17 00:00:00 2001 +From 51095c685e065d60263c3ee14b29f3e13ce4659a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/32] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 2fe0a018b1..ceeee23164 100644 }, "imf": { -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch index 214304c5..be6f4e85 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From a3cdbe8bf3c7e5ffd6df95ff5859d404ede0989e Mon Sep 17 00:00:00 2001 +From 462fdd6b868c3c0be6f499b62701d1b71e44e29a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/32] Fix linking against static pcre @@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644 #include -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch index 215312d6..53a92c3e 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From ce8a8e71aa6ab234fd44e1f278c0c9e7bfead9c8 Mon Sep 17 00:00:00 2001 +From 5bb1a2aa7ac776317f9dd0d2a7ef2d9da1ae731e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/32] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 00a97c3e..1fe975e2 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 55053533188a4c7bfafc69af8cf3f5f4f85eccaf Mon Sep 17 00:00:00 2001 +From 6658c3e842f014e945b4a92f8f07d161a00fc245 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644 ] }, -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch index 814a78ef..e377df96 100644 --- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 03a7c67b5122002ae7a9423a36627cdb5c36f294 Mon Sep 17 00:00:00 2001 +From 41922a8bda8c15d44ebe8e3cb7fa36f3da8d2679 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/32] Rename qtmain to qt5main @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch index 03805db8..ecbf2830 100644 --- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 296a4630e1e2dd947a4d30cb504d8e4b34263470 Mon Sep 17 00:00:00 2001 +From d5903df4fe71a8dda22742452f8c2ba0e8ce0919 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/32] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch index ecfac5bd..d5b45117 100644 --- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 1cc52bf44db9a74f5173ec793bc61ae85e580fd6 Mon Sep 17 00:00:00 2001 +From 7da85c7ad051f9d5db2081e3ea33e774e8c4d854 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/32] Use system zlib for build tools @@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644 } else { CONFIG += no_core_dep -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch index 5e7f3914..b332e6a6 100644 --- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From fdf07a6a7323b2ff9117e3d986b893504c747941 Mon Sep 17 00:00:00 2001 +From 4316cdf19818e71fb41d307af5f6ba0b06bb0fe8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/32] Merge shared and static library trees @@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index f45b6c9fd5..39221caf68 100644 +index 62a06d3560..bd8bd91438 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3235,6 +3235,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -152,7 +152,7 @@ index f45b6c9fd5..39221caf68 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3411,11 +3414,11 @@ MakefileGenerator::writePkgConfigFile() +@@ -3420,11 +3423,11 @@ MakefileGenerator::writePkgConfigFile() t << Qt::endl; // requires @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch index 4c59547a..a381b2c8 100644 --- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From a4b41ca8bd9b6bb761212d49ffe72955f7c84f14 Mon Sep 17 00:00:00 2001 +From d3e4d0719bd0aafe543fb6997eeb4152c8fec6e0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/32] Use *.dll.a as import lib extension @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d1ed2e89..b7081c8b 100644 --- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 49bd362a2316a8458d73d8fa7bca69aa3b1ca789 Mon Sep 17 00:00:00 2001 +From 892dcb09da7c69d03be98e4fa3aaf4ceb531e306 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch index 2d84c4eb..374875fa 100644 --- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 253d977b4ad945380287e2c27c09460490b3a036 Mon Sep 17 00:00:00 2001 +From 95ce669b134f215030dfc1a20c037dc32a777ea6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/32] Allow usage of static version with CMake @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index f317cefb..63cca788 100644 --- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From ee27a8ee0036cf79efdab7bb022a8ba2cc63dcb0 Mon Sep 17 00:00:00 2001 +From dd92ac8d02f789464af310afeec97e185bcc33cf Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/32] Adjust linker flags for static build with @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch index 1a900a26..d53bf6c3 100644 --- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 088869c4c0cc55d9f2a75fb36381290cb09c6300 Mon Sep 17 00:00:00 2001 +From 8a1d0975d053a9ed231bf936418135224a546192 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/32] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 252f7229..3b87fdc6 100644 --- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 0e17318db9342d7a21c224cccbccec6185208291 Mon Sep 17 00:00:00 2001 +From 984c35e68ef3b5fc17a31d3019b675d2564fe83b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch index a0ac34b2..210dfb7c 100644 --- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From c9793154e618b2ee00bc03295e80315e92549be1 Mon Sep 17 00:00:00 2001 +From ebcf54083cb5a425e06d3a266ea9464db61137ea Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/32] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch index 072a0d22..ac06309d 100644 --- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From f365c9f8672ae6b7e19db3162eef755a83e61161 Mon Sep 17 00:00:00 2001 +From 80e1027686310de70fff6a5d8065404857b8e795 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/32] Enable and fix use of iconv @@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644 }, "icu": { -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch index 5c50d46d..e8ed0fb0 100644 --- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From fb0caa03adc05ad835990a4a6e0829ce6ce50d09 Mon Sep 17 00:00:00 2001 +From b77702d4a42fe2c17c4ad4e4b3d084e33df33c97 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/32] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 1c1be4f9..39501b85 100644 --- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From e7b960e2af57c99d6843be5b8a59f8b72ce426a7 Mon Sep 17 00:00:00 2001 +From dd7bcb78b07a7fea031f18510af5acd2646f62c1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch index e346d631..017836df 100644 --- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 59b05394ef1d6577319aee506d40764e8766c822 Mon Sep 17 00:00:00 2001 +From 8a556b7e428261a4061894e4303a327c3447cdf4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins @@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644 include(windows.pri) -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch index 33ac1e99..a0d5bc07 100644 --- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 213ff75ecdc5a996f799adbd595e612fa9a817dd Mon Sep 17 00:00:00 2001 +From a6da51cc47652a4dbc5d398304775221246a407b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/32] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 7207a168..ba36aac8 100644 --- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From c0198cc36d39682324b1b22b0f54827fdf0311de Mon Sep 17 00:00:00 2001 +From 3af5d47c2bde5b60b7170b417907e47bbb9f50c8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch index 5d6f7af1..387c8f72 100644 --- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch +++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch @@ -1,4 +1,4 @@ -From 1ee9945ed930848e333ac5b12767cf42a7281fc8 Mon Sep 17 00:00:00 2001 +From 89dca3f775b1d5c8b3c1ffb9ec47ea7600bb330d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 Jun 2021 22:24:12 +0200 Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp @@ -244,5 +244,5 @@ index 7b16e8c211..38f03b73d8 100644 "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", -- -2.34.1 +2.35.1 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 6478427c..0ca89468 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -17,9 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.2+kde+r274 +pkgver=5.15.3+kde+r133 pkgrel=1 -_commit=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32 +_basever=${pkgver%%+*} +_commit=e68ca8e51375d963b2391715f70b42707992dbd8 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') url='https://www.qt.io/' @@ -69,51 +70,49 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') sha256sums=('SKIP' - '8ec72a1bb610e30a06c5bd301e0f502a4b1098e4f7709950d42f8d4f6b4529b1' - '3e2150bf9fd9b7bf4e02a7355b3316f1129159de4523dd56e2e002c17461a06b' - 'e18708d7a35920fff7b366cd98fabf87dda254b940581df2a3768dd22be86989' - '8be908199db7ed2d11dfa5b1a8b037a183e1a331b818e511a62ed366e56e322b' - 'ea9abbd04d03beb28682824750449ec734d0cd5980d18e43ee8c43a081522a39' - 'ede654c3021e9b2b5672fe67e6f3c8841dc3e9f59a16e1119adc5581021b6584' - '238a37d318d46d02e6a0632e58824ec64e323bf1a80f04fd2ca673eeb7eac167' - '1afa605f868eb859192c9e4a36474e2c9d3fd9808b8bbe83bf28fe44a0c5354a' - '3c9c7d80b88d7da333c13b366e0807d3d1bea7641a6e8540142c2197e00fb177' - 'ca065a912f79b3b8bd511d076e8d15e18802a7dc4baeb4f9af2a9ad1b2d65b25' - '519cf065067d7d1a15d02735457576f85d3d32ed2548650e93866e0e903e88bc' - '0811548a8f4c533f3b0df2b6114de673754aa269264a7bc99cc69db4228e24a8' - 'e8e754415d38b286c94f4227a372ef9d875d5f7d5493a88815903d0d9425f198' - 'ddddd2c328870aa66feed1415a34437cdbb6e086e6309fe5ac640cd551fdbc8d' - '9cf7eac11820012cedd0f5da75e7690e83a80e7002af0dec283d4b424142c22d' - '24e7863c621ab360c392b29244fcb2ffc4d116b8a5ef1f4e2a40841218c9bee1' - '790fb8562e2eee0b80bf23d6123e2f2c537021d8bbbec45053b12b8330244f93' - '6ff67b6c2c17478096409a90ee3e00b2a34b3e64dc8ecf24af8c4f33fbe9b083' - '3ce30f710591ba5dddb7c3a5cf0f9743da203ecc84d2e727e6d0f6a2a9502db6' - '80e5af98f00d73ad4210aa4fd4aed5f3259d7b965b2933568c30e539bb8a3fe3' - '9409620a23301e6410310ef9c865f19b185b35fa52593fc75f3674c1c95be81d' - 'd5fe2bcaa51e96ae1254d4596aabd4635d31959d15c2e5e6eefd238f824f1cf2' - '2bfd85eb2dad9ffbd3ca0920208091e85792c3b3673beff3467929ef3f7c399d' - '11d8dc525166ccbbc431fb3ed3a56540bfe26ad69b180c99ab6d3d9322d85ccc' - 'a633e33bf22e33ba549bd7bec1dbb3c1896922ed9041239f70fe13b32162c836' - '0057e150aed1f2119dd7dff27d21ed7f160ba398e9a4630c4f8ff979203dc8c2' - '30395cee07666b2cab06051033e3532140e8c4258ab6d576ef6514b90731bc8d' - 'a7ee924a26424c15f4a639f7e11ef154e70325c67e78d7d9231e7cff51fc01b2' - '431bd1f62600f985a4160fcdb2e44a6d8fec807eadb2f68738f941a649335150' - 'ba978e69e897e5ada1dce268517a5aeb356250052738c61730718f5014a39490' - 'f6c3027f58205167f6a18e51463ee0702c1f4a57106ff6a75dff6c3a9e654ebc' - '0f6796e6c7e0436b61bbc3947197f821732a07db900d440772054cf25a9ca9de') + 'afba71c5989978f286179a49607976a35237496d86ac89be8757c899a40d537e' + 'b030be6a881a7e1398676079581b7aa72d439989eb1f19092630c43ce0ea95d5' + '8f964778a3c1d88643e9264e883b8733a8c7b0f4b02cf939e90fdf68842caa98' + '2bed971bda26f4f0dfec4cce6e3ced11c47b310de50672f68a0dda287a588849' + 'dfb2dff89fd4e40622212f042165156fa3ed2d469b6531f942199de33caad14f' + 'a12a73536da03752abbdb30d4a9cc969ff428e9e3152980cd021640f905ce03b' + '254f0b967ba8084880542dcd27b7fb641d36969006d1f5f0da9d54e1969b30a1' + 'b8806f862bce296d55da97cb3273f6a7dcb92e7d1266b9610f88b994e1a3ad25' + '6eb966cfeb80b5170fbd36e51f968a86d89dff532d1bef9daccbcf720b0474f2' + '9da382aca0cf299d1f736c1adff9033706e4047be419264c6b9ae78370a04756' + '7c8a923aa2bf5600c0f2993e4e869dab663f3dd2ab27c15035310c06661e4aed' + 'ee873b1f6a6e543cb288b39f135b6450f861f5ebcc8b4a7d367ea1bdb197170a' + 'b4ca4c64daf48cd1a7ca9d55e91d53294b719c50dd392ba84e0bdc1a8acc597f' + '8f840fb187612cb28a94bd4a8083c83e29a42b2731e28f8686dcb37411cc69a9' + '867e7ad44c2aac86f858d973a7af6514385a4f50d200f4259b30d470a3551b35' + '13443e40d4a470219a2f6dc2dedcd988dd481ebe724f74fb5f1e7fa4fbe29e6e' + '47b0f93c86108c03641efbdd97b54809a4ac0b575b86f27b7c6217e87320cda3' + 'fcac1dd8349e98b20ac4041856fd1d22c56326697fae5ab53e1823caeba10b01' + 'd4a31f994dbc39c9267bd2378f10212a5606a78d60956218349a4dc0faa4f215' + '03dc0efe46cc96984c971e0e744bbf32cadc9fa65a58a9d6435f0ed59169409d' + 'd1432fe90e63616e898d7f0c541fe28588101230ca3fe2e20da39365967a64f4' + 'd9b68a39699e83674738d507bbe35290893085c8cee5f947ba74d3ef8eaa0a36' + '6711df068cc141a72ec9a9d1d8d7afa0f718c2fe9799523d03ce47d1574efad0' + 'ea2d56b4f2eebd9a83c13706f9e4e37dfe4ba92af76195b97a81230734cbb300' + 'b872519418f451d8196fe22182a26994fb9b81c49ad6ca151b895e23e274cc7c' + '4e7f7cfd9e0ab4f7251f32c5a6cf81b05e2435172f145b5caad64a5e12487116' + 'e69332fb658d70256ba232726db853d55372a4f45a5a5b9479a21a10fe807d67' + '19c5cc4283416942f1575284357a3c3a74bc625f95aecb80d2a8dcc7d2d8c08f' + 'b924d45463042e345630b9d54460a8547749f3fa3a3ffb7de3c4e514e92a9a9b' + '97657b673e434befb42ccb1c153d1094a6d1c23044eb7725aea3a64aaf2ec5b1' + '562da92bdb7bf27dd44c2ae4f45381668fc80f1e8a0241b8c039c7e2884cfbae' + '6cd22e4e73ecf402af473859aaedcb4ec62173605a2e4127d72ef73c6882b323') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump - # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do msg2 "Applying patch $patch" diff --git a/qt5-charts/mingw-w64-static/PKGBUILD b/qt5-charts/mingw-w64-static/PKGBUILD index 7b24f0f0..455d603b 100644 --- a/qt5-charts/mingw-w64-static/PKGBUILD +++ b/qt5-charts/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtcharts pkgname=mingw-w64-qt5-charts-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -17,18 +17,31 @@ depends=('mingw-w64-qt5-base-static' 'mingw-w64-pkg-config') optdepends=('mingw-w64-qt5-declarative-static: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative-static') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=f13988aa1ad9de5d92e7b0ba4d0d947dd019d759 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index ecd85000..9e2f9d23 100644 --- a/qt5-charts/mingw-w64/PKGBUILD +++ b/qt5-charts/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtcharts pkgname=mingw-w64-qt5-charts -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -17,17 +17,30 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-pkg-config') optdepends=('mingw-w64-qt5-declarative: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=f13988aa1ad9de5d92e7b0ba4d0d947dd019d759 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-charts/mingw-w64/PKGBUILD.sh.ep b/qt5-charts/mingw-w64/PKGBUILD.sh.ep index c9fbc5a2..130a6946 100644 --- a/qt5-charts/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-charts/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" diff --git a/qt5-connectivity/mingw-w64-static/PKGBUILD b/qt5-connectivity/mingw-w64-static/PKGBUILD index 765473cf..6186df0c 100644 --- a/qt5-connectivity/mingw-w64-static/PKGBUILD +++ b/qt5-connectivity/mingw-w64-static/PKGBUILD @@ -9,25 +9,38 @@ _qt_module=qtconnectivity pkgname=mingw-w64-qt5-connectivity-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=8a377440b37f5633156a8e40c9f0dce5f4d5a665 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index 199c3e7d..7ac6d3b6 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -9,24 +9,37 @@ _qt_module=qtconnectivity pkgname=mingw-w64-qt5-connectivity -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=8a377440b37f5633156a8e40c9f0dce5f4d5a665 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep index 4676d02f..fd0d1e9f 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" diff --git a/qt5-datavis3d/mingw-w64-static/PKGBUILD b/qt5-datavis3d/mingw-w64-static/PKGBUILD index d2f68012..0f097ad6 100644 --- a/qt5-datavis3d/mingw-w64-static/PKGBUILD +++ b/qt5-datavis3d/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtdatavis3d pkgname=mingw-w64-qt5-datavis3d-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -17,18 +17,31 @@ depends=('mingw-w64-qt5-base-static') optdepends=('mingw-w64-qt5-declarative-static: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=19af9584f7b80928ee49950c573c770af68c9519 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index e231dc7d..017285f8 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD +++ b/qt5-datavis3d/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtdatavis3d pkgname=mingw-w64-qt5-datavis3d -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -17,17 +17,30 @@ depends=('mingw-w64-qt5-base') optdepends=('mingw-w64-qt5-declarative: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=19af9584f7b80928ee49950c573c770af68c9519 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep b/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep index cbc54a39..41e3f21e 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" diff --git a/qt5-declarative/mingw-w64-static/PKGBUILD b/qt5-declarative/mingw-w64-static/PKGBUILD index 1e05d5b2..627895ab 100755 --- a/qt5-declarative/mingw-w64-static/PKGBUILD +++ b/qt5-declarative/mingw-w64-static/PKGBUILD @@ -14,15 +14,16 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 -pkgver+=+kde+r42 +_commit=02105099301450c890e1caba977ef44efdc43da7 +_basever=$pkgver +pkgver+=+kde+r20 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -33,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' '0003-Disable-d3d12-requiring-fxc.exe.patch') sha256sums=('SKIP' - '70473beee156c9c2a5b3a0f60f18dc3b5662d818b999aad9c9273a5284b3be90' - '15f121f1569d3fbb131d853ecf14d9e4f573ed94008131144f617ffaf81ae9a9' - 'ac1ce1293a54cbfb8a9ffee43272346b8d71676f4cf93f2a1a00878fff47fd7a') + 'e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926' + '75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef' + '7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -44,14 +45,12 @@ _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - git revert -n 568763928a78b52373932b01be17e040f7c3fa50 # Revert version bump - # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do patch -p1 -i "$patch" diff --git a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch index 0e096dbc..22214399 100644 --- a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch @@ -1,4 +1,4 @@ -From d84477262d512fad230ad098d8ca33306ad3d047 Mon Sep 17 00:00:00 2001 +From 0120487a66bef4b95249517d3d1d16d58e569f82 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 Subject: [PATCH 1/3] Ensure static plugins are exported @@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.34.1 +2.35.1 diff --git a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch index b47915fc..463e93b4 100644 --- a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,4 +1,4 @@ -From 8b9f3277047ae6a69ee89766414ed3e03f4d10b3 Mon Sep 17 00:00:00 2001 +From b47eb78bd39a2db8eaebe9c21359c114ea66bf17 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.34.1 +2.35.1 diff --git a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch index d68f68b0..9022d877 100644 --- a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch +++ b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch @@ -1,4 +1,4 @@ -From e2f490c9a1caa3618c983d111dae33a618ee04b8 Mon Sep 17 00:00:00 2001 +From dc60d4a4ece8c116e8d03bf876d27eee2d67cf51 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 20 Nov 2020 18:32:31 +0100 Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe @@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644 qtConfig(openvg): SUBDIRS += openvg -- -2.34.1 +2.35.1 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index 2558ebc6..fc164ee3 100644 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -14,15 +14,16 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 -pkgver+=+kde+r42 +_commit=02105099301450c890e1caba977ef44efdc43da7 +_basever=$pkgver +pkgver+=+kde+r20 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -33,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' '0003-Disable-d3d12-requiring-fxc.exe.patch') sha256sums=('SKIP' - '70473beee156c9c2a5b3a0f60f18dc3b5662d818b999aad9c9273a5284b3be90' - '15f121f1569d3fbb131d853ecf14d9e4f573ed94008131144f617ffaf81ae9a9' - 'ac1ce1293a54cbfb8a9ffee43272346b8d71676f4cf93f2a1a00878fff47fd7a') + 'e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926' + '75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef' + '7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -43,14 +44,12 @@ _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - git revert -n 568763928a78b52373932b01be17e040f7c3fa50 # Revert version bump - # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do patch -p1 -i "$patch" diff --git a/qt5-declarative/mingw-w64/PKGBUILD.sh.ep b/qt5-declarative/mingw-w64/PKGBUILD.sh.ep index 7ac9ee3f..1555219b 100644 --- a/qt5-declarative/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-declarative/mingw-w64/PKGBUILD.sh.ep @@ -6,7 +6,7 @@ # Contributor: ohmyarch % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' diff --git a/qt5-gamepad/mingw-w64-static/PKGBUILD b/qt5-gamepad/mingw-w64-static/PKGBUILD index 526ce095..a372ff0d 100644 --- a/qt5-gamepad/mingw-w64-static/PKGBUILD +++ b/qt5-gamepad/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtgamepad pkgname=mingw-w64-qt5-gamepad-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -17,18 +17,31 @@ depends=('mingw-w64-qt5-base-static' 'mingw-w64-sdl2') optdepends=('mingw-w64-qt5-declarative-static: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=6b7a6303439f83147680723f4d8142d676cdb928 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index 6d976320..e2de4ac4 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD +++ b/qt5-gamepad/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtgamepad pkgname=mingw-w64-qt5-gamepad -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -17,17 +17,30 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-sdl2') optdepends=('mingw-w64-qt5-declarative: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=6b7a6303439f83147680723f4d8142d676cdb928 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep b/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep index ec55dde4..7317ff04 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" diff --git a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD index ec451b7c..5ee65a9a 100644 --- a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD @@ -11,25 +11,38 @@ _qt_module=qtgraphicaleffects pkgname=mingw-w64-qt5-graphicaleffects-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" depends=('mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=379577925766385991f413a2b0d0d46831381ffa +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index d13ae5f5..2b7ff597 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -11,24 +11,37 @@ _qt_module=qtgraphicaleffects pkgname=mingw-w64-qt5-graphicaleffects -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=379577925766385991f413a2b0d0d46831381ffa +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep b/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep index 65f5d4a3..7ea97d3c 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" diff --git a/qt5-imageformats/mingw-w64-static/PKGBUILD b/qt5-imageformats/mingw-w64-static/PKGBUILD index 6e4c8852..8bef158d 100644 --- a/qt5-imageformats/mingw-w64-static/PKGBUILD +++ b/qt5-imageformats/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtimageformats pkgname=mingw-w64-qt5-imageformats-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -22,18 +22,31 @@ depends=('mingw-w64-qt5-base-static') #depends+=('mingw-w64-libwebp') # for WebP makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=90038c936763645610fe1e5f05cfc025e4d98631 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index 4c855069..239dd836 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtimageformats pkgname=mingw-w64-qt5-imageformats -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -22,17 +22,30 @@ depends=('mingw-w64-qt5-base') #depends+=('mingw-w64-libwebp') # for WebP makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=90038c936763645610fe1e5f05cfc025e4d98631 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep b/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep index acbc4157..6179c7c7 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" diff --git a/qt5-location/mingw-w64-static/PKGBUILD b/qt5-location/mingw-w64-static/PKGBUILD index e2241bb4..50ad7a23 100644 --- a/qt5-location/mingw-w64-static/PKGBUILD +++ b/qt5-location/mingw-w64-static/PKGBUILD @@ -15,25 +15,38 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic _qt_module=qtlocation pkgname=mingw-w64-qt5-location-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index a4f42686..d6c1426b 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -15,24 +15,37 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic _qt_module=qtlocation pkgname=mingw-w64-qt5-location -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-location/mingw-w64/PKGBUILD.sh.ep b/qt5-location/mingw-w64/PKGBUILD.sh.ep index 9115a31d..d1974965 100644 --- a/qt5-location/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-location/mingw-w64/PKGBUILD.sh.ep @@ -12,7 +12,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' diff --git a/qt5-multimedia/mingw-w64-static/PKGBUILD b/qt5-multimedia/mingw-w64-static/PKGBUILD index 0c9bafcd..533b1b20 100644 --- a/qt5-multimedia/mingw-w64-static/PKGBUILD +++ b/qt5-multimedia/mingw-w64-static/PKGBUILD @@ -12,22 +12,26 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch' '0003-Workaround-multiple-definition-errors-with-amstrmid-.patch') -sha256sums=('0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5' +sha256sums=('SKIP' '36bbaf9842fb930b4f17ae7ad2349b5dc9216492caeb7292f54d8fd7c0d66399' 'b733514a287d915d74ddbbb901b2fae1a0c169becbadaf9bb63738392e383064' '5ba3a72643af5e16b9f51ac9e5317d2f7e41dcb177f2201ac38ef0d0cd9a66e5') @@ -37,6 +41,11 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index f082e0db..96bcc2f3 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -12,22 +12,26 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch' '0003-Workaround-multiple-definition-errors-with-amstrmid-.patch') -sha256sums=('0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5' +sha256sums=('SKIP' '36bbaf9842fb930b4f17ae7ad2349b5dc9216492caeb7292f54d8fd7c0d66399' 'b733514a287d915d74ddbbb901b2fae1a0c169becbadaf9bb63738392e383064' '5ba3a72643af5e16b9f51ac9e5317d2f7e41dcb177f2201ac38ef0d0cd9a66e5') @@ -36,6 +40,11 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep b/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep index 01fa6fdd..7762ac24 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' diff --git a/qt5-networkauth/mingw-w64-static/PKGBUILD b/qt5-networkauth/mingw-w64-static/PKGBUILD index a5462ad8..1bb20414 100644 --- a/qt5-networkauth/mingw-w64-static/PKGBUILD +++ b/qt5-networkauth/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtnetworkauth pkgname=mingw-w64-qt5-networkauth-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" @@ -18,18 +18,31 @@ depends=('mingw-w64-qt5-base-static') optdepends=() makedepends=('mingw-w64-gcc') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=958db00a2064f77b354b573102ca2c2b2e07529c +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index 4aa28c48..b9d77ee7 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD +++ b/qt5-networkauth/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtnetworkauth pkgname=mingw-w64-qt5-networkauth -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" @@ -18,17 +18,30 @@ depends=('mingw-w64-qt5-base') optdepends=() makedepends=('mingw-w64-gcc') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=958db00a2064f77b354b573102ca2c2b2e07529c +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep b/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep index 8024842a..31ef962c 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" diff --git a/qt5-quickcontrols/mingw-w64-static/PKGBUILD b/qt5-quickcontrols/mingw-w64-static/PKGBUILD index 0886c932..6339c5e4 100644 --- a/qt5-quickcontrols/mingw-w64-static/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64-static/PKGBUILD @@ -11,25 +11,38 @@ _qt_module=qtquickcontrols pkgname=mingw-w64-qt5-quickcontrols-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" depends=('mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index da51f66a..19e87ac0 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -11,24 +11,37 @@ _qt_module=qtquickcontrols pkgname=mingw-w64-qt5-quickcontrols -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep b/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep index c82e831d..d6432409 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" diff --git a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD index 775532db..047863ad 100644 --- a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD @@ -11,25 +11,38 @@ _qt_module=qtquickcontrols2 pkgname=mingw-w64-qt5-quickcontrols2-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" depends=('mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=26bd7f5414dc592ab5277e2bb4ad0199faa889de +_basever=$pkgver +pkgver+=+kde+r4 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index 1c3f79c9..2cfc45ea 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -11,24 +11,37 @@ _qt_module=qtquickcontrols2 pkgname=mingw-w64-qt5-quickcontrols2 -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=26bd7f5414dc592ab5277e2bb4ad0199faa889de +_basever=$pkgver +pkgver+=+kde+r4 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep b/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep index c82e831d..d6432409 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" diff --git a/qt5-remoteobjects/mingw-w64-static/PKGBUILD b/qt5-remoteobjects/mingw-w64-static/PKGBUILD index 6188a7ec..9ca5a55e 100644 --- a/qt5-remoteobjects/mingw-w64-static/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtremoteobjects pkgname=mingw-w64-qt5-remoteobjects-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -17,18 +17,31 @@ depends=('mingw-w64-qt5-base-static') optdepends=('mingw-w64-qt5-declarative-static: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative-static') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=581475dfeb44c8b51c0be86e0f2f57df7d117a80 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" @@ -46,6 +59,9 @@ build() { find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \; find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap ||g" {} \; + # avoid `.obj/release/qconnectionfactories.o:qconnectionfactories.cpp:(.text.unlikely+0xf): relocation truncated to fit: IMAGE_REL_AMD64_REL32 against undefined symbol `__cxa_pure_virtual'` + [[ $_arch == x86_64-w64-mingw32 ]] && find . -type f -iname 'Makefile*' -exec sed -i 's|\(CXX.*\)\( -o .obj/release/qconnectionfactories.o\)|\1 -mcmodel=large \2|g' {} \; + make popd done diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index 14f52a5b..167daacd 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtremoteobjects pkgname=mingw-w64-qt5-remoteobjects -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -17,17 +17,30 @@ depends=('mingw-w64-qt5-base') optdepends=('mingw-w64-qt5-declarative: QML bindings') makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=581475dfeb44c8b51c0be86e0f2f57df7d117a80 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" @@ -45,6 +58,9 @@ build() { find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \; find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap ||g" {} \; + # avoid `.obj/release/qconnectionfactories.o:qconnectionfactories.cpp:(.text.unlikely+0xf): relocation truncated to fit: IMAGE_REL_AMD64_REL32 against undefined symbol `__cxa_pure_virtual'` + [[ $_arch == x86_64-w64-mingw32 ]] && find . -type f -iname 'Makefile*' -exec sed -i 's|\(CXX.*\)\( -o .obj/release/qconnectionfactories.o\)|\1 -mcmodel=large \2|g' {} \; + make popd done diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep b/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep index c3c087ac..881c0857 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -19,4 +19,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \; find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap ||g" {} \; + # avoid `.obj/release/qconnectionfactories.o:qconnectionfactories.cpp:(.text.unlikely+0xf): relocation truncated to fit: IMAGE_REL_AMD64_REL32 against undefined symbol `__cxa_pure_virtual'` + [[ $_arch == x86_64-w64-mingw32 ]] && find . -type f -iname 'Makefile*' -exec sed -i 's|\(CXX.*\)\( -o .obj/release/qconnectionfactories.o\)|\1 -mcmodel=large \2|g' {} \; + % end diff --git a/qt5-script/mingw-w64-static/PKGBUILD b/qt5-script/mingw-w64-static/PKGBUILD index 317b6b92..b488da0b 100644 --- a/qt5-script/mingw-w64-static/PKGBUILD +++ b/qt5-script/mingw-w64-static/PKGBUILD @@ -11,7 +11,8 @@ _qt_module=qtscript pkgname=mingw-w64-qt5-script-static -pkgver=5.15.2 +_basever=5.15.3 +pkgver=5.15.8 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" @@ -20,12 +21,13 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') license=('GPL3' 'LGPL' 'FDL' 'custom') +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e') +_pkgfqn=${_qt_module} +source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -95,6 +97,8 @@ package() { [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \ find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \; find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \; + + sed -e "s|$pkgver\ |$_basever |" -i "$pkgdir"/usr/$_arch/lib/cmake/*/*Config.cmake popd done diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index 7cc80e21..2bdd7222 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -11,7 +11,8 @@ _qt_module=qtscript pkgname=mingw-w64-qt5-script -pkgver=5.15.2 +_basever=5.15.3 +pkgver=5.15.8 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" @@ -20,12 +21,13 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') license=('GPL3' 'LGPL' 'FDL' 'custom') +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e') +_pkgfqn=${_qt_module} +source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -88,6 +90,8 @@ package() { [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \ find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \; find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \; + + sed -e "s|$pkgver\ |$_basever |" -i "$pkgdir"/usr/$_arch/lib/cmake/*/*Config.cmake popd done diff --git a/qt5-script/mingw-w64/PKGBUILD.sh.ep b/qt5-script/mingw-w64/PKGBUILD.sh.ep index 4c505655..83246b9b 100644 --- a/qt5-script/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-script/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,14 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +% content_for package_config => begin + + sed -e "s|$pkgver\ |$_basever |" -i "$pkgdir"/usr/$_arch/lib/cmake/*/*Config.cmake +% end +% stash(is_lts => 1); +\ +_basever=5.15.3 +pkgver=5.15.8 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" diff --git a/qt5-scxml/mingw-w64-static/PKGBUILD b/qt5-scxml/mingw-w64-static/PKGBUILD index a9f4a562..c8f7957a 100644 --- a/qt5-scxml/mingw-w64-static/PKGBUILD +++ b/qt5-scxml/mingw-w64-static/PKGBUILD @@ -9,25 +9,38 @@ _qt_module=qtscxml pkgname=mingw-w64-qt5-scxml-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" depends=('mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=50d2da3965ed8e85f3f5f5760393c42b12d34a9f +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index 378a2306..4fbe95e2 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD +++ b/qt5-scxml/mingw-w64/PKGBUILD @@ -9,24 +9,37 @@ _qt_module=qtscxml pkgname=mingw-w64-qt5-scxml -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=50d2da3965ed8e85f3f5f5760393c42b12d34a9f +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-scxml/mingw-w64/PKGBUILD.sh.ep b/qt5-scxml/mingw-w64/PKGBUILD.sh.ep index 99ec356d..7fd6c9fc 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-scxml/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" diff --git a/qt5-sensors/mingw-w64-static/PKGBUILD b/qt5-sensors/mingw-w64-static/PKGBUILD index 6c7b68ef..48981037 100644 --- a/qt5-sensors/mingw-w64-static/PKGBUILD +++ b/qt5-sensors/mingw-w64-static/PKGBUILD @@ -11,25 +11,38 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=975ba788d3d0ee87aa08bb5301cd33dcbf00521b +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index c9a238fc..f7089d3d 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -11,24 +11,37 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=975ba788d3d0ee87aa08bb5301cd33dcbf00521b +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-sensors/mingw-w64/PKGBUILD.sh.ep b/qt5-sensors/mingw-w64/PKGBUILD.sh.ep index c87def16..fd1b571e 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-sensors/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" diff --git a/qt5-serialport/mingw-w64-static/PKGBUILD b/qt5-serialport/mingw-w64-static/PKGBUILD index 96531bb9..e00f9446 100644 --- a/qt5-serialport/mingw-w64-static/PKGBUILD +++ b/qt5-serialport/mingw-w64-static/PKGBUILD @@ -10,25 +10,34 @@ _qt_module=qtserialport pkgname=mingw-w64-qt5-serialport-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=f95e2411d7c978def87846ea7cedf3dc5fd7c8b8 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index 006dc8a0..e9fd537d 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -10,24 +10,33 @@ _qt_module=qtserialport pkgname=mingw-w64-qt5-serialport -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=f95e2411d7c978def87846ea7cedf3dc5fd7c8b8 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-serialport/mingw-w64/PKGBUILD.sh.ep b/qt5-serialport/mingw-w64/PKGBUILD.sh.ep index c96bfd6b..c425536b 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-serialport/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" diff --git a/qt5-speech/mingw-w64-static/PKGBUILD b/qt5-speech/mingw-w64-static/PKGBUILD index 15d23fdc..2f1f9592 100644 --- a/qt5-speech/mingw-w64-static/PKGBUILD +++ b/qt5-speech/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtspeech pkgname=mingw-w64-qt5-speech-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" @@ -20,18 +20,31 @@ makedepends=('mingw-w64-gcc') #optdepends=('mingw-w64-flite: flite TTS backend' 'mingw-w64-speech-dispatcher: speech-dispatcher TTS backend') #makedepends=('mingw-w64-gcc' 'mingw-w64-flite' 'mingw-w64-speech-dispatcher') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=08b27c29aadc0cc0303cca97c9a3baa2a690dfe4 +_basever=$pkgver +pkgver+=+kde+r1 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index 69875345..f687768e 100644 --- a/qt5-speech/mingw-w64/PKGBUILD +++ b/qt5-speech/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtspeech pkgname=mingw-w64-qt5-speech -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" @@ -20,17 +20,30 @@ makedepends=('mingw-w64-gcc') #optdepends=('mingw-w64-flite: flite TTS backend' 'mingw-w64-speech-dispatcher: speech-dispatcher TTS backend') #makedepends=('mingw-w64-gcc' 'mingw-w64-flite' 'mingw-w64-speech-dispatcher') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=08b27c29aadc0cc0303cca97c9a3baa2a690dfe4 +_basever=$pkgver +pkgver+=+kde+r1 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-speech/mingw-w64/PKGBUILD.sh.ep b/qt5-speech/mingw-w64/PKGBUILD.sh.ep index bdbc72a1..9c4780de 100644 --- a/qt5-speech/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-speech/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" diff --git a/qt5-svg/mingw-w64-static/PKGBUILD b/qt5-svg/mingw-w64-static/PKGBUILD index 55409498..91e63bdd 100644 --- a/qt5-svg/mingw-w64-static/PKGBUILD +++ b/qt5-svg/mingw-w64-static/PKGBUILD @@ -10,15 +10,16 @@ _qt_module=qtsvg pkgname=mingw-w64-qt5-svg-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') -_commit=5b9285c34731e67f9f1d61ec804740991f2a0380 -pkgver+=+kde+r14 +_commit=2f42157cabbd1db6249ccb1d14e6eede80451e0c +_basever=$pkgver +pkgver+=+kde+r12 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -34,13 +35,11 @@ _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - - git revert -n 9aac88424a1b76e0198b52437af58a6d94aff8e9 # Revert version bump } build() { diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index 9b1d4dd8..9dac83cc 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -10,15 +10,16 @@ _qt_module=qtsvg pkgname=mingw-w64-qt5-svg -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') -_commit=5b9285c34731e67f9f1d61ec804740991f2a0380 -pkgver+=+kde+r14 +_commit=2f42157cabbd1db6249ccb1d14e6eede80451e0c +_basever=$pkgver +pkgver+=+kde+r12 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -33,13 +34,11 @@ _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - - git revert -n 9aac88424a1b76e0198b52437af58a6d94aff8e9 # Revert version bump } build() { diff --git a/qt5-svg/mingw-w64/PKGBUILD.sh.ep b/qt5-svg/mingw-w64/PKGBUILD.sh.ep index 09406c99..fa9a126d 100644 --- a/qt5-svg/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-svg/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" diff --git a/qt5-tools/mingw-w64-static/PKGBUILD b/qt5-tools/mingw-w64-static/PKGBUILD index b2520958..43494780 100755 --- a/qt5-tools/mingw-w64-static/PKGBUILD +++ b/qt5-tools/mingw-w64-static/PKGBUILD @@ -23,15 +23,16 @@ _qt_module=qttools pkgname=mingw-w64-qt5-tools-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=('mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=33693a928986006d79c1ee743733cde5966ac402 -pkgver+=+kde+r17 +_commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4 +_basever=$pkgver +pkgver+=+kde+r1 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -40,7 +41,7 @@ _pkgfqn=${_qt_module} source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Fix-linguist-macro.patch') sha256sums=('SKIP' - 'cf7fcd9b2cfa110e95bde957a00c600da17bc75fdf7be1f72204eb5364cbf397') + '4808f9bc8db99b2d719a0aecc4a296580f9a92b95c03ddbbd78470c1a903d082') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -49,14 +50,12 @@ _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=no_smart_library_merge pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - git revert -n dbe0567470db2b369a9fdb28d9fbac38be3e2d60 # Revert version bump - # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do patch -p1 -i "$patch" diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch index 8927b419..7f5504f1 100644 --- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch +++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch @@ -1,4 +1,4 @@ -From 4818c98b4cc9441fecea9c63479ca7d5c05ed967 Mon Sep 17 00:00:00 2001 +From 91a31449aefc95da17c08fb11cd3d77939ff942e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH] Fix linguist macro @@ -11,7 +11,7 @@ Subject: [PATCH] Fix linguist macro 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake -index 20fb1493..406d3d3a 100644 +index 20fb14935..406d3d3a3 100644 --- a/src/linguist/Qt5LinguistToolsMacros.cmake +++ b/src/linguist/Qt5LinguistToolsMacros.cmake @@ -90,8 +90,10 @@ function(QT5_CREATE_TRANSLATION _qm_files) @@ -38,5 +38,5 @@ index 20fb1493..406d3d3a 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.31.1 +2.35.1 diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD index 29c9af2a..0066ede7 100644 --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -23,15 +23,16 @@ _qt_module=qttools pkgname=mingw-w64-qt5-tools -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=33693a928986006d79c1ee743733cde5966ac402 -pkgver+=+kde+r17 +_commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4 +_basever=$pkgver +pkgver+=+kde+r1 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -40,7 +41,7 @@ _pkgfqn=${_qt_module} source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Fix-linguist-macro.patch') sha256sums=('SKIP' - 'cf7fcd9b2cfa110e95bde957a00c600da17bc75fdf7be1f72204eb5364cbf397') + '4808f9bc8db99b2d719a0aecc4a296580f9a92b95c03ddbbd78470c1a903d082') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -48,14 +49,12 @@ _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') pkgver() { cd $_pkgfqn - echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit` + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` } prepare() { cd "${srcdir}/${_pkgfqn}" - git revert -n dbe0567470db2b369a9fdb28d9fbac38be3e2d60 # Revert version bump - # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do patch -p1 -i "$patch" diff --git a/qt5-tools/mingw-w64/PKGBUILD.sh.ep b/qt5-tools/mingw-w64/PKGBUILD.sh.ep index ce10c783..9069aa85 100644 --- a/qt5-tools/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-tools/mingw-w64/PKGBUILD.sh.ep @@ -18,7 +18,7 @@ % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index 0d5aab50..8b43872f 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -11,24 +11,37 @@ _qt_module=qttranslations pkgname=mingw-w64-qt5-translations -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-tools') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=a6d5e7f84a57394db4c8b069f81c56cfeb802e19 +_basever=$pkgver +pkgver+=+kde+r2 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-translations/mingw-w64/PKGBUILD.sh.ep b/qt5-translations/mingw-w64/PKGBUILD.sh.ep index e64f1a66..613a4a1c 100644 --- a/qt5-translations/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-translations/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" diff --git a/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD b/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD index d8891e99..14d8cafd 100644 --- a/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD @@ -11,25 +11,38 @@ _qt_module=qtvirtualkeyboard pkgname=mingw-w64-qt5-virtualkeyboard-static #_fix_deps_of_static_3rdparty_libs='s:\(-L\/.*\/lib.*\.a\) \(\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\2\3\4 \1 \5:g' # -L is used (pre Qt 5.13) _fix_deps_of_static_3rdparty_libs='s:\(LIBS *= *\)\(.*\)\(\/build\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\1 \3\4\5 \2 \6:g' # absolute paths are used (Qt 5.13 and above) -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" depends=('mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static' 'mingw-w64-qt5-svg-static') makedepends=('mingw-w64-gcc') license=('GPL3') +_commit=bb40dee811333929dd467a480dce24ab7af84ef9 +_basever=$pkgver +pkgver+=+kde+r3 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index 00e861ca..cbcb0a20 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD @@ -11,24 +11,37 @@ _qt_module=qtvirtualkeyboard pkgname=mingw-w64-qt5-virtualkeyboard #_fix_deps_of_static_3rdparty_libs='s:\(-L\/.*\/lib.*\.a\) \(\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\2\3\4 \1 \5:g' # -L is used (pre Qt 5.13) _fix_deps_of_static_3rdparty_libs='s:\(LIBS *= *\)\(.*\)\(\/build\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\1 \3\4\5 \2 \6:g' # absolute paths are used (Qt 5.13 and above) -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" depends=('mingw-w64-pkg-config' 'mingw-w64-qt5-declarative' 'mingw-w64-qt5-svg') makedepends=('mingw-w64-gcc') license=('GPL3') +_commit=bb40dee811333929dd467a480dce24ab7af84ef9 +_basever=$pkgver +pkgver+=+kde+r3 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep b/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep index 3a9313c3..721068fd 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep @@ -2,7 +2,7 @@ \ #_fix_deps_of_static_3rdparty_libs='s:\(-L\/.*\/lib.*\.a\) \(\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\2\3\4 \1 \5:g' # -L is used (pre Qt 5.13) _fix_deps_of_static_3rdparty_libs='s:\(LIBS *= *\)\(.*\)\(\/build\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\1 \3\4\5 \2 \6:g' # absolute paths are used (Qt 5.13 and above) -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" diff --git a/qt5-webchannel/mingw-w64-static/PKGBUILD b/qt5-webchannel/mingw-w64-static/PKGBUILD index ccae5e9d..667aa124 100644 --- a/qt5-webchannel/mingw-w64-static/PKGBUILD +++ b/qt5-webchannel/mingw-w64-static/PKGBUILD @@ -9,25 +9,38 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' depends=('mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=611016a49f3a9ba7b58bef29bc295323e06373ae +_basever=$pkgver +pkgver+=+kde+r3 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index c4fa30a6..135a41ff 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -9,24 +9,37 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' depends=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=611016a49f3a9ba7b58bef29bc295323e06373ae +_basever=$pkgver +pkgver+=+kde+r3 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep b/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep index 2b4f5a33..0085a229 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' diff --git a/qt5-webengine/mingw-w64-static/PKGBUILD b/qt5-webengine/mingw-w64-static/PKGBUILD index ad8084bb..3e3ac015 100644 --- a/qt5-webengine/mingw-w64-static/PKGBUILD +++ b/qt5-webengine/mingw-w64-static/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index 56ac85aa..932daf91 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webengine/mingw-w64/PKGBUILD.sh.ep b/qt5-webengine/mingw-w64/PKGBUILD.sh.ep index ef192a9b..6c07176b 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webengine/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webglplugin/mingw-w64-static/PKGBUILD b/qt5-webglplugin/mingw-w64-static/PKGBUILD index bf4be3a1..cbdc094e 100644 --- a/qt5-webglplugin/mingw-w64-static/PKGBUILD +++ b/qt5-webglplugin/mingw-w64-static/PKGBUILD @@ -11,20 +11,24 @@ _qt_module=qtwebglplugin pkgname=mingw-w64-qt5-webglplugin-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" depends=('mingw-w64-qt5-declarative-static' 'mingw-w64-qt5-websockets-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Hardcode-linker-flags-for-platform-plugin.patch') -sha256sums=('81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446' +sha256sums=('SKIP' 'c855d5b15171ed0f8d730898a62621462a71dbdb0b296d1e0ba2d3cfa87a8bcb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -32,6 +36,11 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index 1cfce71b..6b38f599 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD +++ b/qt5-webglplugin/mingw-w64/PKGBUILD @@ -11,26 +11,35 @@ _qt_module=qtwebglplugin pkgname=mingw-w64-qt5-webglplugin -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" depends=('mingw-w64-qt5-declarative' 'mingw-w64-qt5-websockets') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0001-Hardcode-linker-flags-for-platform-plugin.patch') -sha256sums=('81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446' +sha256sums=('SKIP' 'c855d5b15171ed0f8d730898a62621462a71dbdb0b296d1e0ba2d3cfa87a8bcb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + prepare() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep b/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep index b81ebccb..7dad5dff 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" diff --git a/qt5-websockets/mingw-w64-static/PKGBUILD b/qt5-websockets/mingw-w64-static/PKGBUILD index 8e6c4c6d..f1ff16c6 100644 --- a/qt5-websockets/mingw-w64-static/PKGBUILD +++ b/qt5-websockets/mingw-w64-static/PKGBUILD @@ -10,25 +10,38 @@ _qt_module=qtwebsockets pkgname=mingw-w64-qt5-websockets-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=7196d2cc34adf9f45b50a9488f4ff95b36092993 +_basever=$pkgver +pkgver+=+kde+r3 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 3b3e407a..6600d005 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -10,24 +10,37 @@ _qt_module=qtwebsockets pkgname=mingw-w64-qt5-websockets -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') +_commit=7196d2cc34adf9f45b50a9488f4ff95b36092993 +_basever=$pkgver +pkgver+=+kde+r3 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-websockets/mingw-w64/PKGBUILD.sh.ep b/qt5-websockets/mingw-w64/PKGBUILD.sh.ep index 3a07e606..8c4b9766 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-websockets/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" diff --git a/qt5-winextras/mingw-w64-static/PKGBUILD b/qt5-winextras/mingw-w64-static/PKGBUILD index d165da44..448fda8a 100644 --- a/qt5-winextras/mingw-w64-static/PKGBUILD +++ b/qt5-winextras/mingw-w64-static/PKGBUILD @@ -10,25 +10,38 @@ _qt_module=qtwinextras pkgname=mingw-w64-qt5-winextras-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom') +_commit=051202df9c553d7c0a384f07bd67fde98f3b02c4 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 2267bda9..ae8dad63 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -10,24 +10,37 @@ _qt_module=qtwinextras pkgname=mingw-w64-qt5-winextras -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom') +_commit=051202df9c553d7c0a384f07bd67fde98f3b02c4 +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-winextras/mingw-w64/PKGBUILD.sh.ep b/qt5-winextras/mingw-w64/PKGBUILD.sh.ep index d5834510..cc06a6e1 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-winextras/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" diff --git a/qt5-xmlpatterns/mingw-w64-static/PKGBUILD b/qt5-xmlpatterns/mingw-w64-static/PKGBUILD index 8f12ff12..8dc22670 100644 --- a/qt5-xmlpatterns/mingw-w64-static/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64-static/PKGBUILD @@ -10,25 +10,38 @@ _qt_module=qtxmlpatterns pkgname=mingw-w64-qt5-xmlpatterns-static -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=af4958af9d628d6124e64abd9743abce42f15a6f +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index b7db1a4d..63b3f0c3 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -10,24 +10,37 @@ _qt_module=qtxmlpatterns pkgname=mingw-w64-qt5-xmlpatterns -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL3' 'FDL' 'custom') +_commit=af4958af9d628d6124e64abd9743abce42f15a6f +_basever=$pkgver +pkgver+=+kde+r0 +makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') url='https://www.qt.io/' -_pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa') +_pkgfqn=${_qt_module} +source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit) +sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') +pkgver() { + cd $_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` +} + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep b/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep index 3aca17f6..72d3ffd6 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.15.2 +pkgver=5.15.3 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)"