[arch-commits] Commit in meld/repos/extra-any (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Sunday, February 16, 2020 @ 01:10:12
  Author: heftig
Revision: 375664

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
    (from rev 375661, meld/trunk/PKGBUILD)
Deleted:
  meld/repos/extra-any/PKGBUILD

----------+
 PKGBUILD |   78 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-16 01:10:11 UTC (rev 375663)
+++ PKGBUILD	2020-02-16 01:10:12 UTC (rev 375664)
@@ -1,40 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=meld
-pkgver=3.20.1
-pkgrel=2
-pkgdesc="Compare files, directories and working copies"
-url="https://meldmerge.org/"
-license=(GPL)
-arch=(any)
-depends=(python-gobject python-cairo gtksourceview3 gsettings-desktop-schemas dconf)
-makedepends=(intltool yelp-tools git)
-_commit=9b4f890f96cbbf39dac6bda3ad438128e51f8558  # tags/3.20.1^0
-source=("git+https://gitlab.gnome.org/GNOME/meld.git#commit=$_commit")
-sha1sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git cherry-pick -n 9cb590f9804a89d8914d0d7d6c89c336f6d86d86 # Fix build with python 3.8
-}
-
-build() {
-  cd $pkgname
-  python setup.py build
-}
-
-package() {
-  cd $pkgname
-  # using --skip-build breaks install
-  python setup.py --no-update-icon-cache --no-compile-schemas \
-    install --prefix=/usr --root="$pkgdir" --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 375661, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-02-16 01:10:12 UTC (rev 375664)
@@ -0,0 +1,38 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=meld
+pkgver=3.20.2
+pkgrel=1
+pkgdesc="Compare files, directories and working copies"
+url="https://meldmerge.org/"
+license=(GPL)
+arch=(any)
+depends=(python-gobject python-cairo gtksourceview3 gsettings-desktop-schemas dconf)
+makedepends=(intltool yelp-tools git)
+_commit=92560fd8f02a91a0672b7cdd6fba7a1884ae2cc3  # tags/3.20.2^0
+source=("git+https://gitlab.gnome.org/GNOME/meld.git#commit=$_commit")
+sha1sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  cd $pkgname
+  python setup.py build
+}
+
+package() {
+  cd $pkgname
+  # using --skip-build breaks install
+  python setup.py --no-update-icon-cache --no-compile-schemas \
+    install --prefix=/usr --root="$pkgdir" --optimize=1
+}