summaryrefslogtreecommitdiff
path: root/devel/meld
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-08-14 20:42:33 +0000
committerwiz <wiz@pkgsrc.org>2017-08-14 20:42:33 +0000
commit8a21caa1055fb8b35c0c476426e8cb2cc0be9009 (patch)
tree3bf8591e3dc7ff3ae59ae5cf34657966f4747bae /devel/meld
parent7b64972c264c0e7c55bf7de5dea26462fce5a04e (diff)
downloadpkgsrc-8a21caa1055fb8b35c0c476426e8cb2cc0be9009.tar.gz
Updated meld to 3.17.3.
2017-08-13 meld 3.17.3 ====================== Fixes: * Fix folder compare when using text filters (Alsan Wong) * Make activity spinner show when inline comparisons are running (Kai Willadsen) * Migrate back from threads to multiprocessing for inline diffs; unusual CPU contention caused this to harm interactivity (Kai Willadsen) * Manually refreshing a file comparison sometimes caused diff navigation to break (Kai Willadsen) * Folder comparisons that update their state no longer break navigation (Kai Willadsen) * Version-control comparison on missing files now work again (Kai Willadsen) * Fix regression in initial focus for folder comparisons (Kai Willadsen) * Fix handling for added, partially staged files in git (Kai Willadsen) * Bugs fixed: 784436, 785603, 785859, 786043 Translations: * Daniel Mustieles (es) * Matej Urbančič (sl)
Diffstat (limited to 'devel/meld')
-rw-r--r--devel/meld/Makefile4
-rw-r--r--devel/meld/PLIST6
-rw-r--r--devel/meld/distinfo10
3 files changed, 12 insertions, 8 deletions
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 9930545139d..b8253714d7f 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2017/06/14 14:03:54 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2017/08/14 20:42:33 wiz Exp $
-DISTNAME= meld-3.17.2
+DISTNAME= meld-3.17.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.17/}
EXTRACT_SUFX= .tar.xz
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index d9500738425..478178c6f39 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2017/06/14 14:03:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2017/08/14 20:42:33 wiz Exp $
bin/meld
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/meld/__init__.py
@@ -52,6 +52,10 @@ ${PYSITELIB}/meld/matchers/merge.pyo
${PYSITELIB}/meld/matchers/myers.py
${PYSITELIB}/meld/matchers/myers.pyc
${PYSITELIB}/meld/matchers/myers.pyo
+${PYSITELIB}/meld/matchers/myerspy.py
+${PYSITELIB}/meld/matchers/myerspy.pyc
+${PYSITELIB}/meld/matchers/myerspy.pyo
+${PYSITELIB}/meld/matchers/myerspycmp.py
${PYSITELIB}/meld/meldapp.py
${PYSITELIB}/meld/meldapp.pyc
${PYSITELIB}/meld/meldapp.pyo
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index aba81e44f58..48504f62b91 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.51 2017/06/14 14:03:54 wiz Exp $
+$NetBSD: distinfo,v 1.52 2017/08/14 20:42:33 wiz Exp $
-SHA1 (meld-3.17.2.tar.xz) = 3751e1420284a0705f6622c6628f953758dde272
-RMD160 (meld-3.17.2.tar.xz) = a5c56dc184587d8beab04af39cadc9f5435ae1ab
-SHA512 (meld-3.17.2.tar.xz) = 3bb2dec756c361019e3269df49ea92eea17a6904ae936546ec2f136c16efb15af5d898874f8f80e9202ffb2b0c0a25c2ccdf55cc843e545c6f5e065229d34ca7
-Size (meld-3.17.2.tar.xz) = 552712 bytes
+SHA1 (meld-3.17.3.tar.xz) = 9cd6c72e8cd85017f8aae861b0aa8e3fc466d005
+RMD160 (meld-3.17.3.tar.xz) = 279839a0d8d18c4e2898efffaaed3e0dba9c0141
+SHA512 (meld-3.17.3.tar.xz) = 829c4b5e55522ad475952b212415d248eb21df9d61aabe5ca60d0db8abe456877e0d22dc145a54c047954d750e6db248284e1f7ab0f128080e8e9ec3d9fb52ef
+Size (meld-3.17.3.tar.xz) = 553772 bytes