Merge pull request #10424 from dennisameling/gtk3-arm64

gtk2 + gtk3 (and deps): enable for clangarm64
2021-12-31 19:22:59 -08:00
parent aedacb520d 1dd8ba7fee
commit e7d687bbc0
19 changed files with 67 additions and 23 deletions
--- a/mingw-w64-adwaita-icon-theme/PKGBUILD
+++ b/mingw-w64-adwaita-icon-theme/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=41.0
 pkgrel=1
 pkgdesc="GNOME icon theme (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gnome.org"
 license=("GPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-autotools")
--- a/mingw-w64-atk/PKGBUILD
+++ b/mingw-w64-atk/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.36.0
 pkgrel=2
 pkgdesc="Interface definitions of accessibility infrastructure (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://gitlab.gnome.org/GNOME/atk"
 license=(LGPL)
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
--- a/mingw-w64-gdk-pixbuf2/PKGBUILD
+++ b/mingw-w64-gdk-pixbuf2/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.42.6
 pkgrel=2
 pkgdesc="An image loading library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
 license=(LGPL2.1)
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
--- a/mingw-w64-giflib/PKGBUILD
+++ b/mingw-w64-giflib/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.2.1
 pkgrel=3
 pkgdesc="A library for reading and writing gif images (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://sourceforge.net/projects/giflib"
 license=("MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "xmlto")
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.24.33
 pkgrel=4
 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtk.org/"

 # According to gtk/gtk.h, this is either LGPL2+ or LGPL2.1+, if that makes any
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.24.31
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtk.org/"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
--- a/mingw-w64-hicolor-icon-theme/PKGBUILD
+++ b/mingw-w64-hicolor-icon-theme/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.17
 pkgrel=2
 pkgdesc="Freedesktop.org Hicolor icon theme (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://wiki.freedesktop.org/www/Software/icon-theme/"
 license=("GPL2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools")
--- a/mingw-w64-jbigkit/PKGBUILD
+++ b/mingw-w64-jbigkit/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.1
 pkgrel=4
 pkgdesc="Data compression library/utilities for bi-level high-resolution images (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 license=(GPL2)
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
--- a/mingw-w64-json-glib/PKGBUILD
+++ b/mingw-w64-json-glib/PKGBUILD
@@ -4,9 +4,9 @@ _realname=json-glib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.6.6
-pkgrel=1
+pkgrel=2
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="JSON-GLib implements a full suite of JSON-related tools using GLib and GObject (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
@@ -33,7 +33,6 @@ build() {
  meson \
    --prefix="${MINGW_PREFIX}" \
    --buildtype plain \
-    -Ddocs=true \
    -Dman=true \
    ../${_realname}-${pkgver}

--- a/mingw-w64-lerc/PKGBUILD
+++ b/mingw-w64-lerc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.0
 pkgrel=2
 pkgdesc="Limited Error Raster Compression library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/Esri/lerc"
 license=('Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
--- a/mingw-w64-libdeflate/PKGBUILD
+++ b/mingw-w64-libdeflate/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.8
 pkgrel=2
 pkgdesc="Heavily optimized library for DEFLATE/zlib/gzip compression and decompression (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/ebiggers/libdeflate'
 license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
--- a/mingw-w64-libepoxy/PKGBUILD
+++ b/mingw-w64-libepoxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.5.9
 pkgrel=1
 pkgdesc="A library for handling OpenGL function pointer management for you (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/anholt/libepoxy"
 license=("MIT")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
--- a/mingw-w64-librsvg-2.40/PKGBUILD
+++ b/mingw-w64-librsvg-2.40/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A SVG viewing library (mingw-w64)"
 arch=('any')
 # only for arches where rust doesn't work (otherwise use librsvg)
-mingw_arch=('clang32') # and someday 'clangarm64'
+mingw_arch=('clang32' 'clangarm64')
 url="https://live.gnome.org/LibRsvg"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
--- a/mingw-w64-libsass/PKGBUILD
+++ b/mingw-w64-libsass/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.6.5
 pkgrel=1
 pkgdesc="C implementation of Sass CSS preprocessor (library) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://sass-lang.com/libsass"
 license=("MIT")
 options=('strip' 'staticlibs')
--- a/mingw-w64-libtiff/PKGBUILD
+++ b/mingw-w64-libtiff/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.3.0
 pkgrel=6
 pkgdesc="Library for manipulation of TIFF images (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://libtiff.gitlab.io/libtiff/"
 license=(MIT)
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
--- a/mingw-w64-sassc/PKGBUILD
+++ b/mingw-w64-sassc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.6.2
 pkgrel=1
 pkgdesc="C implementation of Sass CSS preprocessor (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://sass-lang.com/libsass#sassc"
 license=("MIT")
 depends=("${MINGW_PACKAGE_PREFIX}-libsass")
--- a/mingw-w64-shared-mime-info/002-fix-meson-build.patch
+++ b/mingw-w64-shared-mime-info/002-fix-meson-build.patch
@@ -0,0 +1,40 @@
+diff --unified --recursive --text --color shared-mime-info-2.1-old/data/meson.build shared-mime-info-2.1/data/meson.build
+--- shared-mime-info-2.1-old/data/meson.build	2021-12-27 20:10:18.072978600 +0100
+++ shared-mime-info-2.1/data/meson.build	2021-12-27 20:11:32.565565200 +0100
+@@ -1,20 +1,12 @@
+ 
+ install_man('update-mime-database.1')
+ 
+-freedesktop_org_xml = custom_target('freedesktop.org.xml',
+-    input : files(
+-        'freedesktop.org.xml.in',
+-        'its/shared-mime-info.its',
+-        'its/shared-mime-info.loc',
+-    ),
+freedesktop_org_xml = i18n.merge_file(
+    input: 'freedesktop.org.xml.in',
+     output: 'freedesktop.org.xml',
+-    command: [
+-        find_program('bash.exe'),
+-        '-e',
+-        meson.current_source_dir() / 'freedesktop_generate.sh',
+-        meson.source_root(),
+-        meson.build_root()
+-    ],
+    data_dirs: '.',
+    po_dir: '../po',
+    type: 'xml',
+     install: true,
+     install_dir: get_option('datadir') / 'mime' / 'packages',
+ )
+diff --unified --recursive --text --color shared-mime-info-2.1-old/meson.build shared-mime-info-2.1/meson.build
+--- shared-mime-info-2.1-old/meson.build	2020-12-31 20:12:16.000000000 +0100
+++ shared-mime-info-2.1/meson.build	2021-12-27 20:11:45.781172900 +0100
+@@ -20,7 +20,6 @@
+ ###############################################################################
+ # Find tools
+ 
+-itstool = find_program('itstool')
+ xmllint = find_program('xmllint')
+ xmlto   = find_program('xmlto')
+ 
--- a/mingw-w64-shared-mime-info/PKGBUILD
+++ b/mingw-w64-shared-mime-info/PKGBUILD
@@ -5,10 +5,10 @@ _realname=shared-mime-info
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org Shared MIME Info (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=(GPL2)
 depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
         "${MINGW_PACKAGE_PREFIX}-glib2")
@@ -20,16 +20,21 @@ install=${_realname}-${MSYSTEM}.install
 url="https://freedesktop.org/Software/shared-mime-info"
 source=(https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${pkgver}/shared-mime-info-${pkgver}.tar.bz2
        program.manifest
-        001-fix-fdo-generate.patch)
+        001-fix-fdo-generate.patch
+        002-fix-meson-build.patch)
 sha256sums=('37df6475da31a8b5fc63a54ba0770a3eefa0a708b778cb6366dccee96393cb60'
            'f93191ad3e217ef9939cf16885ffe50ce920a0b639e183e46415f10df4b4db72'
-            'e49b3232579dad5da4bbdc68980f30f7f9f36f75a32c6b6fe1357a8b788e1935')
+            'e49b3232579dad5da4bbdc68980f30f7f9f36f75a32c6b6fe1357a8b788e1935'
+            'ce2e34629e742b6d87377d09ae645ea6e19c997fc761c267266e0d0bb5e797d4')
 options=(!makeflags)

 prepare() {
  cd "${srcdir}/${_realname}-${pkgver}"

  patch -Np1 -i "${srcdir}"/001-fix-fdo-generate.patch
+  # Already fixed upstream in https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/5a406b06792e26a83c7346b3c2443c0bd8d4cdb2,
+  # just waiting for new release to be done
+  patch -Np1 -i "${srcdir}"/002-fix-meson-build.patch
 }

 build() {
--- a/mingw-w64-vala/PKGBUILD
+++ b/mingw-w64-vala/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.54.5
 pkgrel=2
 pkgdesc="Compiler for the GObject type system (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://wiki.gnome.org/Projects/Vala"
 license=("LGPL")
 makedepends=("help2man"