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

[Jan Steffens]

    Date: Monday, February 14, 2022 @ 20:32:40
  Author: heftig
Revision: 437229

archrelease: copy trunk to extra-x86_64

Added:
  gedit/repos/extra-x86_64/PKGBUILD
    (from rev 437228, gedit/trunk/PKGBUILD)
Deleted:
  gedit/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  103 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 54 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-14 20:30:57 UTC (rev 437228)
+++ PKGBUILD	2022-02-14 20:32:40 UTC (rev 437229)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gedit
-pkgver=40.1
-pkgrel=3
-pkgdesc="GNOME Text Editor"
-url="https://wiki.gnome.org/Apps/Gedit"
-arch=(x86_64)
-license=(GPL)
-depends=(gtksourceview4 gsettings-desktop-schemas libpeas gspell python-gobject
-         dconf tepl)
-makedepends=(yelp-tools vala gobject-introspection git gtk-doc meson
-             appstream-glib desktop-file-utils libxml2)
-optdepends=('gedit-plugins: Additional features')
-conflicts=('gedit-code-assistance<=3.16.0+4+gd19b879-1')
-groups=(gnome)
-_commit=269e3a075c0c94edd6a5007fc6dfac27d5cca606  # tags/40.1^0
-source=("git+https://gitlab.gnome.org/GNOME/gedit.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  git submodule init
-  git submodule set-url subprojects/libgd "$srcdir/libgd"
-  git submodule update
-}
-
-build() {
-  arch-meson $pkgname build \
-    -D gtk_doc=true \
-    -D require_all_tests=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: gedit/repos/extra-x86_64/PKGBUILD (from rev 437228, gedit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-14 20:32:40 UTC (rev 437229)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gedit
+pkgver=41.0
+pkgrel=1
+pkgdesc="GNOME Text Editor"
+url="https://wiki.gnome.org/Apps/Gedit"
+arch=(x86_64)
+license=(GPL)
+depends=(gtksourceview4 gsettings-desktop-schemas libpeas gspell python-gobject
+         dconf)
+makedepends=(yelp-tools vala gobject-introspection git gtk-doc meson
+             appstream-glib desktop-file-utils libxml2)
+optdepends=('gedit-plugins: Additional features')
+conflicts=('gedit-code-assistance<=3.16.0+4+gd19b879-1')
+groups=(gnome)
+_commit=71aedf66799123fab9289157014ff954add61ac5  # tags/41.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gedit.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git")
+sha256sums=('SKIP'
+            'SKIP')
+
+pkgver() {
+  cd gedit
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd gedit
+
+  # Versioning fixes
+  git cherry-pick -n e85890b64edee45e479eb6411735510d00610b0d
+  git tag -d 41
+
+  git submodule init
+  git submodule set-url subprojects/libgd "$srcdir/libgd"
+  git submodule update
+}
+
+build() {
+  arch-meson gedit build \
+    -D gtk_doc=true \
+    -D require_all_tests=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}