Date: Thursday, March 19, 2020 @ 15:34:35 Author: arodseth Revision: 600910
upgpkg: diffuse 0.5.0alpha7+4+g813d6e7-2 Modified: diffuse/trunk/PKGBUILD ----------+ PKGBUILD | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-19 14:15:58 UTC (rev 600909) +++ PKGBUILD 2020-03-19 15:34:35 UTC (rev 600910) @@ -1,19 +1,21 @@ -# Maintainer: Lukas Jirkovsky <[email protected]> -# Contributor: TDY <[email protected]> +# Maintainer: Alexander F. Rødseth <[email protected]> +# Contributor: Lukas Jirkovsky <[email protected]> +# Contributor: TDY <[email protected]> # Contributor: zhuqin <[email protected]> pkgname=diffuse pkgver=0.5.0alpha7+4+g813d6e7 -pkgrel=1 -pkgdesc="A graphical tool for merging and comparing text files" -arch=('any') -url="http://diffuse.sourceforge.net/"; -license=('GPL') -depends=('gtk3' 'python-gobject') -makedepends=('git') -_commit=813d6e7bbac0dbcbf464951ba6b070562737ed8d # master -source=("git+https://github.com/MightyCreak/diffuse.git#commit=$_commit";) -md5sums=('SKIP') +pkgrel=2 +pkgdesc='Graphical tool for merging and comparing text files' +arch=(any) +url='https://github.com/MightyCreak/diffuse' +license=(GPL) +depends=(gtk3 python-gobject) +makedepends=(git) +source=("git+$url#commit=813d6e7bbac0dbcbf464951ba6b070562737ed8d" + "py.patch::$url/commit/175bbd7e79278674b97b08145b13316cf42484ad.patch") +sha256sums=('SKIP' + '8ba6a584d6fb13502501c9119fdb018bdc9e9d15c4baa59af2793f2c43cf4d35') pkgver() { cd $pkgname @@ -20,7 +22,18 @@ git describe --tags | sed 's/^v//;s/-alpha\./alpha/;s/-/+/g' } +prepare() { + cd $pkgname + # Thanks Uffe Jakobsen: https://github.com/MightyCreak/diffuse/pull/27 + sed -i 's|success_results)))|success_results).decode\("utf-8", errors="ignore")))|g' \ + src/usr/bin/diffuse + # Thanks Derek Scherger: https://github.com/MightyCreak/diffuse/pull/24 + patch -p1 -i "$srcdir/py.patch" +} + package() { - cd "$srcdir/$pkgname" + cd $pkgname python install.py --prefix=/usr --destdir="$pkgdir" } + +# vim: ts=2 sw=2 et:
