diff options
author | mydongistiny | 2016-12-25 22:54:27 -0800 |
---|---|---|
committer | mydongistiny | 2016-12-25 22:54:27 -0800 |
commit | 18803f7b6ce1e6ba21f0dcd871bb93144d2b1dfc (patch) | |
tree | 49717490f300bb53864f702facb98eb3d3beb1b8 | |
parent | 92124ab7ace10da48601f84f9fd417f56a69374c (diff) | |
download | aur-18803f7b6ce1e6ba21f0dcd871bb93144d2b1dfc.tar.gz |
3.17.0
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 24 |
2 files changed, 22 insertions, 22 deletions
@@ -1,29 +1,27 @@ pkgbase = meld-dev pkgdesc = Visual diff and merge tool - pkgver = 3.16.0 - pkgrel = 2 + pkgver = 3.17.0 + pkgrel = 1 url = http://meldmerge.org/ install = meld.install arch = any license = GPL makedepends = intltool makedepends = gnome-doc-utils - makedepends = git makedepends = itstool - depends = python2 + depends = python>=3.3 depends = gtk3>=3.6 - depends = glib2>=2.34 - depends = python2-gobject>=3.6 - depends = pygobject-devel>=3.6 - depends = gtksourceview3>=3.6 + depends = glib2>=2.36 + depends = python2-gobject>=3.14 + depends = pygobject-devel>=3.14 + depends = python-cairo>=1.10.0-6 optdepends = python2-dbus: open a new tab in an already running instance - optdepends = python2-gconf: gnome integration provides = meld conflicts = meld meld-git replaces = meld meld-git options = !emptydirs - source = http://ftp.gnome.org/pub/GNOME/sources/meld/3.16/meld-3.16.0.tar.xz - sha1sums = 12cd5074ad23650776334cf3d1f2d803d5f2db97 + source = http://download.gnome.org/sources/meld/3.17/meld-3.17.0.tar.xz + sha1sums = 8370038f6884a864e7fb8f4bfd2a9bf0fde60a81 pkgname = meld-dev @@ -2,8 +2,8 @@ _pkgname=meld pkgname=$_pkgname-dev -pkgver=3.16.0 -pkgrel=2 +pkgver=3.17.0 +pkgrel=1 pkgdesc='Visual diff and merge tool' url='http://meldmerge.org/' license=(GPL) @@ -11,16 +11,18 @@ arch=(any) conflicts=('meld','meld-git') replaces=('meld','meld-git') provides=('meld') -makedepends=(intltool itstool) +makedepends=('intltool' 'gnome-doc-utils' 'itstool') install=meld.install -depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme desktop-file-utils - gsettings-desktop-schemas) +depends=('python>=3.3' + 'gtk3>=3.6' + 'glib2>=2.36' + 'python-gobject>=3.14' + 'pygobject-devel>=3.14' + 'gtksourceview3>=3.14' + 'python-cairo>=1.10.0-6') optdepends=('python2-dbus: open a new tab in an already running instance') source=("https://download.gnome.org/sources/$_pkgname/${pkgver%.*}/meld-${pkgver}.tar.xz") -sha1sums=('12cd5074ad23650776334cf3d1f2d803d5f2db97') - -# Meld does not support Python 3. The build succeeds, but -# the main executable checks the version and errors out. +sha1sums=('8370038f6884a864e7fb8f4bfd2a9bf0fde60a81') prepare() { cd $_pkgname-$pkgver @@ -28,12 +30,12 @@ prepare() { build() { cd $_pkgname-$pkgver - python2 setup.py build + python3 setup.py build } package() { cd $_pkgname-$pkgver # using --skip-build breaks install - python2 setup.py --no-update-icon-cache --no-compile-schemas \ + python3 setup.py --no-update-icon-cache --no-compile-schemas \ install --prefix=/usr --root="$pkgdir" --optimize=1 } |