From 1c6dcbd4ed4482cdb8ed24276b5d3979bcd7dcdc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 31 Oct 2020 22:38:29 +0100 Subject: [PATCH] Update Qt 6 packages to beta3, add mingw-w64-qt6-*-static packages * Add certain variables to find Qt's dependencies to the CMake toolchain file because these variables would otherwise needed to be set every time Qt 6 is used * Add a static variant * Not fully tested yet * Further repos besides base and svg will be added later --- cmake/mingw-w64/PKGBUILD | 28 ++-- cmake/mingw-w64/mingw-cmake-static.sh | 15 +++ cmake/mingw-w64/mingw-cmake.sh | 44 +----- cmake/mingw-w64/toolchain-mingw-static.cmake | 29 ++++ cmake/mingw-w64/toolchain-mingw.cmake | 7 + devel/generator/generate.pl | 15 +++ .../layouts/mingw-w64-qt6-base.sh.ep | 20 +-- .../layouts/mingw-w64-qt6-module.sh.ep | 14 +- devel/versions.sh | 2 +- qt6-3d/mingw-w64/PKGBUILD | 5 +- qt6-5compat/default/PKGBUILD | 4 +- qt6-5compat/default/PKGBUILD.sh.ep | 2 +- qt6-5compat/default/qt5compat-sha256.txt | 2 +- qt6-5compat/mingw-w64/PKGBUILD | 9 +- qt6-5compat/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-5compat/mingw-w64/qt5compat-sha256.txt | 2 +- qt6-base/default/PKGBUILD | 6 +- qt6-base/default/qtbase-sha256.txt | 2 +- ...Make-s-default-import-library-suffix.patch | 115 ++++++++++++++++ .../0002-Fix-finding-D-Bus.patch | 23 ++++ ...03-Fix-using-static-PCRE2-and-DBus-1.patch | 48 +++++++ ...ive-dependencies-of-static-libraries.patch | 126 ++++++++++++++++++ ...orkaround-for-conflict-with-rpcndr.h.patch | 37 +++++ qt6-base/mingw-w64-static/PKGBUILD | 94 +++++++++++++ qt6-base/mingw-w64-static/PKGBUILD.sh.ep | 1 + qt6-base/mingw-w64-static/qtbase-sha256.txt | 1 + ...Make-s-default-import-library-suffix.patch | 51 ++++--- .../mingw-w64/0002-Fix-finding-D-Bus.patch | 6 +- ...03-Fix-using-static-PCRE2-and-DBus-1.patch | 48 +++++++ ...ive-dependencies-of-static-libraries.patch | 126 ++++++++++++++++++ ...orkaround-for-conflict-with-rpcndr.h.patch | 37 +++++ qt6-base/mingw-w64/PKGBUILD | 25 ++-- qt6-base/mingw-w64/qtbase-sha256.txt | 2 +- qt6-declarative/default/PKGBUILD | 4 +- qt6-declarative/default/PKGBUILD.sh.ep | 2 +- .../default/qtdeclarative-sha256.txt | 2 +- qt6-declarative/mingw-w64/PKGBUILD | 9 +- qt6-declarative/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtdeclarative-sha256.txt | 2 +- qt6-imageformats/default/PKGBUILD | 4 +- qt6-imageformats/default/PKGBUILD.sh.ep | 4 +- .../default/qtimageformats-sha256.txt | 1 + qt6-imageformats/mingw-w64/PKGBUILD | 9 +- qt6-imageformats/mingw-w64/PKGBUILD.sh.ep | 4 +- .../mingw-w64/qtimageformats-sha256.txt | 1 + qt6-quick3d/default/PKGBUILD | 4 +- qt6-quick3d/default/PKGBUILD.sh.ep | 2 +- qt6-quick3d/default/qtquick3d-sha256.txt | 2 +- qt6-quick3d/mingw-w64/PKGBUILD | 9 +- qt6-quick3d/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-quick3d/mingw-w64/qtquick3d-sha256.txt | 2 +- qt6-quickcontrols2/default/PKGBUILD | 4 +- qt6-quickcontrols2/default/PKGBUILD.sh.ep | 2 +- .../default/qtquickcontrols2-sha256.txt | 2 +- qt6-quickcontrols2/mingw-w64/PKGBUILD | 9 +- qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtquickcontrols2-sha256.txt | 2 +- qt6-quicktimeline/default/PKGBUILD | 4 +- qt6-quicktimeline/default/PKGBUILD.sh.ep | 2 +- .../default/qtquicktimeline-sha256.txt | 2 +- qt6-quicktimeline/mingw-w64/PKGBUILD | 9 +- qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtquicktimeline-sha256.txt | 2 +- qt6-shadertools/default/PKGBUILD | 4 +- qt6-shadertools/default/PKGBUILD.sh.ep | 2 +- .../default/qtshadertools-sha256.txt | 2 +- qt6-shadertools/mingw-w64/PKGBUILD | 9 +- qt6-shadertools/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qtshadertools-sha256.txt | 2 +- qt6-svg/default/PKGBUILD | 4 +- qt6-svg/default/PKGBUILD.sh.ep | 2 +- qt6-svg/default/qtsvg-sha256.txt | 2 +- qt6-svg/mingw-w64-static/PKGBUILD | 46 +++++++ qt6-svg/mingw-w64-static/PKGBUILD.sh.ep | 1 + qt6-svg/mingw-w64-static/qtsvg-sha256.txt | 1 + qt6-svg/mingw-w64/PKGBUILD | 9 +- qt6-svg/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-svg/mingw-w64/qtsvg-sha256.txt | 2 +- qt6-tools/default/PKGBUILD | 4 +- qt6-tools/default/PKGBUILD.sh.ep | 2 +- qt6-tools/default/qttools-sha256.txt | 2 +- qt6-tools/mingw-w64/PKGBUILD | 9 +- qt6-tools/mingw-w64/PKGBUILD.sh.ep | 2 +- qt6-tools/mingw-w64/qttools-sha256.txt | 2 +- qt6-translations/default/PKGBUILD | 4 +- qt6-translations/default/PKGBUILD.sh.ep | 2 +- .../default/qttranslations-sha256.txt | 2 +- qt6-translations/mingw-w64/PKGBUILD | 9 +- qt6-translations/mingw-w64/PKGBUILD.sh.ep | 2 +- .../mingw-w64/qttranslations-sha256.txt | 2 +- qt6-wayland/default/PKGBUILD | 4 +- qt6-wayland/default/PKGBUILD.sh.ep | 2 +- qt6-wayland/default/qtwayland-sha256.txt | 2 +- 93 files changed, 961 insertions(+), 234 deletions(-) create mode 100644 cmake/mingw-w64/mingw-cmake-static.sh create mode 100644 cmake/mingw-w64/toolchain-mingw-static.cmake create mode 100644 qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch create mode 100644 qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch create mode 100644 qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch create mode 100644 qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch create mode 100644 qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch create mode 100644 qt6-base/mingw-w64-static/PKGBUILD create mode 100644 qt6-base/mingw-w64-static/PKGBUILD.sh.ep create mode 100644 qt6-base/mingw-w64-static/qtbase-sha256.txt create mode 100644 qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch create mode 100644 qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch create mode 100644 qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch create mode 100644 qt6-imageformats/default/qtimageformats-sha256.txt create mode 100644 qt6-imageformats/mingw-w64/qtimageformats-sha256.txt create mode 100644 qt6-svg/mingw-w64-static/PKGBUILD create mode 100644 qt6-svg/mingw-w64-static/PKGBUILD.sh.ep create mode 100644 qt6-svg/mingw-w64-static/qtsvg-sha256.txt diff --git a/cmake/mingw-w64/PKGBUILD b/cmake/mingw-w64/PKGBUILD index 7210f961..26a30f88 100644 --- a/cmake/mingw-w64/PKGBUILD +++ b/cmake/mingw-w64/PKGBUILD @@ -1,24 +1,30 @@ pkgname=mingw-w64-cmake pkgver=1 -pkgrel=25.1 +pkgrel=35 arch=('any') pkgdesc="CMake wrapper for MinGW (mingw-w64)" -depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config') +depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-environment') optdepends=('mingw-w64-wine: runtime support') license=("GPL") url="http://fedoraproject.org/wiki/MinGW" -source=("mingw-cmake.sh" - "mingw-cmake-py.sh" - "toolchain-mingw.cmake") -sha256sums=('SKIP' 'SKIP' "SKIP") +source=(mingw-cmake{,-static}.sh + mingw-cmake-py.sh + toolchain-mingw{,-static}.cmake) +sha256sums=('457f4bac0a21b280a27bab349f0d5d04371e97ba003e384806735f8e6762cc4e' + '1622b4899df8dbeb406ec3771fa48f65e30d58c2e1ab5add9ba190099bd2870f' + 'c161a6d8d49599d3798fba6fb9f5d45f304acd29e7cf2b96315841adb06e42ae' + 'ca46564e7c0e1525d1ec44da4781939f1791c70cd18acac5fc10d62d9d465dde' + 'f0c3f65cf2ce802647f7c3b0e0884f00c2962d5a8cfb8fa8fee781f9551d4b86') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" -_python_versions="27 35 36 37" +_python_versions="27 36 37 38" build() { for _arch in ${_architectures}; do - sed "s|@TRIPLE@|${_arch}|g;s|@PROCESSOR@|${_arch::-12}|g" toolchain-mingw.cmake > toolchain-${_arch}.cmake - sed "s|@TRIPLE@|${_arch}|g" mingw-cmake.sh > ${_arch}-cmake + for _variant in '' '-static'; do + sed "s|@TRIPLE@|${_arch}|g;s|@PROCESSOR@|${_arch::-12}|g" toolchain-mingw${_variant}.cmake > toolchain-${_arch}${_variant}.cmake + sed "s|@TRIPLE@|${_arch}|g" mingw-cmake${_variant}.sh > ${_arch}-cmake${_variant} + done for _pyver in ${_python_versions}; do sed "s|@TRIPLE@|${_arch}|g;s|@PYMAJMIN@|${_pyver}|g" mingw-cmake-py.sh > ${_arch}-cmake-py${_pyver} done @@ -29,8 +35,8 @@ package() { install -d "${pkgdir}"/usr/bin install -d "${pkgdir}"/usr/share/mingw for _arch in ${_architectures}; do - install -m 644 toolchain-${_arch}.cmake "${pkgdir}"/usr/share/mingw/ - install -m 755 ${_arch}-cmake "${pkgdir}"/usr/bin/ + install -m 644 toolchain-${_arch}{,-static}.cmake "${pkgdir}"/usr/share/mingw/ + install -m 755 ${_arch}-cmake{,-static} "${pkgdir}"/usr/bin/ for _pyver in ${_python_versions}; do install -m 755 ${_arch}-cmake-py${_pyver} "${pkgdir}"/usr/bin/ done diff --git a/cmake/mingw-w64/mingw-cmake-static.sh b/cmake/mingw-w64/mingw-cmake-static.sh new file mode 100644 index 00000000..11c8c49e --- /dev/null +++ b/cmake/mingw-w64/mingw-cmake-static.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +source mingw-env @TRIPLE@ + +mingw_prefix=/usr/@TRIPLE@ + +PATH=${mingw_prefix}/bin:$PATH cmake \ + -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ + -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@-static.cmake \ + -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \ + "$@" diff --git a/cmake/mingw-w64/mingw-cmake.sh b/cmake/mingw-w64/mingw-cmake.sh index e4a0ac10..9b2102f1 100644 --- a/cmake/mingw-w64/mingw-cmake.sh +++ b/cmake/mingw-w64/mingw-cmake.sh @@ -1,47 +1,15 @@ #!/bin/sh + +source mingw-env @TRIPLE@ + mingw_prefix=/usr/@TRIPLE@ -export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig" - -default_mingw_pp_flags="-D_FORTIFY_SOURCE=2" -default_mingw_compiler_flags="$default_mingw_pp_flags -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4" -default_mingw_linker_flags="-Wl,-O1,--sort-common,--as-needed" - -export CPPFLAGS="${MINGW_CPPFLAGS:-$default_mingw_pp_flags $CPPFLAGS}" -export CFLAGS="${MINGW_CFLAGS:-$default_mingw_compiler_flags $CFLAGS}" -export CXXFLAGS="${MINGW_CXXFLAGS:-$default_mingw_compiler_flags $CXXFLAGS}" -export LDFLAGS="${MINGW_LDFLAGS:-$default_mingw_linker_flags $LDFLAGS}" - -# allow overriding certain defaults -extra_args=() -declare -A variables_to_preserve=( - [CMAKE_BUILD_TYPE]=Release - [BUILD_SHARED_LIBS]=ON -) -variable_to_preserve_regex='-D(CMAKE_BUILD_TYPE|BUILD_SHARED_LIBS)(:.*)=(.*)' -for arg in "$@"; do - if [[ $arg =~ $variable_to_preserve_regex ]]; then - variables_to_preserve[${BASH_REMATCH[1]}]=${BASH_REMATCH[3]} - else - extra_args+=("$arg") - fi -done - PATH=${mingw_prefix}/bin:$PATH cmake \ -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${mingw_prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${mingw_prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${mingw_prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${mingw_prefix}/etc \ - -DSHARE_INSTALL_DIR:PATH=${mingw_prefix}/share \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ - -DBUILD_SHARED_LIBS:BOOL="${variables_to_preserve[BUILD_SHARED_LIBS]}" \ + -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \ -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \ - -DCMAKE_BUILD_TYPE="${variables_to_preserve[CMAKE_BUILD_TYPE]}" \ - -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ - -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$LDFLAGS" \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" \ - "${extra_args[@]}" + "$@" diff --git a/cmake/mingw-w64/toolchain-mingw-static.cmake b/cmake/mingw-w64/toolchain-mingw-static.cmake new file mode 100644 index 00000000..ec4abf57 --- /dev/null +++ b/cmake/mingw-w64/toolchain-mingw-static.cmake @@ -0,0 +1,29 @@ +include("/usr/share/mingw/toolchain-@TRIPLE@.cmake") + +# prefer libraries from "static" sub-prefix +set(CMAKE_FIND_ROOT_PATH "/usr/@TRIPLE@/static;${CMAKE_FIND_ROOT_PATH}") + +# prefer static libraries +set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.lib") +set(CMAKE_EXE_LINKER_FLAGS "$ENV{LDFLAGS} -static -static-libgcc -static-libstdc++" CACHE STRING "linker flags for static builds" FORCE) +set(OPENSSL_USE_STATIC_LIBS ON) + +# workaround limitations in upstream pkg-config files and CMake find modules +set(MySQL_LIBRARIES "/usr/@TRIPLE@/lib/libmariadbclient.a" CACHE INTERNAL "static MariaDB client library") +set(pkgcfg_lib_libbrotlicommon_brotlicommon "/usr/@TRIPLE@/lib/libbrotlicommon-static.a" CACHE INTERNAL "static libbrotlicommon") +set(pkgcfg_lib_libbrotlienc_brotlienc "/usr/@TRIPLE@/lib/libbrotlienc-static.a;/usr/@TRIPLE@/lib/libbrotlicommon-static.a" CACHE INTERNAL "static libbrotliend") +set(pkgcfg_lib_libbrotlidec_brotlidec "/usr/@TRIPLE@/lib/libbrotlidec-static.a;/usr/@TRIPLE@/lib/libbrotlicommon-static.a" CACHE INTERNAL "static libbrotlidec") +set(libbrotlicommon_STATIC_LDFLAGS "${pkgcfg_lib_libbrotlicommon_brotlicommon}" CACHE INTERNAL "static libbrotlicommon") +set(libbrotlienc_STATIC_LDFLAGS "${pkgcfg_lib_libbrotlienc_brotlienc}" CACHE INTERNAL "static libbrotliend") +set(libbrotlidec_STATIC_LDFLAGS "${pkgcfg_lib_libbrotlidec_brotlidec}" CACHE INTERNAL "static libbrotlidec") + +# define dependencies of various static libraries as CMake doesn't pull them reliably automatically +# TODO: Deduce these dependencies via pkg-config where possible. +set(OPENSSL_DEPENDENCIES "-lws2_32;-lgdi32;-lcrypt32" CACHE INTERNAL "dependencies of static OpenSSL libraries") +set(POSTGRESQL_DEPENDENCIES "-lpgcommon;-lpgport;-lintl;-lssl;-lcrypto;-lshell32;-lws2_32;-lsecur32;-liconv" CACHE INTERNAL "dependencies of static PostgreSQL libraries") +set(MYSQL_DEPENDENCIES "-lssl;-lcrypto;-lshlwapi;-lgdi32;-lws2_32;-lpthread;-lz;-lm" CACHE INTERNAL "dependencies of static MySQL/MariaDB libraries") +set(LIBPNG_DEPENDENCIES "-lz" CACHE INTERNAL "dependencies of static libpng") +set(GLIB2_DEPENDENCIES "-lintl;-lws2_32;-lole32;-lwinmm;-lshlwapi;-lm" CACHE INTERNAL "dependencies of static Glib2") +set(FREETYPE_DEPENDENCIES "-lbz2;-lharfbuzz" CACHE INTERNAL "dependencies of static FreeType2 library") +set(HARFBUZZ_DEPENDENCIES "-lglib-2.0;${GLIB2_DEPENDENCIES};-lintl;-lm;-lfreetype;-lgraphite2" CACHE INTERNAL "dependencies of static HarfBuzz library") +set(DBUS1_DEPENDENCIES "-lws2_32;-liphlpapi;-ldbghelp" CACHE INTERNAL "dependencies of static D-Bus1 library") diff --git a/cmake/mingw-w64/toolchain-mingw.cmake b/cmake/mingw-w64/toolchain-mingw.cmake index 6e0136a9..c079aa1c 100644 --- a/cmake/mingw-w64/toolchain-mingw.cmake +++ b/cmake/mingw-w64/toolchain-mingw.cmake @@ -31,4 +31,11 @@ set (CMAKE_Fortran_COMPILER @TRIPLE@-gfortran) set (CMAKE_AR:FILEPATH @TRIPLE@-ar) set (CMAKE_RANLIB:FILEPATH @TRIPLE@-ranlib) +# make sure Qt finds host tools +set(QT_HOST_PATH "/usr" CACHE PATH "host path for Qt") +# workaround limitations in CMake's find modules +set(Vulkan_LIBRARY "/usr/@TRIPLE@/lib/libvulkan.dll.a" CACHE FILEPATH "Vulkan IDC library") +set(Vulkan_INCLUDE_DIR "/usr/@TRIPLE@/include" CACHE PATH "Vulkan headers directory") +set(MySQL_LIBRARIES "/usr/@TRIPLE@/lib/libmariadb.dll.a" CACHE INTERNAL "MariaDB client library") +set(MySQL_INCLUDE_DIRS "/usr/@TRIPLE@/include/mariadb" CACHE INTERNAL "MariaDB client library") diff --git a/devel/generator/generate.pl b/devel/generator/generate.pl index eaa79947..c9ba5ae2 100755 --- a/devel/generator/generate.pl +++ b/devel/generator/generate.pl @@ -60,6 +60,21 @@ for my $qt_version (qw(qt5 qt6)) { $mojolicious->helper("${qt_version}optdeps" => sub { _render_optdeps($qt_version, @_) }); } +# add helper to expand pkg-config style libraries into full paths for use with CMake +# example: "-lfoo -lbar" => "/usr/lib/foo.a;/usr/lib/bar.a" +$mojolicious->helper(expand_libs => sub { + my $controller = shift; + my $is_static = $controller->stash('static_variant'); + my $is_mingw = $controller->stash('package_name_prefix') eq 'mingw-w64-'; + my $prefix = $is_mingw ? '/usr/$_arch' : '/usr'; + my $extension = $is_static ? 'a' : ($is_mingw ? 'dll.a' : 'so'); + return join(';', map { + my $library_name = $_; + $library_name = $1 if $library_name =~ qr/\w*-l(.*)\w*/; + "$prefix/lib/lib$library_name.$extension"; + } @_); +}); + # find templates; populate "pages" array my @pages; my $template_file_name = 'PKGBUILD.sh.ep'; diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep index 2a1efe5c..44a38085 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep @@ -14,7 +14,7 @@ % } pkgname=<%= $package_name %> -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -24,7 +24,7 @@ pkgdesc='A cross-platform application and UI framework (mingw-w64)' depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite' 'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' 'mingw-w64-brotli' 'mingw-w64-pcre2' 'mingw-w64-zstd') -makedepends=('mingw-w64-cmake' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' +makedepends=('mingw-w64-cmake>=1-35' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-pkg-config' 'qt6-base' 'ninja') optdepends=('mingw-w64-postgresql: PostgreSQL driver' @@ -58,8 +58,10 @@ prepare () { build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config - $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \\ - -DQT_HOST_PATH=/usr \\ + $_arch-cmake<%== $static_variant ? '-static' : '' %> -G Ninja -B build-$_arch -S $_pkgfqn \\ +% if ($static_variant) { + -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \\ +% } -DFEATURE_pkg_config=ON \\ -DFEATURE_system_pcre2=ON \\ -DFEATURE_system_freetype=ON \\ @@ -72,11 +74,7 @@ build() { -DINSTALL_INCLUDEDIR=include/qt6 \\ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \\ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \\ - -DINPUT_openssl=runtime \\ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \\ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" \\ - -DMySQL_LIBRARIES="/usr/$_arch/lib/libmariadb.dll.a" \\ - -DMySQL_INCLUDE_DIRS="/usr/$_arch/include/mariadb" + -DINPUT_openssl=<%== $static_variant ? 'linked' : 'runtime' %> VERBOSE=1 cmake --build build-$_arch done } @@ -87,6 +85,7 @@ package() { install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/$_arch/share/licenses/$pkgname +% unless ($static_variant) { # Add symlinks of DLLs in usual bin directory mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin" for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do @@ -98,8 +97,9 @@ package() { ln -rs "$pkgdir"/usr/$_arch/lib/qt6/bin/$_b "$pkgdir"/usr/bin/$_arch-$_b-qt6 done +% } # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \\ + find "$pkgdir/usr/$_arch/<%== $static_variant ? 'static/' : '' %>lib" -type f -name '*.prl' \\ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep index 53b8a01d..d87d82e2 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep @@ -5,7 +5,7 @@ # you also find the URL of a binary repository. <%== content_for 'comment_header' %>\ -pkgname=mingw-w64-qt6-<%== $qt_module %> +pkgname=mingw-w64-qt6-<%== $qt_module %><%== $static_variant ? '-static' : '' %> <%== content %>\ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) @@ -41,11 +41,11 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config <%== content_for 'before_build_config' %>\ - $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \\ - -DQT_HOST_PATH=/usr \\ - -DFEATURE_pkg_config=ON \\ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \\ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include"<%== content_for 'after_build_config' %> + $_arch-cmake<%== $static_variant ? '-static' : '' %> -G Ninja -B build-$_arch -S $_pkgfqn \\ +% if ($static_variant) { + -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \\ +% } + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } @@ -55,6 +55,7 @@ package() { <%== content_for 'before_package_install' %>\ DESTDIR="$pkgdir" cmake --install build-$_arch<%== content_for 'after_package_install' %> +% unless ($static_variant) { % unless (stash('no_libs')) { # Add symlinks of DLLs in usual bin directory mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin" @@ -68,6 +69,7 @@ package() { find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \\ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; +% } % } find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; diff --git a/devel/versions.sh b/devel/versions.sh index c71dd4c9..e9049065 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -13,7 +13,7 @@ declare -A versions=( [dbus-soundrecorder]=1.2.3 [geocoordinatecalculator]=1.1.3 [qt5]=5.15.1 - [qt6]=6.0.0-beta2 + [qt6]=6.0.0-beta3 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/qt6-3d/mingw-w64/PKGBUILD b/qt6-3d/mingw-w64/PKGBUILD index f6f6c7ea..2b391ebd 100644 --- a/qt6-3d/mingw-w64/PKGBUILD +++ b/qt6-3d/mingw-w64/PKGBUILD @@ -28,10 +28,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-5compat/default/PKGBUILD b/qt6-5compat/default/PKGBUILD index bb1ea41f..ebe6ef02 100644 --- a/qt6-5compat/default/PKGBUILD +++ b/qt6-5compat/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-5compat -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc') +sha256sums=('94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-5compat/default/PKGBUILD.sh.ep b/qt6-5compat/default/PKGBUILD.sh.ep index 47a00eea..51d7283e 100644 --- a/qt6-5compat/default/PKGBUILD.sh.ep +++ b/qt6-5compat/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-5compat/default/qt5compat-sha256.txt b/qt6-5compat/default/qt5compat-sha256.txt index a600f5e5..c0cf1170 100644 --- a/qt6-5compat/default/qt5compat-sha256.txt +++ b/qt6-5compat/default/qt5compat-sha256.txt @@ -1 +1 @@ -9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc +94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab diff --git a/qt6-5compat/mingw-w64/PKGBUILD b/qt6-5compat/mingw-w64/PKGBUILD index 01e8ae16..792e75a5 100644 --- a/qt6-5compat/mingw-w64/PKGBUILD +++ b/qt6-5compat/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-5compat -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qt5compat-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc') +sha256sums=('94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -25,10 +25,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep index 248e1f13..a7addb15 100644 --- a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-5compat/mingw-w64/qt5compat-sha256.txt b/qt6-5compat/mingw-w64/qt5compat-sha256.txt index a600f5e5..c0cf1170 100644 --- a/qt6-5compat/mingw-w64/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64/qt5compat-sha256.txt @@ -1 +1 @@ -9626aa2a8752e4fd1e75e1a35583f6209ea451174e501205d6ccb4f8c63b51fc +94cb49919d875e05e6fc8286dbe63131b819ed05add0265619fe9abd7a32efab diff --git a/qt6-base/default/PKGBUILD b/qt6-base/default/PKGBUILD index ae675267..b81874ab 100644 --- a/qt6-base/default/PKGBUILD +++ b/qt6-base/default/PKGBUILD @@ -5,7 +5,7 @@ # you also find the URL of a binary repository. pkgname=qt6-base -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ pkgdesc='A cross-platform application and UI framework' depends=(libjpeg-turbo xcb-util-keysyms xcb-util-cursor libgl fontconfig xdg-utils shared-mime-info xcb-util-wm libxrender libxi sqlite mesa tslib libinput libxkbcommon-x11 libproxy libcups double-conversion md4c brotli libb2) -makedepends=(cmake libfbclient mariadb-libs unixodbc postgresql-libs alsa-lib gst-plugins-base-libs +makedepends=(cmake libfbclient mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs gtk3 libpulse cups freetds vulkan-headers ninja) optdepends=('postgresql-libs: PostgreSQL driver' 'mariadb-libs: MariaDB driver' @@ -27,7 +27,7 @@ optdepends=('postgresql-libs: PostgreSQL driver' groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e') +sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268') build() { cmake -G Ninja -B build -S $_pkgfqn \ diff --git a/qt6-base/default/qtbase-sha256.txt b/qt6-base/default/qtbase-sha256.txt index 31da929c..5057e6d9 100644 --- a/qt6-base/default/qtbase-sha256.txt +++ b/qt6-base/default/qtbase-sha256.txt @@ -1 +1 @@ -1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e +37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 diff --git a/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch new file mode 100644 index 00000000..e00b80b2 --- /dev/null +++ b/qt6-base/mingw-w64-static/0001-Use-CMake-s-default-import-library-suffix.patch @@ -0,0 +1,115 @@ +From 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Thu, 5 Nov 2020 22:08:10 +0100 +Subject: [PATCH 1/5] Use CMake's default import library suffix + +Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a +--- + cmake/QtPriHelpers.cmake | 12 ++++++++++-- + cmake/QtPrlHelpers.cmake | 8 +++++++- + cmake/QtTargetHelpers.cmake | 2 -- + mkspecs/common/g++-win32.conf | 1 + + mkspecs/features/create_cmake.prf | 5 +++-- + 5 files changed, 21 insertions(+), 7 deletions(-) + +diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake +index 56c60b1b18..18e1aeddb1 100644 +--- a/cmake/QtPriHelpers.cmake ++++ b/cmake/QtPriHelpers.cmake +@@ -320,9 +320,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features + qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") + list(APPEND pri_files "${private_pri_file_path}") + +- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(library_prefixes ++ ${CMAKE_SHARED_LIBRARY_PREFIX} ++ ${CMAKE_IMPORT_LIBRARY_PREFIX} ++ ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_suffixes + ${CMAKE_SHARED_LIBRARY_SUFFIX} ++ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} + ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} + ${CMAKE_STATIC_LIBRARY_SUFFIX}) + add_custom_command( +@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined} + list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") + endforeach() + +- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(library_prefixes ++ ${CMAKE_SHARED_LIBRARY_PREFIX} ++ ${CMAKE_IMPORT_LIBRARY_PREFIX} ++ ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_suffixes + ${CMAKE_SHARED_LIBRARY_SUFFIX} ++ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} + ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} + ${CMAKE_STATIC_LIBRARY_SUFFIX}) + add_custom_command( +diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake +index 35d321420c..40a85e6c73 100644 +--- a/cmake/QtPrlHelpers.cmake ++++ b/cmake/QtPrlHelpers.cmake +@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} + CONTENT + "FINAL_PRL_FILE_PATH = ${final_prl_file_path}") + +- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(library_prefixes ++ ${CMAKE_SHARED_LIBRARY_PREFIX} ++ ${CMAKE_IMPORT_LIBRARY_PREFIX} ++ ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_suffixes + ${CMAKE_SHARED_LIBRARY_SUFFIX} ++ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} + ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} + ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ list(REMOVE_DUPLICATES library_prefixes) ++ list(REMOVE_DUPLICATES library_suffixes) + + if(QT_GENERATOR_IS_MULTI_CONFIG) + set(configs ${CMAKE_CONFIGURATION_TYPES}) +diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake +index fcbb3ab1f2..332ef6ee4c 100644 +--- a/cmake/QtTargetHelpers.cmake ++++ b/cmake/QtTargetHelpers.cmake +@@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target) + + # This should cover both MINGW with GCC and CLANG. + if(NOT MSVC) +- set_property(TARGET "${target}" PROPERTY IMPORT_SUFFIX ".a") +- + get_target_property(target_type ${target} TYPE) + if(target_type STREQUAL "STATIC_LIBRARY") + set_property(TARGET "${target}" PROPERTY PREFIX "lib") +diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf +index 67ad1e3b8c..b98c7121f6 100644 +--- a/mkspecs/common/g++-win32.conf ++++ b/mkspecs/common/g++-win32.conf +@@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB = + QMAKE_EXTENSION_SHLIB = dll + QMAKE_PREFIX_STATICLIB = lib + QMAKE_EXTENSION_STATICLIB = a ++QMAKE_EXTENSION_IMPORTLIB = dll.a + QMAKE_LIB_EXTENSIONS = a dll.a + + QMAKE_LIBS = +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 24ed125f12..73ebe453d3 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -332,8 +332,9 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a + +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a +- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.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 +-- +2.29.2 + diff --git a/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch new file mode 100644 index 00000000..819d44be --- /dev/null +++ b/qt6-base/mingw-w64-static/0002-Fix-finding-D-Bus.patch @@ -0,0 +1,23 @@ +From 5c192c74f9f5fd7369742a413fe26bdd67ed677f Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Wed, 7 Oct 2020 12:13:37 +0200 +Subject: [PATCH 2/5] Fix finding D-Bus + +Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 +--- + cmake/FindWrapDBus1.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake +index e227d224e0..4982e7c8ae 100644 +--- a/cmake/FindWrapDBus1.cmake ++++ b/cmake/FindWrapDBus1.cmake +@@ -45,3 +45,4 @@ include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS + DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND + VERSION_VAR DBus1_VERSION) ++set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +\ No newline at end of file +-- +2.29.2 + diff --git a/qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch new file mode 100644 index 00000000..1eafb5f6 --- /dev/null +++ b/qt6-base/mingw-w64-static/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -0,0 +1,48 @@ +From 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Thu, 5 Nov 2020 21:13:19 +0100 +Subject: [PATCH 3/5] Fix using static PCRE2 and DBus-1 + +When making a static build of Qt we're using the static version of these +libraries and must define the corresponding macros. + +Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e +--- + src/corelib/text/qregularexpression.cpp | 5 +++++ + src/dbus/qdbus_symbols_p.h | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp +index 827884d709..be5159186c 100644 +--- a/src/corelib/text/qregularexpression.cpp ++++ b/src/corelib/text/qregularexpression.cpp +@@ -53,6 +53,11 @@ + #include + + #define PCRE2_CODE_UNIT_WIDTH 16 ++#ifdef QT_STATIC ++#define PCRE_STATIC ++#define PCRE2_STATIC ++#endif ++#define PCRE2_EXP_DECL Q_CORE_EXPORT + + #include + +diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h +index accaa4f5ed..4b11c74caa 100644 +--- a/src/dbus/qdbus_symbols_p.h ++++ b/src/dbus/qdbus_symbols_p.h +@@ -57,6 +57,10 @@ + + #ifndef QT_NO_DBUS + ++#ifdef QT_STATIC ++# define DBUS_STATIC_BUILD ++#endif ++ + #ifdef QT_LINKED_LIBDBUS + # include + #else +-- +2.29.2 + diff --git a/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch new file mode 100644 index 00000000..39fc04a5 --- /dev/null +++ b/qt6-base/mingw-w64-static/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -0,0 +1,126 @@ +From 4341f7b4267e1287fa6c41ba0a4afddf505408dc Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Thu, 5 Nov 2020 21:59:33 +0100 +Subject: [PATCH 4/5] Fix transitive dependencies (of static libraries) + +The dependencies of these libraries are not reliably picked up by their +corresponding find modules. This change allows adding the required +dependencies by setting certain variables, e.g. within the toolchain file. + +Change-Id: I89da5ef519dd6dd3f86a94a01d3da7208a070bdb +--- + .../3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake | 2 +- + cmake/FindMySQL.cmake | 1 + + cmake/FindWrapDBus1.cmake | 3 ++- + cmake/FindWrapOpenSSL.cmake | 2 +- + cmake/FindWrapSystemFreetype.cmake | 2 +- + cmake/FindWrapSystemHarfbuzz.cmake | 2 +- + cmake/FindWrapSystemPNG.cmake | 2 +- + src/plugins/sqldrivers/psql/CMakeLists.txt | 2 +- + 8 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +index 8f873c1b45..831ca8e624 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +@@ -95,7 +95,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) + add_library(GLIB2::GLIB2 UNKNOWN IMPORTED) + set_target_properties(GLIB2::GLIB2 PROPERTIES + IMPORTED_LOCATION "${GLIB2_LIBRARIES}" +- INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES}" ++ INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES};${GLIB2_DEPENDENCIES}" + INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}") + endif() + +diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +index 54c94b8a2f..7575386338 100644 +--- a/cmake/FindMySQL.cmake ++++ b/cmake/FindMySQL.cmake +@@ -38,6 +38,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) + add_library(MySQL::MySQL UNKNOWN IMPORTED) + set_target_properties(MySQL::MySQL PROPERTIES + IMPORTED_LOCATION "${MySQL_LIBRARIES}" ++ INTERFACE_LINK_LIBRARIES "${MYSQL_DEPENDENCIES}" + INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") + endif() + +diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake +index 4982e7c8ae..56d139c538 100644 +--- a/cmake/FindWrapDBus1.cmake ++++ b/cmake/FindWrapDBus1.cmake +@@ -45,4 +45,5 @@ include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS + DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND + VERSION_VAR DBus1_VERSION) +-set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +\ No newline at end of file ++set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) ++set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}") +diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake +index 6e80862258..47bea72aad 100644 +--- a/cmake/FindWrapOpenSSL.cmake ++++ b/cmake/FindWrapOpenSSL.cmake +@@ -14,7 +14,7 @@ if(OpenSSL_FOUND) + set(WrapOpenSSL_FOUND ON) + + add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED) +- target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL) ++ target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL ${OPENSSL_DEPENDENCIES}) + endif() + + include(FindPackageHandleStandardArgs) +diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake +index 2cf6caca19..23dc161e4c 100644 +--- a/cmake/FindWrapSystemFreetype.cmake ++++ b/cmake/FindWrapSystemFreetype.cmake +@@ -44,7 +44,7 @@ find_package_handle_standard_args(WrapSystemFreetype + if(WrapSystemFreetype_FOUND) + add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED) + target_link_libraries(WrapSystemFreetype::WrapSystemFreetype +- INTERFACE "${__freetype_target_name}") ++ INTERFACE "${__freetype_target_name}" ${FREETYPE_DEPENDENCIES}) + endif() + unset(__freetype_target_name) + unset(__freetype_found) +diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake +index 3cb44aa766..9dc741b2be 100644 +--- a/cmake/FindWrapSystemHarfbuzz.cmake ++++ b/cmake/FindWrapSystemHarfbuzz.cmake +@@ -54,7 +54,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz + if(WrapSystemHarfbuzz_FOUND) + add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED) + target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz +- INTERFACE "${__harfbuzz_target_name}") ++ INTERFACE "${__harfbuzz_target_name}" ${HARFBUZZ_DEPENDENCIES}) + endif() + unset(__harfbuzz_target_name) + unset(__harfbuzz_found) +diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake +index 372a064ff4..a363bfd31b 100644 +--- a/cmake/FindWrapSystemPNG.cmake ++++ b/cmake/FindWrapSystemPNG.cmake +@@ -33,7 +33,7 @@ find_package_handle_standard_args(WrapSystemPNG + if(WrapSystemPNG_FOUND) + add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED) + target_link_libraries(WrapSystemPNG::WrapSystemPNG +- INTERFACE "${__png_target_name}") ++ INTERFACE "${__png_target_name}" ${LIBPNG_DEPENDENCIES}) + endif() + unset(__png_target_name) + unset(__png_found) +diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt +index 62e9619d16..939163bde7 100644 +--- a/src/plugins/sqldrivers/psql/CMakeLists.txt ++++ b/src/plugins/sqldrivers/psql/CMakeLists.txt +@@ -19,7 +19,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES +- PostgreSQL::PostgreSQL ++ PostgreSQL::PostgreSQL ${POSTGRESQL_DEPENDENCIES} + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +-- +2.29.2 + diff --git a/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch new file mode 100644 index 00000000..9b3baf06 --- /dev/null +++ b/qt6-base/mingw-w64-static/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -0,0 +1,37 @@ +From 0f92aeca18858e11ddaa25b7cdad7d89303052ea Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Mon, 2 Nov 2020 13:47:45 +0100 +Subject: [PATCH 5/5] Fix libjpeg workaround for conflict with rpcndr.h + +Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of +libjpeg seems to take care of the conflict already as long as jconfig.h is +included before jmorecfg.h. + +Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e +--- + src/plugins/imageformats/jpeg/qjpeghandler.cpp | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp +index 29bf5ab589..dc336f156a 100644 +--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp ++++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp +@@ -61,14 +61,8 @@ + + // including jpeglib.h seems to be a little messy + extern "C" { +-// jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with +-// some Windows headers that may or may not have been included +-#ifdef HAVE_BOOLEAN +-# undef HAVE_BOOLEAN +-#endif +-#define boolean jboolean +- + #define XMD_H // shut JPEGlib up ++#include // ensure jconfig.h is included before jmorecfg.h + #include + #ifdef const + # undef const // remove crazy C hackery in jconfig.h +-- +2.29.2 + diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD new file mode 100644 index 00000000..911d5e40 --- /dev/null +++ b/qt6-base/mingw-w64-static/PKGBUILD @@ -0,0 +1,94 @@ +# Maintainer: Martchus +# Based on: AUR packages qt6-base-git and mingw-w64-qt6-base-git, official qt5-base package + +# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where +# you also find the URL of a binary repository. + +# This file is created from PKGBUILD.sh.ep contained by the mentioned repository. +# Do not edit it manually! See README.md in the repository's root directory +# for more information. + +# All patches are managed at https://github.com/Martchus/qtbase + +pkgname=mingw-w64-qt6-base-static +_qtver=6.0.0-beta3 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='A cross-platform application and UI framework (mingw-w64)' +depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite' + 'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' + 'mingw-w64-brotli' 'mingw-w64-pcre2' 'mingw-w64-zstd') +makedepends=('mingw-w64-cmake>=1-35' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' + 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-pkg-config' + 'qt6-base' 'ninja') +optdepends=('mingw-w64-postgresql: PostgreSQL driver' + 'mingw-w64-mariadb-connector-c: MariaDB driver' + 'qt6-base: development tools') +options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') +groups=(mingw-w64-qt6) +_pkgfqn="qtbase-everywhere-src-${_qtver}" +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + '0001-Use-CMake-s-default-import-library-suffix.patch' + '0002-Fix-finding-D-Bus.patch' + '0003-Fix-using-static-PCRE2-and-DBus-1.patch' + '0004-Fix-transitive-dependencies-of-static-libraries.patch' + '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch') +sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268' + '7efec2be97836e6b6a2566e297650765db36af4812f10d98702b97f29e40de91' + '4135f261ee759744549c2c6dc42180a8394235f96b750cca82d98a0d5884d6c7' + '0d6ea42b1c302fb3b219dbd9be854045070cf9c67e039a7d248c6e632750e446' + 'fb2a34d4557abb4dae23f2926914322d1fddecc2668ed970aad461b5ead01ab6' + '875c6065b1b53753d8e481a972b07027c093e8e84ed550fe34df8d6fd91c4643') + +_architectures='i686-w64-mingw32 x86_64-w64-mingw32' + +prepare () { + cd $_pkgfqn + + # apply patches; further descriptions can be found in patch files itself + for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" + patch -p1 -i "$patch" + done +} + +build() { + for _arch in ${_architectures}; do + export PKG_CONFIG=/usr/bin/$_arch-pkg-config + $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \ + -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \ + -DFEATURE_pkg_config=ON \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_freetype=ON \ + -DFEATURE_system_harfbuzz=ON \ + -DFEATURE_system_sqlite=ON \ + -DINSTALL_BINDIR=lib/qt6/bin \ + -DINSTALL_DOCDIR=share/doc/qt6 \ + -DINSTALL_ARCHDATADIR=lib/qt6 \ + -DINSTALL_DATADIR=share/qt6 \ + -DINSTALL_INCLUDEDIR=include/qt6 \ + -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ + -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \ + -DINPUT_openssl=linked + VERBOSE=1 cmake --build build-$_arch + done +} + +package() { + for _arch in ${_architectures}; do + DESTDIR="$pkgdir" cmake --install build-$_arch + + install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/$_arch/share/licenses/$pkgname + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/$_arch/static/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; + find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; + find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; + done +} diff --git a/qt6-base/mingw-w64-static/PKGBUILD.sh.ep b/qt6-base/mingw-w64-static/PKGBUILD.sh.ep new file mode 100644 index 00000000..be0caf01 --- /dev/null +++ b/qt6-base/mingw-w64-static/PKGBUILD.sh.ep @@ -0,0 +1 @@ +% layout 'mingw-w64-qt6-base'; diff --git a/qt6-base/mingw-w64-static/qtbase-sha256.txt b/qt6-base/mingw-w64-static/qtbase-sha256.txt new file mode 100644 index 00000000..5057e6d9 --- /dev/null +++ b/qt6-base/mingw-w64-static/qtbase-sha256.txt @@ -0,0 +1 @@ +37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 diff --git a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch index 77356be1..e00b80b2 100644 --- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,24 +1,39 @@ -From b067b34ebd6238a6b4c3c0f9d56e88ef169ef53e Mon Sep 17 00:00:00 2001 +From 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001 From: Martchus -Date: Mon, 14 Sep 2020 20:39:52 +0200 -Subject: [PATCH 1/2] Use CMake's default import library suffix +Date: Thu, 5 Nov 2020 22:08:10 +0100 +Subject: [PATCH 1/5] Use CMake's default import library suffix -Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd +Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a --- - cmake/QtPriHelpers.cmake | 8 +++++++- - cmake/QtPrlHelpers.cmake | 8 +++++++- - cmake/QtTargetHelpers.cmake | 2 -- - mkspecs/common/g++-win32.conf | 1 + - mkspecs/features/create_cmake.prf | 5 +++-- - 5 files changed, 18 insertions(+), 6 deletions(-) + cmake/QtPriHelpers.cmake | 12 ++++++++++-- + cmake/QtPrlHelpers.cmake | 8 +++++++- + cmake/QtTargetHelpers.cmake | 2 -- + mkspecs/common/g++-win32.conf | 1 + + mkspecs/features/create_cmake.prf | 5 +++-- + 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index b79f17243e..a689b2b775 100644 +index 56c60b1b18..18e1aeddb1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -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}") - list(APPEND pri_files "${private_pri_file_path}") +@@ -320,9 +320,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features + qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") + list(APPEND pri_files "${private_pri_file_path}") + +- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(library_prefixes ++ ${CMAKE_SHARED_LIBRARY_PREFIX} ++ ${CMAKE_IMPORT_LIBRARY_PREFIX} ++ ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_suffixes + ${CMAKE_SHARED_LIBRARY_SUFFIX} ++ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} + ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} + ${CMAKE_STATIC_LIBRARY_SUFFIX}) + add_custom_command( +@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined} + list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") + endforeach() - set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_prefixes @@ -30,13 +45,9 @@ index b79f17243e..a689b2b775 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) -+ list(REMOVE_DUPLICATES library_prefixes) -+ list(REMOVE_DUPLICATES library_suffixes) add_custom_command( - OUTPUT "${private_pri_file_path}" - DEPENDS ${inputs} diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 932565f318..9729c150a4 100644 +index 35d321420c..40a85e6c73 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} @@ -100,5 +111,5 @@ index 24ed125f12..73ebe453d3 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib -- -2.29.1 +2.29.2 diff --git a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch index 77688efb..819d44be 100644 --- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch +++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch @@ -1,7 +1,7 @@ -From 3568ffe90378ce9507ad9403f66adac8cbc31df4 Mon Sep 17 00:00:00 2001 +From 5c192c74f9f5fd7369742a413fe26bdd67ed677f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 7 Oct 2020 12:13:37 +0200 -Subject: [PATCH 2/2] Fix finding D-Bus +Subject: [PATCH 2/5] Fix finding D-Bus Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 --- @@ -19,5 +19,5 @@ index e227d224e0..4982e7c8ae 100644 +set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) \ No newline at end of file -- -2.29.1 +2.29.2 diff --git a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch new file mode 100644 index 00000000..1eafb5f6 --- /dev/null +++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -0,0 +1,48 @@ +From 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Thu, 5 Nov 2020 21:13:19 +0100 +Subject: [PATCH 3/5] Fix using static PCRE2 and DBus-1 + +When making a static build of Qt we're using the static version of these +libraries and must define the corresponding macros. + +Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e +--- + src/corelib/text/qregularexpression.cpp | 5 +++++ + src/dbus/qdbus_symbols_p.h | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp +index 827884d709..be5159186c 100644 +--- a/src/corelib/text/qregularexpression.cpp ++++ b/src/corelib/text/qregularexpression.cpp +@@ -53,6 +53,11 @@ + #include + + #define PCRE2_CODE_UNIT_WIDTH 16 ++#ifdef QT_STATIC ++#define PCRE_STATIC ++#define PCRE2_STATIC ++#endif ++#define PCRE2_EXP_DECL Q_CORE_EXPORT + + #include + +diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h +index accaa4f5ed..4b11c74caa 100644 +--- a/src/dbus/qdbus_symbols_p.h ++++ b/src/dbus/qdbus_symbols_p.h +@@ -57,6 +57,10 @@ + + #ifndef QT_NO_DBUS + ++#ifdef QT_STATIC ++# define DBUS_STATIC_BUILD ++#endif ++ + #ifdef QT_LINKED_LIBDBUS + # include + #else +-- +2.29.2 + diff --git a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch new file mode 100644 index 00000000..39fc04a5 --- /dev/null +++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -0,0 +1,126 @@ +From 4341f7b4267e1287fa6c41ba0a4afddf505408dc Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Thu, 5 Nov 2020 21:59:33 +0100 +Subject: [PATCH 4/5] Fix transitive dependencies (of static libraries) + +The dependencies of these libraries are not reliably picked up by their +corresponding find modules. This change allows adding the required +dependencies by setting certain variables, e.g. within the toolchain file. + +Change-Id: I89da5ef519dd6dd3f86a94a01d3da7208a070bdb +--- + .../3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake | 2 +- + cmake/FindMySQL.cmake | 1 + + cmake/FindWrapDBus1.cmake | 3 ++- + cmake/FindWrapOpenSSL.cmake | 2 +- + cmake/FindWrapSystemFreetype.cmake | 2 +- + cmake/FindWrapSystemHarfbuzz.cmake | 2 +- + cmake/FindWrapSystemPNG.cmake | 2 +- + src/plugins/sqldrivers/psql/CMakeLists.txt | 2 +- + 8 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +index 8f873c1b45..831ca8e624 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +@@ -95,7 +95,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) + add_library(GLIB2::GLIB2 UNKNOWN IMPORTED) + set_target_properties(GLIB2::GLIB2 PROPERTIES + IMPORTED_LOCATION "${GLIB2_LIBRARIES}" +- INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES}" ++ INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES};${GLIB2_DEPENDENCIES}" + INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}") + endif() + +diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +index 54c94b8a2f..7575386338 100644 +--- a/cmake/FindMySQL.cmake ++++ b/cmake/FindMySQL.cmake +@@ -38,6 +38,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) + add_library(MySQL::MySQL UNKNOWN IMPORTED) + set_target_properties(MySQL::MySQL PROPERTIES + IMPORTED_LOCATION "${MySQL_LIBRARIES}" ++ INTERFACE_LINK_LIBRARIES "${MYSQL_DEPENDENCIES}" + INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") + endif() + +diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake +index 4982e7c8ae..56d139c538 100644 +--- a/cmake/FindWrapDBus1.cmake ++++ b/cmake/FindWrapDBus1.cmake +@@ -45,4 +45,5 @@ include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS + DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND + VERSION_VAR DBus1_VERSION) +-set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +\ No newline at end of file ++set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) ++set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}") +diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake +index 6e80862258..47bea72aad 100644 +--- a/cmake/FindWrapOpenSSL.cmake ++++ b/cmake/FindWrapOpenSSL.cmake +@@ -14,7 +14,7 @@ if(OpenSSL_FOUND) + set(WrapOpenSSL_FOUND ON) + + add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED) +- target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL) ++ target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL ${OPENSSL_DEPENDENCIES}) + endif() + + include(FindPackageHandleStandardArgs) +diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake +index 2cf6caca19..23dc161e4c 100644 +--- a/cmake/FindWrapSystemFreetype.cmake ++++ b/cmake/FindWrapSystemFreetype.cmake +@@ -44,7 +44,7 @@ find_package_handle_standard_args(WrapSystemFreetype + if(WrapSystemFreetype_FOUND) + add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED) + target_link_libraries(WrapSystemFreetype::WrapSystemFreetype +- INTERFACE "${__freetype_target_name}") ++ INTERFACE "${__freetype_target_name}" ${FREETYPE_DEPENDENCIES}) + endif() + unset(__freetype_target_name) + unset(__freetype_found) +diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake +index 3cb44aa766..9dc741b2be 100644 +--- a/cmake/FindWrapSystemHarfbuzz.cmake ++++ b/cmake/FindWrapSystemHarfbuzz.cmake +@@ -54,7 +54,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz + if(WrapSystemHarfbuzz_FOUND) + add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED) + target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz +- INTERFACE "${__harfbuzz_target_name}") ++ INTERFACE "${__harfbuzz_target_name}" ${HARFBUZZ_DEPENDENCIES}) + endif() + unset(__harfbuzz_target_name) + unset(__harfbuzz_found) +diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake +index 372a064ff4..a363bfd31b 100644 +--- a/cmake/FindWrapSystemPNG.cmake ++++ b/cmake/FindWrapSystemPNG.cmake +@@ -33,7 +33,7 @@ find_package_handle_standard_args(WrapSystemPNG + if(WrapSystemPNG_FOUND) + add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED) + target_link_libraries(WrapSystemPNG::WrapSystemPNG +- INTERFACE "${__png_target_name}") ++ INTERFACE "${__png_target_name}" ${LIBPNG_DEPENDENCIES}) + endif() + unset(__png_target_name) + unset(__png_found) +diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt +index 62e9619d16..939163bde7 100644 +--- a/src/plugins/sqldrivers/psql/CMakeLists.txt ++++ b/src/plugins/sqldrivers/psql/CMakeLists.txt +@@ -19,7 +19,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES +- PostgreSQL::PostgreSQL ++ PostgreSQL::PostgreSQL ${POSTGRESQL_DEPENDENCIES} + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +-- +2.29.2 + diff --git a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch new file mode 100644 index 00000000..9b3baf06 --- /dev/null +++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -0,0 +1,37 @@ +From 0f92aeca18858e11ddaa25b7cdad7d89303052ea Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Mon, 2 Nov 2020 13:47:45 +0100 +Subject: [PATCH 5/5] Fix libjpeg workaround for conflict with rpcndr.h + +Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of +libjpeg seems to take care of the conflict already as long as jconfig.h is +included before jmorecfg.h. + +Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e +--- + src/plugins/imageformats/jpeg/qjpeghandler.cpp | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp +index 29bf5ab589..dc336f156a 100644 +--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp ++++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp +@@ -61,14 +61,8 @@ + + // including jpeglib.h seems to be a little messy + extern "C" { +-// jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with +-// some Windows headers that may or may not have been included +-#ifdef HAVE_BOOLEAN +-# undef HAVE_BOOLEAN +-#endif +-#define boolean jboolean +- + #define XMD_H // shut JPEGlib up ++#include // ensure jconfig.h is included before jmorecfg.h + #include + #ifdef const + # undef const // remove crazy C hackery in jconfig.h +-- +2.29.2 + diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD index 16bf59aa..9fe97e63 100644 --- a/qt6-base/mingw-w64/PKGBUILD +++ b/qt6-base/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -21,7 +21,7 @@ pkgdesc='A cross-platform application and UI framework (mingw-w64)' depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite' 'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' 'mingw-w64-brotli' 'mingw-w64-pcre2' 'mingw-w64-zstd') -makedepends=('mingw-w64-cmake' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' +makedepends=('mingw-w64-cmake>=1-35' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-pkg-config' 'qt6-base' 'ninja') optdepends=('mingw-w64-postgresql: PostgreSQL driver' @@ -32,10 +32,16 @@ groups=(mingw-w64-qt6) _pkgfqn="qtbase-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" '0001-Use-CMake-s-default-import-library-suffix.patch' - '0002-Fix-finding-D-Bus.patch') -sha256sums=('1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e' - '10ea48221878769b7bd50328f31f16effc6789d92dd91e9cb22c0acb77ca6095' - '35ef8ed4f01727ef4a56b856fd91e33fd7f93e5f2813b308872231d182c5df8f') + '0002-Fix-finding-D-Bus.patch' + '0003-Fix-using-static-PCRE2-and-DBus-1.patch' + '0004-Fix-transitive-dependencies-of-static-libraries.patch' + '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch') +sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268' + '7efec2be97836e6b6a2566e297650765db36af4812f10d98702b97f29e40de91' + '4135f261ee759744549c2c6dc42180a8394235f96b750cca82d98a0d5884d6c7' + '0d6ea42b1c302fb3b219dbd9be854045070cf9c67e039a7d248c6e632750e446' + 'fb2a34d4557abb4dae23f2926914322d1fddecc2668ed970aad461b5ead01ab6' + '875c6065b1b53753d8e481a972b07027c093e8e84ed550fe34df8d6fd91c4643') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -53,7 +59,6 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ -DFEATURE_pkg_config=ON \ -DFEATURE_system_pcre2=ON \ -DFEATURE_system_freetype=ON \ @@ -66,11 +71,7 @@ build() { -DINSTALL_INCLUDEDIR=include/qt6 \ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \ - -DINPUT_openssl=runtime \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" \ - -DMySQL_LIBRARIES="/usr/$_arch/lib/libmariadb.dll.a" \ - -DMySQL_INCLUDE_DIRS="/usr/$_arch/include/mariadb" + -DINPUT_openssl=runtime VERBOSE=1 cmake --build build-$_arch done } diff --git a/qt6-base/mingw-w64/qtbase-sha256.txt b/qt6-base/mingw-w64/qtbase-sha256.txt index 31da929c..5057e6d9 100644 --- a/qt6-base/mingw-w64/qtbase-sha256.txt +++ b/qt6-base/mingw-w64/qtbase-sha256.txt @@ -1 +1 @@ -1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e +37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 diff --git a/qt6-declarative/default/PKGBUILD b/qt6-declarative/default/PKGBUILD index 5a696b43..e6f43e0c 100644 --- a/qt6-declarative/default/PKGBUILD +++ b/qt6-declarative/default/PKGBUILD @@ -5,7 +5,7 @@ # you also find the URL of a binary repository. pkgname=qt6-declarative -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ makedepends=(cmake python vulkan-headers at-spi2-core ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da') +sha256sums=('fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-declarative/default/PKGBUILD.sh.ep b/qt6-declarative/default/PKGBUILD.sh.ep index 0eced0bd..17bb331b 100644 --- a/qt6-declarative/default/PKGBUILD.sh.ep +++ b/qt6-declarative/default/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Based on: AUR package qt6-declarative-git, official qt5-declarative package % end \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-declarative/default/qtdeclarative-sha256.txt b/qt6-declarative/default/qtdeclarative-sha256.txt index e5d9460e..b5875011 100644 --- a/qt6-declarative/default/qtdeclarative-sha256.txt +++ b/qt6-declarative/default/qtdeclarative-sha256.txt @@ -1 +1 @@ -3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da +fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279 diff --git a/qt6-declarative/mingw-w64/PKGBUILD b/qt6-declarative/mingw-w64/PKGBUILD index e40d0820..f23bbffc 100644 --- a/qt6-declarative/mingw-w64/PKGBUILD +++ b/qt6-declarative/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-declarative -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtdeclarative-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da') +sha256sums=('fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -26,10 +26,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep index 81b8f6b6..94d8bb0f 100644 --- a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt index e5d9460e..b5875011 100644 --- a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt @@ -1 +1 @@ -3b39ccda6dc16a88890c5861b67911eb32bd11857e7e5281b15f43694069a4da +fe9a05ad73f988f512ed977e0da18164a41c9ee79249b6c63e835a7c5552d279 diff --git a/qt6-imageformats/default/PKGBUILD b/qt6-imageformats/default/PKGBUILD index 5cd666e6..87851fef 100644 --- a/qt6-imageformats/default/PKGBUILD +++ b/qt6-imageformats/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-imageformats -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -18,7 +18,7 @@ depends=(qt6-base jasper libwebp) makedepends=(cmake ninja git) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" -source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=9d2f8c3f0825f8114a2a916dd8e305f9848d2653") +source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=c98a77599e01b14064277a2da4c26322bd750f54") sha256sums=('SKIP') build() { diff --git a/qt6-imageformats/default/PKGBUILD.sh.ep b/qt6-imageformats/default/PKGBUILD.sh.ep index 04d6b020..1702b651 100644 --- a/qt6-imageformats/default/PKGBUILD.sh.ep +++ b/qt6-imageformats/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ -% layout 'qt6-module', git_commit => '9d2f8c3f0825f8114a2a916dd8e305f9848d2653'; +% layout 'qt6-module', git_commit => 'c98a77599e01b14064277a2da4c26322bd750f54'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-imageformats/default/qtimageformats-sha256.txt b/qt6-imageformats/default/qtimageformats-sha256.txt new file mode 100644 index 00000000..cc2ecb63 --- /dev/null +++ b/qt6-imageformats/default/qtimageformats-sha256.txt @@ -0,0 +1 @@ +SKIP diff --git a/qt6-imageformats/mingw-w64/PKGBUILD b/qt6-imageformats/mingw-w64/PKGBUILD index 6395f7da..4eeef6b0 100644 --- a/qt6-imageformats/mingw-w64/PKGBUILD +++ b/qt6-imageformats/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-imageformats -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -19,7 +19,7 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja' 'git') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtimageformats-everywhere-src-${_qtver}" -source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=9d2f8c3f0825f8114a2a916dd8e305f9848d2653") +source=("$_pkgfqn::git://code.qt.io/qt/qtimageformats.git#commit=c98a77599e01b14064277a2da4c26322bd750f54") sha256sums=('SKIP') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -28,10 +28,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep index 6492a471..6e3ce038 100644 --- a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ -% layout 'mingw-w64-qt6-module', git_commit => '9d2f8c3f0825f8114a2a916dd8e305f9848d2653'; +% layout 'mingw-w64-qt6-module', git_commit => 'c98a77599e01b14064277a2da4c26322bd750f54'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt new file mode 100644 index 00000000..cc2ecb63 --- /dev/null +++ b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt @@ -0,0 +1 @@ +SKIP diff --git a/qt6-quick3d/default/PKGBUILD b/qt6-quick3d/default/PKGBUILD index ab879898..953dcf41 100644 --- a/qt6-quick3d/default/PKGBUILD +++ b/qt6-quick3d/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-quick3d -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ optdepends=('assimp: Import from assimp') groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10') +sha256sums=('dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-quick3d/default/PKGBUILD.sh.ep b/qt6-quick3d/default/PKGBUILD.sh.ep index ea244c7a..97b40e86 100644 --- a/qt6-quick3d/default/PKGBUILD.sh.ep +++ b/qt6-quick3d/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-quick3d/default/qtquick3d-sha256.txt b/qt6-quick3d/default/qtquick3d-sha256.txt index 3ea53ded..28b32c3c 100644 --- a/qt6-quick3d/default/qtquick3d-sha256.txt +++ b/qt6-quick3d/default/qtquick3d-sha256.txt @@ -1 +1 @@ -a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10 +dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39 diff --git a/qt6-quick3d/mingw-w64/PKGBUILD b/qt6-quick3d/mingw-w64/PKGBUILD index 91818e1e..d39339b1 100644 --- a/qt6-quick3d/mingw-w64/PKGBUILD +++ b/qt6-quick3d/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quick3d -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquick3d-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10') +sha256sums=('dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -26,10 +26,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep index 17f058af..d5d6f6f9 100644 --- a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt index 3ea53ded..28b32c3c 100644 --- a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt @@ -1 +1 @@ -a0620da8808995304298aac6c7f47910f3af5282c734df1a9648b52a63a3fb10 +dc9c01ca7a88e4fe274fa6f8aa08736821dc5663538e8250038dacffbf9ddd39 diff --git a/qt6-quickcontrols2/default/PKGBUILD b/qt6-quickcontrols2/default/PKGBUILD index a0511797..4363977d 100644 --- a/qt6-quickcontrols2/default/PKGBUILD +++ b/qt6-quickcontrols2/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-quickcontrols2 -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2') +sha256sums=('7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-quickcontrols2/default/PKGBUILD.sh.ep b/qt6-quickcontrols2/default/PKGBUILD.sh.ep index cc53fcc6..60431c1f 100644 --- a/qt6-quickcontrols2/default/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt index c3f8c044..91876223 100644 --- a/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/default/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2 +7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846 diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD b/qt6-quickcontrols2/mingw-w64/PKGBUILD index ffd55d0c..b493f3e0 100644 --- a/qt6-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quickcontrols2 -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2') +sha256sums=('7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -25,10 +25,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep b/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep index 1108e7e7..6c953ada 100644 --- a/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt index c3f8c044..91876223 100644 --- a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -e83603935cd73d41bee5ee4581c7573f93b8d1a17e6c71168eccaee40a13bcc2 +7a36413613b6173ec92b42ef012f33b16686333c39fd5e064482774a17111846 diff --git a/qt6-quicktimeline/default/PKGBUILD b/qt6-quicktimeline/default/PKGBUILD index c8872a24..a37d27a8 100644 --- a/qt6-quicktimeline/default/PKGBUILD +++ b/qt6-quicktimeline/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-quicktimeline -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b') +sha256sums=('7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-quicktimeline/default/PKGBUILD.sh.ep b/qt6-quicktimeline/default/PKGBUILD.sh.ep index 96cc1a24..3db5af05 100644 --- a/qt6-quicktimeline/default/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-quicktimeline/default/qtquicktimeline-sha256.txt b/qt6-quicktimeline/default/qtquicktimeline-sha256.txt index bcf7ac02..cca246dc 100644 --- a/qt6-quicktimeline/default/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/default/qtquicktimeline-sha256.txt @@ -1 +1 @@ -2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b +7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89 diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD b/qt6-quicktimeline/mingw-w64/PKGBUILD index 2f60810b..83240ae1 100644 --- a/qt6-quicktimeline/mingw-w64/PKGBUILD +++ b/qt6-quicktimeline/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quicktimeline -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b') +sha256sums=('7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -25,10 +25,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep b/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep index f2f12b7e..767698df 100644 --- a/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt index bcf7ac02..cca246dc 100644 --- a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt @@ -1 +1 @@ -2544f54716ae7db3803f974360b7e299bbddc16e6f6b32dfabd19e876c79ba0b +7c98beed81d17f153e997448be264d20453fc1eafa3f3fbbdb1080b3e3e07e89 diff --git a/qt6-shadertools/default/PKGBUILD b/qt6-shadertools/default/PKGBUILD index dea755ed..4a643e56 100644 --- a/qt6-shadertools/default/PKGBUILD +++ b/qt6-shadertools/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-shadertools -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd') +sha256sums=('19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-shadertools/default/PKGBUILD.sh.ep b/qt6-shadertools/default/PKGBUILD.sh.ep index b7d58ea1..3bc2b3e3 100644 --- a/qt6-shadertools/default/PKGBUILD.sh.ep +++ b/qt6-shadertools/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-shadertools/default/qtshadertools-sha256.txt b/qt6-shadertools/default/qtshadertools-sha256.txt index ab961de6..bbf880c5 100644 --- a/qt6-shadertools/default/qtshadertools-sha256.txt +++ b/qt6-shadertools/default/qtshadertools-sha256.txt @@ -1 +1 @@ -2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd +19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728 diff --git a/qt6-shadertools/mingw-w64/PKGBUILD b/qt6-shadertools/mingw-w64/PKGBUILD index 28e99afd..51d8e020 100644 --- a/qt6-shadertools/mingw-w64/PKGBUILD +++ b/qt6-shadertools/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-shadertools -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd') +sha256sums=('19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -26,10 +26,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep b/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep index ff529f00..14797650 100644 --- a/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt index ab961de6..bbf880c5 100644 --- a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt @@ -1 +1 @@ -2fe748a0a9106933c1520e882367d384b5766c7c6cb37e331243eedf8e545ddd +19b0aad551711bacca19bd8184128ab38b62c62768ec694f5fa22e0e068d1728 diff --git a/qt6-svg/default/PKGBUILD b/qt6-svg/default/PKGBUILD index 75d0553f..718dd57d 100644 --- a/qt6-svg/default/PKGBUILD +++ b/qt6-svg/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-svg -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a') +sha256sums=('4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-svg/default/PKGBUILD.sh.ep b/qt6-svg/default/PKGBUILD.sh.ep index 12e417d4..702eacde 100644 --- a/qt6-svg/default/PKGBUILD.sh.ep +++ b/qt6-svg/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-svg/default/qtsvg-sha256.txt b/qt6-svg/default/qtsvg-sha256.txt index 1ba95665..78fae6f7 100644 --- a/qt6-svg/default/qtsvg-sha256.txt +++ b/qt6-svg/default/qtsvg-sha256.txt @@ -1 +1 @@ -0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a +4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011 diff --git a/qt6-svg/mingw-w64-static/PKGBUILD b/qt6-svg/mingw-w64-static/PKGBUILD new file mode 100644 index 00000000..df2fecb5 --- /dev/null +++ b/qt6-svg/mingw-w64-static/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Martchus + +# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where +# you also find the URL of a binary repository. + +pkgname=mingw-w64-qt6-svg-static +_qtver=6.0.0-beta3 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(any) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Classes for displaying the contents of SVG files (mingw-w64)' +depends=('mingw-w64-qt6-base-static') +makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja') +options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') +groups=(mingw-w64-qt6) +_pkgfqn="qtsvg-everywhere-src-${_qtver}" +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011') + +_architectures='i686-w64-mingw32 x86_64-w64-mingw32' + +build() { + for _arch in ${_architectures}; do + export PKG_CONFIG=/usr/bin/$_arch-pkg-config + $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \ + -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \ + -DFEATURE_pkg_config=ON + cmake --build build-$_arch + done +} + +package() { + for _arch in ${_architectures}; do + DESTDIR="$pkgdir" cmake --install build-$_arch + + find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \; + find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \; + find "$pkgdir/usr/$_arch" -iname '*.a' -exec $_arch-strip -g {} \; + done + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/mingw-w64-qt6-base "$pkgdir"/usr/share/licenses/mingw-w64-qt6-svg +} + diff --git a/qt6-svg/mingw-w64-static/PKGBUILD.sh.ep b/qt6-svg/mingw-w64-static/PKGBUILD.sh.ep new file mode 100644 index 00000000..87756da4 --- /dev/null +++ b/qt6-svg/mingw-w64-static/PKGBUILD.sh.ep @@ -0,0 +1 @@ +%= include "$default_package_name/mingw-w64/PKGBUILD"; diff --git a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt new file mode 100644 index 00000000..78fae6f7 --- /dev/null +++ b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt @@ -0,0 +1 @@ +4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011 diff --git a/qt6-svg/mingw-w64/PKGBUILD b/qt6-svg/mingw-w64/PKGBUILD index f962ed4a..e519197f 100644 --- a/qt6-svg/mingw-w64/PKGBUILD +++ b/qt6-svg/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-svg -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a') +sha256sums=('4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -25,10 +25,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-svg/mingw-w64/PKGBUILD.sh.ep b/qt6-svg/mingw-w64/PKGBUILD.sh.ep index 8340ef2e..2813e23b 100644 --- a/qt6-svg/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-svg/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-svg/mingw-w64/qtsvg-sha256.txt b/qt6-svg/mingw-w64/qtsvg-sha256.txt index 1ba95665..78fae6f7 100644 --- a/qt6-svg/mingw-w64/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64/qtsvg-sha256.txt @@ -1 +1 @@ -0f983d1912673e54f2de6f197fd5c623612c106ff1caac0037f17da7a9422a0a +4006d5cdbeb805bb97f4f7c38604e075022a8baca0f640287e2139ead96bc011 diff --git a/qt6-tools/default/PKGBUILD b/qt6-tools/default/PKGBUILD index e0d1698a..293ee6a3 100644 --- a/qt6-tools/default/PKGBUILD +++ b/qt6-tools/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-tools -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ optdepends=('clang: for qdoc and lupdate') groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862') +sha256sums=('8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-tools/default/PKGBUILD.sh.ep b/qt6-tools/default/PKGBUILD.sh.ep index fc1fb918..98871987 100644 --- a/qt6-tools/default/PKGBUILD.sh.ep +++ b/qt6-tools/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module', has_binaries => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-tools/default/qttools-sha256.txt b/qt6-tools/default/qttools-sha256.txt index 38f7f27a..06b3bacb 100644 --- a/qt6-tools/default/qttools-sha256.txt +++ b/qt6-tools/default/qttools-sha256.txt @@ -1 +1 @@ -06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862 +8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8 diff --git a/qt6-tools/mingw-w64/PKGBUILD b/qt6-tools/mingw-w64/PKGBUILD index e2f32d42..762eef60 100644 --- a/qt6-tools/mingw-w64/PKGBUILD +++ b/qt6-tools/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-tools -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862') +sha256sums=('8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -25,10 +25,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-tools/mingw-w64/PKGBUILD.sh.ep b/qt6-tools/mingw-w64/PKGBUILD.sh.ep index 5c6d0f13..49073c01 100644 --- a/qt6-tools/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-tools/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', has_binaries => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-tools/mingw-w64/qttools-sha256.txt b/qt6-tools/mingw-w64/qttools-sha256.txt index 38f7f27a..06b3bacb 100644 --- a/qt6-tools/mingw-w64/qttools-sha256.txt +++ b/qt6-tools/mingw-w64/qttools-sha256.txt @@ -1 +1 @@ -06f41e6c50bcb0e278cc69d2cae9ad06a06a45ca2ed5939ccd93e101d6ebe862 +8409de28939c79dc3eb2d1bb8bac085f35f3dcc35df107633b474733aa33bba8 diff --git a/qt6-translations/default/PKGBUILD b/qt6-translations/default/PKGBUILD index de700697..8746fa12 100644 --- a/qt6-translations/default/PKGBUILD +++ b/qt6-translations/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-translations -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,7 +16,7 @@ makedepends=(cmake qt6-tools ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073') +sha256sums=('d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-translations/default/PKGBUILD.sh.ep b/qt6-translations/default/PKGBUILD.sh.ep index e78d951c..6a9df89b 100644 --- a/qt6-translations/default/PKGBUILD.sh.ep +++ b/qt6-translations/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module', no_libs => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/default/qttranslations-sha256.txt b/qt6-translations/default/qttranslations-sha256.txt index 55bf189a..67b7fa73 100644 --- a/qt6-translations/default/qttranslations-sha256.txt +++ b/qt6-translations/default/qttranslations-sha256.txt @@ -1 +1 @@ -600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073 +d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f diff --git a/qt6-translations/mingw-w64/PKGBUILD b/qt6-translations/mingw-w64/PKGBUILD index 45628f51..a4eab7ec 100644 --- a/qt6-translations/mingw-w64/PKGBUILD +++ b/qt6-translations/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-translations -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttranslations-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073') +sha256sums=('d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -25,10 +25,7 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ - -DFEATURE_pkg_config=ON \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" + -DFEATURE_pkg_config=ON cmake --build build-$_arch done } diff --git a/qt6-translations/mingw-w64/PKGBUILD.sh.ep b/qt6-translations/mingw-w64/PKGBUILD.sh.ep index b70885d9..895cd9b9 100644 --- a/qt6-translations/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-translations/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', no_libs => 1; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/mingw-w64/qttranslations-sha256.txt b/qt6-translations/mingw-w64/qttranslations-sha256.txt index 55bf189a..67b7fa73 100644 --- a/qt6-translations/mingw-w64/qttranslations-sha256.txt +++ b/qt6-translations/mingw-w64/qttranslations-sha256.txt @@ -1 +1 @@ -600b4fd8fc9c8d27dc7f9bd18d2665fe4e02ede3a71967950fde6ffd82cd2073 +d3c661d33964f797794058af5fa593774f96b06cf2126b1a868839727b4d670f diff --git a/qt6-wayland/default/PKGBUILD b/qt6-wayland/default/PKGBUILD index 4b1bb468..df7674d6 100644 --- a/qt6-wayland/default/PKGBUILD +++ b/qt6-wayland/default/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=qt6-wayland -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ makedepends=(cmake vulkan-headers ninja) groups=(qt6) _pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0cab045e46a2966e1cd043e4453dedc1d29ccc1d8e748a4d3b5ee721b4c29786') +sha256sums=('29d106a0eaecf1976b319e7fef30c8ef7b52260d56384046ac477f6974de37a3') build() { cmake -G Ninja -B build -S $_pkgfqn diff --git a/qt6-wayland/default/PKGBUILD.sh.ep b/qt6-wayland/default/PKGBUILD.sh.ep index 5aa01fec..a9c96bab 100644 --- a/qt6-wayland/default/PKGBUILD.sh.ep +++ b/qt6-wayland/default/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'qt6-module'; \ -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) diff --git a/qt6-wayland/default/qtwayland-sha256.txt b/qt6-wayland/default/qtwayland-sha256.txt index 5bc9cee0..56bf5f92 100644 --- a/qt6-wayland/default/qtwayland-sha256.txt +++ b/qt6-wayland/default/qtwayland-sha256.txt @@ -1 +1 @@ -0cab045e46a2966e1cd043e4453dedc1d29ccc1d8e748a4d3b5ee721b4c29786 +29d106a0eaecf1976b319e7fef30c8ef7b52260d56384046ac477f6974de37a3