CVS commit: pkgsrc/devel/meld

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 16 13:15:46 UTC 2018

Modified Files:
        pkgsrc/devel/meld: Makefile PLIST distinfo

Log Message:
meld: update to 3.19.0.

2018-03-28 meld 3.19.0
======================

  Features:

   * Initial Windows build pipeline using Appveyor (Vasily Galkin)
   * Add new per-pane status bar with selectors for syntax highlighting and
     text encoding (Kai Willadsen, with extensive testing by Vasily Galkin)
   * Allow text encoding to be chosen from file selectors (Kai Willadsen)
   * Add new go-to-line action and UI (Kai Willadsen)
   * Folder comparison now explicitly indicates symlinks in the tree, and
     shows the symlink target (Kai Willadsen)
   * Inline highlighting now draws whitespace in any changes it covers (Kai
     Willadsen)
   * Improved contrast in dark theme support (Vitalii Dmitriev)
   * Navigating between changes in file comparison now briefly animates the
     outline, to make it easier to keep track of the focus in busy
     comparisons (Kai Willadsen)

  Fixes:

   * Find bar now hides when pressing Escape (Vladimir Panteleev)
   * Handle file deletion where we can't move to trash (e.g., network mounts)
     (Kai Willadsen)
   * Guess whether we're running a dark theme, for supporting Tweak Tool
     changes (Kai Willadsen)
   * Keybindings for notebook switching work again (Kai Willadsen)
   * Significantly speed up folder and version control comparisons by limiting
     the file metadata we request (Kai Willadsen)
   * Threading fixes for more responsive highlighting and better exit handling
     (Kai Willadsen)
   * Fix memory and file handle leakage for closed comparisons (Kai Willadsen)
   * Make the --auto-compare command line flag work again (Kai Willadsen)
   * Make multiple --diff command line options work again (Kai Willadsen)
   * Fix committing selected files in Mercurial (Kai Willadsen)
   * Fix Bazaar support for our Python 3 port (Kai Willadsen)
   * Avoid a race conditon that made the "Resolve conflict" prompt unreliable
     (Kai Willadsen)
   * Fix invalid-iter crash when refreshing version control view (Kai
     Willadsen)
   * Make non-existent files writable by default (Kai Willadsen)
   * Several fixes for translations, unicode typography, and typos (Piotr Drąg)
   * Windows compatibility updates (Vasily Galkin, Kai Willadsen)
   * Windows build fixes (Vasily Galkin)
   * Add Gitlab CI for Python styling and lint, and update a lot of old code
     to match (Kai Willadsen)
   * Packaging fixes for AppStream (Balint Reczey)

  Internal changes:

   * Update GTK+ and GtkSourceView requirements to 3.20
   * Migrate recently-used handling, comparison launching, and file
     comparisons to use Gio for URI support (Chris Mayo, Kai Willadsen)
   * Migrated to GNOME Gitlab for hosting and issue tracking

   * Bugs fixed (bugzilla): 589366, 783989, 785313, 785630, 786629, 786867,
     787256, 788455, 788487, 790335, 791173
   * Issues fixed (gitlab): 46, 97, 133, 146, 151, 152, 158, 159, 161, 165


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/meld/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/meld/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.86 pkgsrc/devel/meld/Makefile:1.87
--- pkgsrc/devel/meld/Makefile:1.86     Mon Mar 12 11:16:19 2018
+++ pkgsrc/devel/meld/Makefile  Mon Apr 16 13:15:46 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2018/03/12 11:16:19 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2018/04/16 13:15:46 wiz Exp $
 
-DISTNAME=              meld-3.18.0
-PKGREVISION=           2
+DISTNAME=              meld-3.19.0
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/3.18/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            wiz%NetBSD.org@localhost
@@ -33,8 +32,8 @@ SUBST_MESSAGE.man=    Fixing man page insta
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.36.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
-BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.14
+BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.20
 .include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.14
+BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.20
 .include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/meld/PLIST
diff -u pkgsrc/devel/meld/PLIST:1.29 pkgsrc/devel/meld/PLIST:1.30
--- pkgsrc/devel/meld/PLIST:1.29        Mon Sep  4 12:19:42 2017
+++ pkgsrc/devel/meld/PLIST     Mon Apr 16 13:15:46 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2017/09/04 12:19:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.30 2018/04/16 13:15:46 wiz Exp $
 bin/meld
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/meld/__init__.py
@@ -34,6 +34,9 @@ ${PYSITELIB}/meld/filters.pyo
 ${PYSITELIB}/meld/gutterrendererchunk.py
 ${PYSITELIB}/meld/gutterrendererchunk.pyc
 ${PYSITELIB}/meld/gutterrendererchunk.pyo
