Update Qt 6 packages to beta2

This commit is contained in:
Martchus 2020-10-27 12:33:18 +01:00
parent 5187501c8f
commit c5f437f5a7
73 changed files with 121 additions and 223 deletions

View File

@ -35,7 +35,8 @@ $mojolicious->log($log);
$renderer->paths(\@template_paths); $renderer->paths(\@template_paths);
$log->debug("Template paths:\n" . join("\n", @template_paths)); $log->debug("Template paths:\n" . join("\n", @template_paths));
my $install_directory = $ARGV[0] // $pkgbuilds_dir; my $filter_regex = $ARGV[0];
my $install_directory = $ARGV[1] // $pkgbuilds_dir;
unless (-d $install_directory) { unless (-d $install_directory) {
$log->error("Output directory '$install_directory' does not exist."); $log->error("Output directory '$install_directory' does not exist.");
exit(-1); exit(-1);
@ -115,6 +116,8 @@ for my $top_level_dir (@$top_level_dirs) {
my $package_name_suffix = $variant_suffix_part ? "-$variant_suffix_part" : ""; my $package_name_suffix = $variant_suffix_part ? "-$variant_suffix_part" : "";
my $is_static_variant = $variant_suffix_part =~ qr/static/; my $is_static_variant = $variant_suffix_part =~ qr/static/;
my $has_static_variant = $is_static_variant || -d "$default_package_name/$variant-static"; my $has_static_variant = $is_static_variant || -d "$default_package_name/$variant-static";
my $package_name = "$package_name_prefix$default_package_name$package_name_suffix";
next if defined $filter_regex && $package_name !~ $filter_regex;
push(@pages, { push(@pages, {
install_path => "$default_package_name/$variant/PKGBUILD", install_path => "$default_package_name/$variant/PKGBUILD",
@ -127,7 +130,7 @@ for my $top_level_dir (@$top_level_dirs) {
default_package_name => $default_package_name, default_package_name => $default_package_name,
package_name_prefix => $package_name_prefix, package_name_prefix => $package_name_prefix,
package_name_suffix => $package_name_suffix, package_name_suffix => $package_name_suffix,
package_name => "$package_name_prefix$default_package_name$package_name_suffix", package_name => $package_name,
files => $files, files => $files,
patch_files => $patch_files, patch_files => $patch_files,
qt_major_version => $qt_major_version, qt_major_version => $qt_major_version,

View File

@ -14,7 +14,7 @@
% } % }
pkgname=<%= $package_name %> pkgname=<%= $package_name %>
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -6,7 +6,7 @@ colorize
if ! [[ $1 ]] || ! [[ $2 ]]; then if ! [[ $1 ]] || ! [[ $2 ]]; then
echo 'No version specified, must specify the new and old version, eg. 5.9.2 5.9.1' echo 'No version specified, must specify the new and old version, eg. 5.9.2 5.9.1'
echo "Usage: $0 newversion oldversion [old-branch-suffix=mingw-w64] [new-branch-suffix=mingw-w64]" echo "Usage: $0 newversion oldversion [old-branch-suffix=mingw-w64] [new-branch-suffix=mingw-w64] [new-version-tag]"
echo "Note: supposed to be run within the Qt Git checkout" echo "Note: supposed to be run within the Qt Git checkout"
exit -1 exit -1
fi fi
@ -14,6 +14,7 @@ newversion="$1"
oldversion="$2" oldversion="$2"
oldbranchsuffix="${3:-mingw-w64}" oldbranchsuffix="${3:-mingw-w64}"
newbranchsuffix="${4:-mingw-w64}" newbranchsuffix="${4:-mingw-w64}"
newversiontag="$5"
# check whether branch for new version already exists # check whether branch for new version already exists
newversionbranch=$newversion-$newbranchsuffix newversionbranch=$newversion-$newbranchsuffix
@ -57,6 +58,10 @@ fi
# update Git checkout, create new branch with rebased commits, push to remote # update Git checkout, create new branch with rebased commits, push to remote
git remote update git remote update
git checkout -b "$newversionbranch" "origin/$newversion" if [[ $newversiontag ]]; then
git checkout -b "$newversionbranch" "$newversiontag"
else
git checkout -b "$newversionbranch" "origin/$newversion" || git checkout -b "$newversionbranch" "v$newversion"
fi
git cherry-pick "v$oldversion..$oldversionbranch" git cherry-pick "v$oldversion..$oldversionbranch"
git push -u $maybe_remote "$newversionbranch" git push -u $maybe_remote "$newversionbranch"

View File

@ -11,7 +11,7 @@ colorize
if ! [[ $1 ]]; then if ! [[ $1 ]]; then
echo 'No Qt repo specified - must be specified like eg. base or multimedia.' echo 'No Qt repo specified - must be specified like eg. base or multimedia.'
echo "Usage: $0 repo [branch=\$pkgver-\$variant] [variant=mingw-w64]" echo "Usage: $0 repo [branch=\$pkgver-\$variant] [variant=mingw-w64] [qtver=qt5]"
echo "Note: DEFAULT_PKGBUILDS_DIR and QT_GIT_REPOS_DIR must point to directories containing PKGBUILDs and the Qt repos." echo "Note: DEFAULT_PKGBUILDS_DIR and QT_GIT_REPOS_DIR must point to directories containing PKGBUILDs and the Qt repos."
exit -1 exit -1
fi fi
@ -29,7 +29,8 @@ else
pkgbuildsdirs+=("$PWD/pkgbuilds") pkgbuildsdirs+=("$PWD/pkgbuilds")
fi fi
pkg="qt5-$1" qtver="${4:-qt5}"
pkg="$qtver-$1"
repo="qt$1" repo="qt$1"
branch="${2}" branch="${2}"
variant="${3:-mingw-w64}" variant="${3:-mingw-w64}"
@ -60,6 +61,7 @@ template=$pkgbuild_path.sh.ep has_template=
[[ -f $template ]] && has_template=1 [[ -f $template ]] && has_template=1
source "$pkgbuild_path" source "$pkgbuild_path"
tag=${tag:-origin/$pkgver}
new_sources=() new_sources=()
new_md5sums=() new_md5sums=()
@ -87,7 +89,7 @@ if ! git checkout "${branch}"; then
msg2 "No patches required for $1, skipping." msg2 "No patches required for $1, skipping."
exit 0 exit 0
fi fi
git format-patch "origin/${pkgver}" --output-directory "$dest" git format-patch "$tag" --output-directory "$dest"
for other_variant_dir in "$dest/../$variant"?*; do for other_variant_dir in "$dest/../$variant"?*; do
[[ -d $other_variant_dir ]] || continue [[ -d $other_variant_dir ]] || continue
cp --target-directory="$other_variant_dir" "$dest/"*.patch cp --target-directory="$other_variant_dir" "$dest/"*.patch

View File

@ -13,7 +13,7 @@ declare -A versions=(
[dbus-soundrecorder]=1.2.3 [dbus-soundrecorder]=1.2.3
[geocoordinatecalculator]=1.1.3 [geocoordinatecalculator]=1.1.3
[qt5]=5.15.1 [qt5]=5.15.1
[qt6]=6.0.0-beta1 [qt6]=6.0.0-beta2
) )
declare -A github_names=( declare -A github_names=(
[c++utilities]=cpp-utilities [c++utilities]=cpp-utilities

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-5compat pkgname=qt6-5compat
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(cmake ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('c9c8266ba512c9819a080edfc7a17374c249c92d14734ee3581923b8c6c3a13a') sha256sums=('9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
c9c8266ba512c9819a080edfc7a17374c249c92d14734ee3581923b8c6c3a13a 9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat pkgname=mingw-w64-qt6-5compat
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}" _pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('c9c8266ba512c9819a080edfc7a17374c249c92d14734ee3581923b8c6c3a13a') sha256sums=('9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module'; % layout 'mingw-w64-qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
c9c8266ba512c9819a080edfc7a17374c249c92d14734ee3581923b8c6c3a13a 9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc

View File

@ -5,7 +5,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-base pkgname=qt6-base
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -27,7 +27,7 @@ optdepends=('postgresql-libs: PostgreSQL driver'
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0') sha256sums=('1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn \ cmake -G Ninja -B build -S $_pkgfqn \

View File

@ -1 +1 @@
d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0 1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e

View File

@ -1,7 +1,7 @@
From b9fa200e7404db3edae936f7975526b78bad556a Mon Sep 17 00:00:00 2001 From b067b34ebd6238a6b4c3c0f9d56e88ef169ef53e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Mon, 14 Sep 2020 20:39:52 +0200 Date: Mon, 14 Sep 2020 20:39:52 +0200
Subject: [PATCH 1/3] Use CMake's default import library suffix Subject: [PATCH 1/2] Use CMake's default import library suffix
Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd
--- ---
@ -13,10 +13,10 @@ Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd
5 files changed, 18 insertions(+), 6 deletions(-) 5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
index 007acc95dd..8dd7ca63d2 100644 index b79f17243e..a689b2b775 100644
--- a/cmake/QtPriHelpers.cmake --- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake
@@ -293,11 +293,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features @@ -292,11 +292,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
list(APPEND pri_files "${private_pri_file_path}") list(APPEND pri_files "${private_pri_file_path}")
@ -36,10 +36,10 @@ index 007acc95dd..8dd7ca63d2 100644
OUTPUT "${private_pri_file_path}" OUTPUT "${private_pri_file_path}"
DEPENDS ${inputs} DEPENDS ${inputs}
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
index 7977afd030..7488d5f959 100644 index 932565f318..9729c150a4 100644
--- a/cmake/QtPrlHelpers.cmake --- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake
@@ -248,11 +248,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} @@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION}
CONTENT CONTENT
"FINAL_PRL_FILE_PATH = ${final_prl_file_path}") "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
@ -59,10 +59,10 @@ index 7977afd030..7488d5f959 100644
if(QT_GENERATOR_IS_MULTI_CONFIG) if(QT_GENERATOR_IS_MULTI_CONFIG)
set(configs ${CMAKE_CONFIGURATION_TYPES}) set(configs ${CMAKE_CONFIGURATION_TYPES})
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
index dd23e8c95b..2213b04cd7 100644 index fcbb3ab1f2..332ef6ee4c 100644
--- a/cmake/QtTargetHelpers.cmake --- a/cmake/QtTargetHelpers.cmake
+++ b/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake
@@ -274,8 +274,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) @@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
# This should cover both MINGW with GCC and CLANG. # This should cover both MINGW with GCC and CLANG.
if(NOT MSVC) if(NOT MSVC)
@ -72,7 +72,7 @@ index dd23e8c95b..2213b04cd7 100644
if(target_type STREQUAL "STATIC_LIBRARY") if(target_type STREQUAL "STATIC_LIBRARY")
set_property(TARGET "${target}" PROPERTY PREFIX "lib") set_property(TARGET "${target}" PROPERTY PREFIX "lib")
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index a1e08ed63b..9f3ae47108 100644 index 67ad1e3b8c..b98c7121f6 100644
--- a/mkspecs/common/g++-win32.conf --- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf
@@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB = @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB =
@ -100,5 +100,5 @@ index 24ed125f12..73ebe453d3 100644
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-- --
2.28.0 2.29.1

View File

@ -1,7 +1,7 @@
From 2e121479348d9c6151e191d58f631faa4fc0cad6 Mon Sep 17 00:00:00 2001 From 3568ffe90378ce9507ad9403f66adac8cbc31df4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Wed, 7 Oct 2020 12:13:37 +0200 Date: Wed, 7 Oct 2020 12:13:37 +0200
Subject: [PATCH 3/3] Fix finding D-Bus Subject: [PATCH 2/2] Fix finding D-Bus
Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
--- ---
@ -19,5 +19,5 @@ index e227d224e0..4982e7c8ae 100644
+set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
\ No newline at end of file \ No newline at end of file
-- --
2.28.0 2.29.1

View File

@ -1,110 +0,0 @@
From 029abc25e2a00675868ae89c4251564a4fa81fa5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 14 Sep 2020 20:49:14 +0200
Subject: [PATCH 2/3] Rename qtmain to qt6main to make Qt 6 co-installable with
previous versions
Change-Id: Ic750ae711673e3ff246fcff0c54ab71644a3041e
---
mkspecs/common/g++-win32.conf | 2 +-
mkspecs/common/msvc-desktop.conf | 2 +-
mkspecs/features/create_cmake.prf | 8 ++++----
mkspecs/features/win32/windows.prf | 4 ++--
src/winmain/CMakeLists.txt | 2 +-
src/winmain/winmain.pro | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index 9f3ae47108..3623645155 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt6main
QMAKE_IDL = midl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index a5993287ed..92dd730c39 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -105,7 +105,7 @@ QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib
QMAKE_LIBS_OPENGL_ES2 = gdi32.lib user32.lib
QMAKE_LIBS_OPENGL_ES2_DEBUG = gdi32.lib user32.lib
QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
-QMAKE_LIBS_QT_ENTRY = -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lqt6main
QMAKE_IDL = midl
QMAKE_LIB = lib /NOLOGO
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 73ebe453d3..98f32e1f04 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -329,15 +329,15 @@ mac {
}
mingw {
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt6main$${QT_LIBINFIX}$${debug_suffix}.a
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt6main$${QT_LIBINFIX}.a
isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
} else {
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt6main$${QT_LIBINFIX}$${debug_suffix}.lib
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt6main$${QT_LIBINFIX}.lib
CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
index 272170d428..d5314247db 100644
--- a/mkspecs/features/win32/windows.prf
+++ b/mkspecs/features/win32/windows.prf
@@ -5,8 +5,8 @@ contains(TEMPLATE, ".*app") {
mingw:DEFINES += QT_NEEDS_QMAIN
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
- isEqual(entryLib, -lqtmain) {
- lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
+ isEqual(entryLib, -lqt6main) {
+ lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qt6main$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
PRE_TARGETDEPS += $$lib
QMAKE_LIBS += $$lib
} else {
diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
index 1a74a1e3ae..e2482f16e0 100644
--- a/src/winmain/CMakeLists.txt
+++ b/src/winmain/CMakeLists.txt
@@ -20,7 +20,7 @@ if (MSVC)
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif()
-set_property(TARGET WinMain PROPERTY OUTPUT_NAME qtmain)
+set_property(TARGET WinMain PROPERTY OUTPUT_NAME qt6main)
qt_internal_extend_target(WinMain CONDITION
SOURCES qtmain_win.cpp
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index 19ce9ffa82..cbbeea7323 100644
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -2,7 +2,7 @@
!win32:error("$$_FILE_ is intended only for Windows!")
TEMPLATE = lib
-TARGET = qtmain
+TARGET = qt6main
DESTDIR = $$QT.core.libs
CONFIG += static
--
2.28.0

View File

@ -11,7 +11,7 @@
# All patches are managed at https://github.com/Martchus/qtbase # All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base pkgname=mingw-w64-qt6-base
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -32,12 +32,10 @@ groups=(mingw-w64-qt6)
_pkgfqn="qtbase-everywhere-src-${_qtver}" _pkgfqn="qtbase-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Use-CMake-s-default-import-library-suffix.patch' '0001-Use-CMake-s-default-import-library-suffix.patch'
'0002-Rename-qtmain-to-qt6main-to-make-Qt-6-co-installable.patch' '0002-Fix-finding-D-Bus.patch')
'0003-Fix-finding-D-Bus.patch') sha256sums=('1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e'
sha256sums=('d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0' '10ea48221878769b7bd50328f31f16effc6789d92dd91e9cb22c0acb77ca6095'
'43a19aaaf39d9e5fbce15657f216b5bd343b4be3eeffcb888dcb0d00a011d744' '35ef8ed4f01727ef4a56b856fd91e33fd7f93e5f2813b308872231d182c5df8f')
'74871688a19acd6e254852485c07a1bceb0ce8ae67274d44227528c25e913b37'
'969c980eb3d8e9dc06063def818172e443e87b0511e5a6c95a84a1b5f4a5f841')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0 1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e

View File

@ -5,7 +5,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-declarative pkgname=qt6-declarative
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -17,7 +17,7 @@ makedepends=(cmake python vulkan-headers at-spi2-core ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('944ae20f745a0e6cca09019bed8db47c8e14856d4f18ea79c35bf87e388c9137') sha256sums=('3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -4,7 +4,7 @@
# Based on: AUR package qt6-declarative-git, official qt5-declarative package # Based on: AUR package qt6-declarative-git, official qt5-declarative package
% end % end
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
944ae20f745a0e6cca09019bed8db47c8e14856d4f18ea79c35bf87e388c9137 3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-declarative pkgname=mingw-w64-qt6-declarative
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}" _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('944ae20f745a0e6cca09019bed8db47c8e14856d4f18ea79c35bf87e388c9137') sha256sums=('3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1; % layout 'mingw-w64-qt6-module', has_binaries => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
944ae20f745a0e6cca09019bed8db47c8e14856d4f18ea79c35bf87e388c9137 3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-imageformats pkgname=qt6-imageformats
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1,6 +1,6 @@
% layout 'qt6-module', git_commit => '9d2f8c3f0825f8114a2a916dd8e305f9848d2653'; % layout 'qt6-module', git_commit => '9d2f8c3f0825f8114a2a916dd8e305f9848d2653';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-imageformats pkgname=mingw-w64-qt6-imageformats
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', git_commit => '9d2f8c3f0825f8114a2a916dd8e305f9848d2653'; % layout 'mingw-w64-qt6-module', git_commit => '9d2f8c3f0825f8114a2a916dd8e305f9848d2653';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-quick3d pkgname=qt6-quick3d
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -17,7 +17,7 @@ optdepends=('assimp: Import from assimp')
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('958cdce1f7d9aaf7b2808868094526eeed90b8bc27388052dbd94069010d12a8') sha256sums=('a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
958cdce1f7d9aaf7b2808868094526eeed90b8bc27388052dbd94069010d12a8 a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-quick3d pkgname=mingw-w64-qt6-quick3d
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qtquick3d-everywhere-src-${_qtver}" _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('958cdce1f7d9aaf7b2808868094526eeed90b8bc27388052dbd94069010d12a8') sha256sums=('a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1; % layout 'mingw-w64-qt6-module', has_binaries => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
958cdce1f7d9aaf7b2808868094526eeed90b8bc27388052dbd94069010d12a8 a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-quickcontrols2 pkgname=qt6-quickcontrols2
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('0ca121e8beca8dd58341ca6b7e99b332698782707ec77e225282779cbb77f2a9') sha256sums=('e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
0ca121e8beca8dd58341ca6b7e99b332698782707ec77e225282779cbb77f2a9 e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-quickcontrols2 pkgname=mingw-w64-qt6-quickcontrols2
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}" _pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('0ca121e8beca8dd58341ca6b7e99b332698782707ec77e225282779cbb77f2a9') sha256sums=('e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module'; % layout 'mingw-w64-qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
0ca121e8beca8dd58341ca6b7e99b332698782707ec77e225282779cbb77f2a9 e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-quicktimeline pkgname=qt6-quicktimeline
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('3ba96899ffb2e764d7e9e9f83bfcec5e2116e9cb63a470dd0d10430b33811460') sha256sums=('2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
3ba96899ffb2e764d7e9e9f83bfcec5e2116e9cb63a470dd0d10430b33811460 2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-quicktimeline pkgname=mingw-w64-qt6-quicktimeline
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qtquicktimeline-everywhere-src-${_qtver}" _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('3ba96899ffb2e764d7e9e9f83bfcec5e2116e9cb63a470dd0d10430b33811460') sha256sums=('2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module'; % layout 'mingw-w64-qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
3ba96899ffb2e764d7e9e9f83bfcec5e2116e9cb63a470dd0d10430b33811460 2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-shadertools pkgname=qt6-shadertools
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('9dd44cdd75b1447f3c664039a063175922a885912238205e3bbed0c638fb94e7') sha256sums=('2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
9dd44cdd75b1447f3c664039a063175922a885912238205e3bbed0c638fb94e7 2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-shadertools pkgname=mingw-w64-qt6-shadertools
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qtshadertools-everywhere-src-${_qtver}" _pkgfqn="qtshadertools-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('9dd44cdd75b1447f3c664039a063175922a885912238205e3bbed0c638fb94e7') sha256sums=('2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1; % layout 'mingw-w64-qt6-module', has_binaries => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
9dd44cdd75b1447f3c664039a063175922a885912238205e3bbed0c638fb94e7 2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-svg pkgname=qt6-svg
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(cmake ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('63ab098d9ae306118a8f7583e4cbde12ccb27ffdeddeea574b56b0cefc3b4205') sha256sums=('0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
63ab098d9ae306118a8f7583e4cbde12ccb27ffdeddeea574b56b0cefc3b4205 0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-svg pkgname=mingw-w64-qt6-svg
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qtsvg-everywhere-src-${_qtver}" _pkgfqn="qtsvg-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('63ab098d9ae306118a8f7583e4cbde12ccb27ffdeddeea574b56b0cefc3b4205') sha256sums=('0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module'; % layout 'mingw-w64-qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
63ab098d9ae306118a8f7583e4cbde12ccb27ffdeddeea574b56b0cefc3b4205 0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-tools pkgname=qt6-tools
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -17,7 +17,7 @@ optdepends=('clang: for qdoc and lupdate')
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('4f6f408dcf13d3a87d6b6725142fee6cfd38d16e2de945e374fa9e1f5605a8d0') sha256sums=('06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module', has_binaries => 1; % layout 'qt6-module', has_binaries => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
4f6f408dcf13d3a87d6b6725142fee6cfd38d16e2de945e374fa9e1f5605a8d0 06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-tools pkgname=mingw-w64-qt6-tools
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qttools-everywhere-src-${_qtver}" _pkgfqn="qttools-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('4f6f408dcf13d3a87d6b6725142fee6cfd38d16e2de945e374fa9e1f5605a8d0') sha256sums=('06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1; % layout 'mingw-w64-qt6-module', has_binaries => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
4f6f408dcf13d3a87d6b6725142fee6cfd38d16e2de945e374fa9e1f5605a8d0 06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-translations pkgname=qt6-translations
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -16,7 +16,7 @@ makedepends=(cmake qt6-tools ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('9eb56f4a193effe682362644b63cc328143c75d6418cfdd8907d3ea26bba3bb6') sha256sums=('600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module', no_libs => 1; % layout 'qt6-module', no_libs => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
9eb56f4a193effe682362644b63cc328143c75d6418cfdd8907d3ea26bba3bb6 600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-translations pkgname=mingw-w64-qt6-translations
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6) groups=(mingw-w64-qt6)
_pkgfqn="qttranslations-everywhere-src-${_qtver}" _pkgfqn="qttranslations-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('9eb56f4a193effe682362644b63cc328143c75d6418cfdd8907d3ea26bba3bb6') sha256sums=('600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', no_libs => 1; % layout 'mingw-w64-qt6-module', no_libs => 1;
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(any) arch=(any)

View File

@ -1 +1 @@
9eb56f4a193effe682362644b63cc328143c75d6418cfdd8907d3ea26bba3bb6 600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=qt6-wayland pkgname=qt6-wayland
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja)
groups=(qt6) groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('8d06c4764cc96607410cc77904d652521ae47505e0e0e19f3a299312107ddf58') sha256sums=('0cab045e46a2966e1cd043e4453dedc1d29ccc1d8e748a4d3b5ee721b4c29786')
build() { build() {
cmake -G Ninja -B build -S $_pkgfqn cmake -G Ninja -B build -S $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'qt6-module'; % layout 'qt6-module';
\ \
_qtver=6.0.0-beta1 _qtver=6.0.0-beta2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)

View File

@ -1 +1 @@
8d06c4764cc96607410cc77904d652521ae47505e0e0e19f3a299312107ddf58 0cab045e46a2966e1cd043e4453dedc1d29ccc1d8e748a4d3b5ee721b4c29786