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

[Evangelos Foutras]

    Date: Monday, August 13, 2018 @ 21:07:27
  Author: foutrelis
Revision: 331469

archrelease: copy trunk to extra-any

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

----------+
 PKGBUILD |   81 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-13 21:07:22 UTC (rev 331468)
+++ PKGBUILD	2018-08-13 21:07:27 UTC (rev 331469)
@@ -1,39 +0,0 @@
-# $Id$
-# 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.19.0
-pkgrel=2
-pkgdesc="Compare files, directories and working copies"
-url="http://meldmerge.org/"
-license=(GPL)
-arch=(any)
-depends=(python-gobject python-cairo gtksourceview3 gsettings-desktop-schemas dconf)
-makedepends=(intltool itstool git)
-_commit=7900d9ab60bb41feef236756c622918e25d1e4ba  # tags/3.19.0^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
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 331468, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-13 21:07:27 UTC (rev 331469)
@@ -0,0 +1,42 @@
+# $Id$
+# 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.19.0
+pkgrel=3
+pkgdesc="Compare files, directories and working copies"
+url="http://meldmerge.org/"
+license=(GPL)
+arch=(any)
+depends=(python-gobject python-cairo gtksourceview3 gsettings-desktop-schemas dconf)
+makedepends=(intltool itstool git)
+_commit=7900d9ab60bb41feef236756c622918e25d1e4ba  # tags/3.19.0^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
+
+  # https://gitlab.gnome.org/GNOME/meld/issues/217
+  git cherry-pick -n bdf15911
+}
+
+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
+}