+${PYSITELIB}/meld/iohelpers.py
+${PYSITELIB}/meld/iohelpers.pyc
+${PYSITELIB}/meld/iohelpers.pyo
 ${PYSITELIB}/meld/linkmap.py
 ${PYSITELIB}/meld/linkmap.pyc
 ${PYSITELIB}/meld/linkmap.pyo
@@ -91,12 +94,24 @@ ${PYSITELIB}/meld/task.pyo
 ${PYSITELIB}/meld/tree.py
 ${PYSITELIB}/meld/tree.pyc
 ${PYSITELIB}/meld/tree.pyo
+${PYSITELIB}/meld/treehelpers.py
+${PYSITELIB}/meld/treehelpers.pyc
+${PYSITELIB}/meld/treehelpers.pyo
 ${PYSITELIB}/meld/ui/__init__.py
 ${PYSITELIB}/meld/ui/__init__.pyc
 ${PYSITELIB}/meld/ui/__init__.pyo
+${PYSITELIB}/meld/ui/bufferselectors.py
+${PYSITELIB}/meld/ui/bufferselectors.pyc
+${PYSITELIB}/meld/ui/bufferselectors.pyo
+${PYSITELIB}/meld/ui/cellrenderers.py
+${PYSITELIB}/meld/ui/cellrenderers.pyc
+${PYSITELIB}/meld/ui/cellrenderers.pyo
 ${PYSITELIB}/meld/ui/emblemcellrenderer.py
 ${PYSITELIB}/meld/ui/emblemcellrenderer.pyc
 ${PYSITELIB}/meld/ui/emblemcellrenderer.pyo
+${PYSITELIB}/meld/ui/filechooser.py
+${PYSITELIB}/meld/ui/filechooser.pyc
+${PYSITELIB}/meld/ui/filechooser.pyo
 ${PYSITELIB}/meld/ui/findbar.py
 ${PYSITELIB}/meld/ui/findbar.pyc
 ${PYSITELIB}/meld/ui/findbar.pyo
@@ -112,6 +127,9 @@ ${PYSITELIB}/meld/ui/gtkcompat.pyo
 ${PYSITELIB}/meld/ui/historyentry.py
 ${PYSITELIB}/meld/ui/historyentry.pyc
 ${PYSITELIB}/meld/ui/historyentry.pyo
+${PYSITELIB}/meld/ui/listselector.py
+${PYSITELIB}/meld/ui/listselector.pyc
+${PYSITELIB}/meld/ui/listselector.pyo
 ${PYSITELIB}/meld/ui/listwidget.py
 ${PYSITELIB}/meld/ui/listwidget.pyc
 ${PYSITELIB}/meld/ui/listwidget.pyo
@@ -169,7 +187,6 @@ ${PYSITELIB}/meld/windowstate.py
 ${PYSITELIB}/meld/windowstate.pyc
 ${PYSITELIB}/meld/windowstate.pyo
 man/man1/meld.1
-share/appdata/meld.appdata.xml
 share/applications/meld.desktop
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/NEWS
@@ -190,86 +207,6 @@ share/help/C/meld/resolving-conflicts.pa
 share/help/C/meld/text-filters.page
 share/help/C/meld/vc-mode.page
 share/help/C/meld/vc-supported.page
