Date: Thursday, August 6, 2020 @ 10:52:17 Author: arodseth Revision: 670840
upgpkg: diffuse 0.5.0-1 Modified: diffuse/trunk/PKGBUILD ----------+ PKGBUILD | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-06 10:52:10 UTC (rev 670839) +++ PKGBUILD 2020-08-06 10:52:17 UTC (rev 670840) @@ -4,8 +4,8 @@ # Contributor: zhuqin <zhuqi...@gmail.com> pkgname=diffuse -pkgver=0.5.0alpha7+4+g813d6e7 -pkgrel=3 +pkgver=0.5.0 +pkgrel=1 pkgdesc='Graphical tool for merging and comparing text files' arch=(any) url='https://github.com/MightyCreak/diffuse' @@ -12,25 +12,9 @@ license=(GPL) depends=(gtk3 python-cairo python-gobject) makedepends=(git) -source=("git+$url#commit=813d6e7bbac0dbcbf464951ba6b070562737ed8d" - "py.patch::$url/commit/175bbd7e79278674b97b08145b13316cf42484ad.patch") -sha256sums=('SKIP' - '8ba6a584d6fb13502501c9119fdb018bdc9e9d15c4baa59af2793f2c43cf4d35') +source=("git+$url#commit=b5ae53e79e7f7fde18fc3e9856d0bf523f4031db") # tag: v0.5.0 +sha256sums=('SKIP') -pkgver() { - cd $pkgname - 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 $pkgname python install.py --prefix=/usr --destdir="$pkgdir"