summaryrefslogtreecommitdiff
path: root/devel/meld
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-06-14 14:03:54 +0000
committerwiz <wiz@pkgsrc.org>2017-06-14 14:03:54 +0000
commit27e3bcde3fbb3d9deffe819c2aec09e87a83e12d (patch)
treee25df933c73a2eac888853c13a475e92f0585efb /devel/meld
parentb02d9add064426b5829e63b91435f1f9319b9612 (diff)
downloadpkgsrc-27e3bcde3fbb3d9deffe819c2aec09e87a83e12d.tar.gz
Updated meld to 3.17.2.
2017-06-11 meld 3.17.2 ====================== UI changes: * Significantly improve synchronisation of scroll bars between panes; we now try much harder to scroll all of a chunk on screen at the top and bottom of comparisons, and handle last-line-in-file cases better (Kai Willadsen) * Place the cursor at the start of a replaced chunk instead of after it; this change should improve keyboard ergonomics when doing three-way merges, but does change our existing behaviour (Kai Willadsen) * Remove Shift-based scroll locking; this was already broken by a GTK+ change, so this is just making it official (Kai Willadsen) Fixes: * Show correct column offset in status bar for tab indents (Simon Marchi) * Fix installation with a prefix for Python 3 changes (Ting-Wei Lan) * Fix initial scroll-to-first-difference behaviour to avoid a race condition if the first change was on the first line (Kai Willadsen) * Improve text wrapping behaviour in information bars, and avoid too-large allocations with long labels (Kai Willadsen) * Work around infinite re-allocation problems and silence GTK+ allocation warnings (Kai Willadsen) * Fix bad UI state when closing a single-instance activated window (Kai Willadsen) * Fix bad function call when using internal git conflict resolution (Kai Willadsen) Translations: * Anders Jonsson (sv) * Andika Triwidada (id) * Balázs Úr (hu) * Daniel Korostil (uk) * Emin Tufan Çetin (tr) * Marek Černocký (cs) * Milo Casagrande (it)
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, 9 insertions, 11 deletions
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 3903c3348ad..9930545139d 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2017/03/13 09:24:09 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2017/06/14 14:03:54 wiz Exp $
-DISTNAME= meld-3.17.1
+DISTNAME= meld-3.17.2
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 c3178834681..d9500738425 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2017/02/20 10:33:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2017/06/14 14:03:54 wiz Exp $
bin/meld
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/meld/__init__.py
@@ -133,9 +133,6 @@ ${PYSITELIB}/meld/ui/util.pyo
${PYSITELIB}/meld/ui/vcdialogs.py
${PYSITELIB}/meld/ui/vcdialogs.pyc
${PYSITELIB}/meld/ui/vcdialogs.pyo
-${PYSITELIB}/meld/ui/wraplabel.py
-${PYSITELIB}/meld/ui/wraplabel.pyc
-${PYSITELIB}/meld/ui/wraplabel.pyo
${PYSITELIB}/meld/undo.py
${PYSITELIB}/meld/undo.pyc
${PYSITELIB}/meld/undo.pyo
@@ -327,6 +324,7 @@ share/locale/sr/LC_MESSAGES/meld.mo
share/locale/sr@latin/LC_MESSAGES/meld.mo
share/locale/sv/LC_MESSAGES/meld.mo
share/locale/tr/LC_MESSAGES/meld.mo
+share/locale/uk/LC_MESSAGES/meld.mo
share/locale/vi/LC_MESSAGES/meld.mo
share/locale/zh_CN/LC_MESSAGES/meld.mo
share/locale/zh_TW/LC_MESSAGES/meld.mo
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index 50ca5f5ce52..aba81e44f58 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.50 2017/03/13 09:24:09 wiz Exp $
+$NetBSD: distinfo,v 1.51 2017/06/14 14:03:54 wiz Exp $
-SHA1 (meld-3.17.1.tar.xz) = 7c7e236452ad3c2124439d51d7b5b2ad86ae35e4
-RMD160 (meld-3.17.1.tar.xz) = 6707382cf14bd30cc6bafc02dca921a669b60c15
-SHA512 (meld-3.17.1.tar.xz) = 05a705ad52eda27aa2965e962522f926cc8c672848809d0c191c1406de3905dbf272a32cab8b20ac2261acd76a855f56e800012667b8f43b42782cce1c2f7efb
-Size (meld-3.17.1.tar.xz) = 549996 bytes
+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