3.17.0

2 files changed, 22 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63bebf2776fd..4706c6fb6358 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
 
diff --git a/PKGBUILD b/PKGBUILD
index bd339158354c..ed66adba8bb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
 }