[arch-commits] Commit in gnome-shell-extensions/repos/extra-any (3 files)

[Jan Steffens]

    Date: Tuesday, February 15, 2022 @ 23:00:06
  Author: heftig
Revision: 437433

archrelease: copy trunk to extra-any

Added:
  gnome-shell-extensions/repos/extra-any/PKGBUILD
    (from rev 437430, gnome-shell-extensions/trunk/PKGBUILD)
  gnome-shell-extensions/repos/extra-any/fix-build.diff
    (from rev 437430, gnome-shell-extensions/trunk/fix-build.diff)
Deleted:
  gnome-shell-extensions/repos/extra-any/PKGBUILD

----------------+
 PKGBUILD       |   95 ++++++++++++++++++++++++++++---------------------------
 fix-build.diff |   11 ++++++
 2 files changed, 61 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-15 23:00:06 UTC (rev 437432)
+++ PKGBUILD	2022-02-15 23:00:06 UTC (rev 437433)
@@ -1,45 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=gnome-shell-extensions
-pkgver=41.1
-pkgrel=1
-pkgdesc="Extensions for GNOME shell, including classic mode"
-url="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-arch=(any)
-license=(GPL)
-makedepends=(meson git sassc)
-optdepends=('gnome-menus: applications menu extension')
-groups=(gnome)
-_commit=a5b6871562e3fddfef6f662d5e57b1b24e453753  # tags/41.1^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/gnome-shell-sass.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git submodule set-url data/gnome-shell-sass "$srcdir/gnome-shell-sass"
-  git submodule update
-}
-
-build() {
-  arch-meson $pkgname build -D extension_set=all -D classic_mode=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  depends=(gnome-shell)
-
-  meson install -C build --destdir "$pkgdir"
-}

Copied: gnome-shell-extensions/repos/extra-any/PKGBUILD (from rev 437430, gnome-shell-extensions/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-15 23:00:06 UTC (rev 437433)
@@ -0,0 +1,50 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=gnome-shell-extensions
+pkgver=41.2
+pkgrel=1
+pkgdesc="Extensions for GNOME shell, including classic mode"
+url="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+arch=(any)
+license=(GPL)
+makedepends=(meson git sassc)
+optdepends=('gnome-menus: applications menu extension')
+groups=(gnome)
+_commit=1a3b4e154c2c39dfcc0d1e8abc12850383578334  # tags/41.2^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git#commit=$_commit"
+        fix-build.diff
+        "git+https://gitlab.gnome.org/GNOME/gnome-shell-sass.git")
+sha256sums=('SKIP'
+            '7350a100716dbfad48bfe15982632ac933dd7c15a2d3b73d55feefa3b5386b77'
+            'SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Fix build with Meson 0.61
+  git apply -3 ../fix-build.diff
+
+  git submodule init
+  git submodule set-url data/gnome-shell-sass "$srcdir/gnome-shell-sass"
+  git submodule update
+}
+
+build() {
+  arch-meson $pkgname build -D extension_set=all -D classic_mode=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  depends=(gnome-shell)
+
+  meson install -C build --destdir "$pkgdir"
+}

Copied: gnome-shell-extensions/repos/extra-any/fix-build.diff (from rev 437430, gnome-shell-extensions/trunk/fix-build.diff)
===================================================================
--- fix-build.diff	                        (rev 0)
+++ fix-build.diff	2022-02-15 23:00:06 UTC (rev 437433)
@@ -0,0 +1,11 @@
+diff --git i/data/meson.build w/data/meson.build
+index 27f4287..a4bcd5e 100644
+--- i/data/meson.build
++++ w/data/meson.build
+@@ -1,5 +1,5 @@
+ session_desktop = 'gnome-classic.desktop'
+-i18n.merge_file('',
++i18n.merge_file(
+   input:  session_desktop + '.in',
+   output: session_desktop,
+   po_dir: '../po',