update gn

msys2 · Jan 7, 2024 · fff2fa3 · fff2fa3
1 parent bbaabb9
commit fff2fa3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/mingw-w64-angleproject/PKGBUILD b/mingw-w64-angleproject/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.1.r21358.2e285bb5
 pkgrel=5
 pkgdesc='A conformant OpenGL ES implementation for Windows, Mac, Linux, iOS and Android (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://chromium.googlesource.com/angle/angle'
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-jsoncpp"
@@ -178,8 +178,6 @@ build() {
   local _arch=x64
   if [[ ${CARCH} == aarch64 ]]; then
     _arch=arm64
-  elif [[ ${CARCH} == i686 ]]; then
-    _arch=x86
   fi
 
   local _clang=false

diff --git a/mingw-w64-gn/PKGBUILD b/mingw-w64-gn/PKGBUILD
@@ -3,19 +3,19 @@
 _realname=gn
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
-pkgver=0.2118.811d332b
+pkgver=0.2131.85944ebc
 pkgrel=1
 pkgdesc='Meta-build system that generates build files for Ninja (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://gn.googlesource.com/gn/"
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python"
              "git")
-_commit=811d332bd90551342c5cbd39e133aa276022d7f8
+_commit=85944ebc24a90ec1e489e85a46fdc68542c3146f
 source=(git+https://gn.googlesource.com/gn#commit=$_commit
         001-build-fixes.patch
         002-add-missing-header.patch

diff --git a/mingw-w64-python-skia-pathops/PKGBUILD b/mingw-w64-python-skia-pathops/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.7.4
 pkgrel=3
 pkgdesc='Python access to operations on paths using the Skia library (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/fonttools/skia-pathops"
 license=('spdx:BSD-3-Clause')
 depends=(

diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD
@@ -18,19 +18,22 @@ pkgver=$( [ -z "${_rc_no}" ] && echo ${_base_ver} || echo ${_rc_base_ver} )
 pkgrel=1
 pkgdesc="QEMU - a generic and open source machine emulator and virtualizer (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'mingw32' 'ucrt64' 'clang64' 'clangarm64')
-license=('GPL2' 'LGPL2')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+license=('spdx:GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND MIT')
 url="https://qemu.org/"
-options=('!emptydirs')
+msys2_repository_url="https://gitlab.com/qemu-project/qemu"
+msys2_references=(
+  'archlinux: qemu'
+)
 makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-meson"
+  "${MINGW_PACKAGE_PREFIX}-autotools"
   "${MINGW_PACKAGE_PREFIX}-ninja"
   "${MINGW_PACKAGE_PREFIX}-python"
   "${MINGW_PACKAGE_PREFIX}-python-sphinx"
   "${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme"
-  "${MINGW_PACKAGE_PREFIX}-autotools"
-  "${MINGW_PACKAGE_PREFIX}-tools-git"
-  "${MINGW_PACKAGE_PREFIX}-cc")
+  "${MINGW_PACKAGE_PREFIX}-tools-git")
 case ${MSYSTEM} in
   CLANG*)
     # work around lack of windmc in llvm
@@ -100,6 +103,7 @@ depends=(
   "${MINGW_PACKAGE_PREFIX}-zlib"
   "${MINGW_PACKAGE_PREFIX}-zstd"
 )
+options=('!emptydirs')
 source=(
   "https://download.qemu.org/${_tarname}.tar.xz"{,.sig}
   msys2.readme.txt
@@ -136,7 +140,6 @@ enablePlugins() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -pv "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   # configure fails to create links, which can be ignored

diff --git a/mingw-w64-skia/PKGBUILD b/mingw-w64-skia/PKGBUILD
@@ -11,7 +11,7 @@ _commit="7c55be996a81ff9c5c66984c9d4ef85d12a44c8c"
 pkgrel=3
 pkgdesc="Skia is a complete 2D graphic library for drawing Text, Geometries, and Images. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://skia.org"
 license=("spdx:BSD-3-Clause")
 makedepends=(

diff --git a/mingw-w64-v8/PKGBUILD b/mingw-w64-v8/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=11.9.169.6
 pkgrel=2
 pkgdesc="Fast and modern Javascript engine (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://v8.dev"
 license=('spdx:BSD-3-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"