-share/help/cs/meld/command-line.page
-share/help/cs/meld/file-changes.page
-share/help/cs/meld/file-filters.page
-share/help/cs/meld/file-mode.page
-share/help/cs/meld/flattened-view.page
-share/help/cs/meld/folder-mode.page
-share/help/cs/meld/index.page
-share/help/cs/meld/introduction.page
-share/help/cs/meld/keyboard-shortcuts.page
-share/help/cs/meld/legal.xml
-share/help/cs/meld/missing-functionality.page
-share/help/cs/meld/preferences.page
-share/help/cs/meld/resolving-conflicts.page
-share/help/cs/meld/text-filters.page
-share/help/cs/meld/vc-mode.page
-share/help/cs/meld/vc-supported.page
-share/help/de/meld/command-line.page
-share/help/de/meld/file-changes.page
-share/help/de/meld/file-filters.page
-share/help/de/meld/file-mode.page
-share/help/de/meld/flattened-view.page
-share/help/de/meld/folder-mode.page
-share/help/de/meld/index.page
-share/help/de/meld/introduction.page
-share/help/de/meld/keyboard-shortcuts.page
-share/help/de/meld/legal.xml
-share/help/de/meld/missing-functionality.page
-share/help/de/meld/preferences.page
-share/help/de/meld/resolving-conflicts.page
-share/help/de/meld/text-filters.page
-share/help/de/meld/vc-mode.page
-share/help/de/meld/vc-supported.page
-share/help/el/meld/command-line.page
-share/help/el/meld/file-changes.page
-share/help/el/meld/file-filters.page
-share/help/el/meld/file-mode.page
-share/help/el/meld/flattened-view.page
-share/help/el/meld/folder-mode.page
-share/help/el/meld/index.page
-share/help/el/meld/introduction.page
-share/help/el/meld/keyboard-shortcuts.page
-share/help/el/meld/legal.xml
-share/help/el/meld/missing-functionality.page
-share/help/el/meld/preferences.page
-share/help/el/meld/resolving-conflicts.page
-share/help/el/meld/text-filters.page
-share/help/el/meld/vc-mode.page
-share/help/el/meld/vc-supported.page
-share/help/es/meld/command-line.page
-share/help/es/meld/file-changes.page
-share/help/es/meld/file-filters.page
-share/help/es/meld/file-mode.page
-share/help/es/meld/flattened-view.page
-share/help/es/meld/folder-mode.page
-share/help/es/meld/index.page
-share/help/es/meld/introduction.page
-share/help/es/meld/keyboard-shortcuts.page
-share/help/es/meld/legal.xml
-share/help/es/meld/missing-functionality.page
-share/help/es/meld/preferences.page
-share/help/es/meld/resolving-conflicts.page
-share/help/es/meld/text-filters.page
-share/help/es/meld/vc-mode.page
-share/help/es/meld/vc-supported.page
-share/help/sv/meld/command-line.page
-share/help/sv/meld/file-changes.page
-share/help/sv/meld/file-filters.page
-share/help/sv/meld/file-mode.page
-share/help/sv/meld/flattened-view.page
-share/help/sv/meld/folder-mode.page
-share/help/sv/meld/index.page
-share/help/sv/meld/introduction.page
-share/help/sv/meld/keyboard-shortcuts.page
-share/help/sv/meld/legal.xml
-share/help/sv/meld/missing-functionality.page
-share/help/sv/meld/preferences.page
-share/help/sv/meld/resolving-conflicts.page
-share/help/sv/meld/text-filters.page
-share/help/sv/meld/vc-mode.page
-share/help/sv/meld/vc-supported.page
 share/icons/HighContrast/scalable/apps/meld.svg
 share/icons/hicolor/16x16/actions/meld-change-apply-left.png
 share/icons/hicolor/16x16/actions/meld-change-apply-right.png
@@ -350,9 +287,11 @@ share/meld/ui/application.ui
 share/meld/ui/appmenu-fallback.xml
 share/meld/ui/dirdiff-ui.xml
 share/meld/ui/dirdiff.ui
+share/meld/ui/encoding-selector.ui
 share/meld/ui/filediff-ui.xml
 share/meld/ui/filediff.ui
 share/meld/ui/findbar.ui
+share/meld/ui/language-selector.ui
 share/meld/ui/meldapp-ui.xml
 share/meld/ui/meldapp.ui
 share/meld/ui/patch-dialog.ui
@@ -361,4 +300,5 @@ share/meld/ui/shortcuts.ui
 share/meld/ui/tab-placeholder.ui
 share/meld/ui/vcview-ui.xml
 share/meld/ui/vcview.ui
+share/metainfo/meld.appdata.xml
 share/mime/packages/meld.xml

Index: pkgsrc/devel/meld/distinfo
diff -u pkgsrc/devel/meld/distinfo:1.54 pkgsrc/devel/meld/distinfo:1.55
--- pkgsrc/devel/meld/distinfo:1.54     Sun Sep 10 21:19:33 2017
+++ pkgsrc/devel/meld/distinfo  Mon Apr 16 13:15:46 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.54 2017/09/10 21:19:33 wiz Exp $
+$NetBSD: distinfo,v 1.55 2018/04/16 13:15:46 wiz Exp $
 
-SHA1 (meld-3.18.0.tar.xz) = ead88297978d6720d66b30d533f35575a748401c
-RMD160 (meld-3.18.0.tar.xz) = 04a24763fd112b787824145cd18eff48faeb63bc
-SHA512 (meld-3.18.0.tar.xz) = 1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
-Size (meld-3.18.0.tar.xz) = 553772 bytes
+SHA1 (meld-3.19.0.tar.xz) = 14e425a276e45518a18f63d9668c50c9b928ddf5
+RMD160 (meld-3.19.0.tar.xz) = 2b93c30f9f1d3b33f915578bb08956c23b18fce6
+SHA512 (meld-3.19.0.tar.xz) = bef48ba0ffd7f93d5fec0a32733d43bb7c17f030d2f941df872bcb92b66fc108f38448ca01a44acdca025dcbedd6068371f25d4ba23ff2558976dff5dae2b40a
+Size (meld-3.19.0.tar.xz) = 580636 bytes