[arch-commits] Commit in gnome-terminal/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Tuesday, February 8, 2022 @ 21:59:46
  Author: heftig
Revision: 436620

archrelease: copy trunk to extra-x86_64

Added:
  gnome-terminal/repos/extra-x86_64/PKGBUILD
    (from rev 436619, gnome-terminal/trunk/PKGBUILD)
Deleted:
  gnome-terminal/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   80 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-08 21:59:05 UTC (rev 436619)
+++ PKGBUILD	2022-02-08 21:59:46 UTC (rev 436620)
@@ -1,38 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.42.2
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-url="https://wiki.gnome.org/Apps/Terminal"
-arch=(x86_64)
-license=(GPL)
-depends=('vte3>=0.66.0' gsettings-desktop-schemas)
-makedepends=(docbook-xsl libnautilus-extension gnome-shell yelp-tools git meson)
-groups=(gnome)
-_commit=f300eed28e6755458ebaaecd9a8fe5f6b4ca29cd  # tags/3.42.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-terminal.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  arch-meson $pkgname build
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-}

Copied: gnome-terminal/repos/extra-x86_64/PKGBUILD (from rev 436619, gnome-terminal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-08 21:59:46 UTC (rev 436620)
@@ -0,0 +1,42 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-terminal
+pkgver=3.42.2
+pkgrel=2
+pkgdesc="The GNOME Terminal Emulator"
+url="https://wiki.gnome.org/Apps/Terminal"
+arch=(x86_64)
+license=(GPL)
+depends=(vte3 gsettings-desktop-schemas)
+makedepends=(docbook-xsl libnautilus-extension gnome-shell yelp-tools git meson)
+groups=(gnome)
+_commit=f300eed28e6755458ebaaecd9a8fe5f6b4ca29cd  # tags/3.42.2^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-terminal.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Fix build with meson 0.61
+  # https://bugs.archlinux.org/task/73356
+  git cherry-pick -n 9a168cc23962ce9fa106dc8a40407d381a3db403
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}