Update meld to 3.15.0:

2015-10-05 meld 3.15.0
======================

  Features:

   * New API for version control plugins with more consistent interfaces and
     data structures across different plugins, enabling many minor
     improvements (Kai Willadsen)
     * Support the conflict resolution prompt in file comparisons for all VCs
     * Improve caching behaviour for some version control plugins
     * Better sensitivity handling for version control actions
     * Cache and show more metadata (e.g., file renames)
     * Several version control plugins have not been ported to the new API; the
       current list of support plugins is: Git, Mercurial, Subversion 1.7+,
       Bazaar
   * Faster rendering in file comparison view, enabled by new GtkTextView API
     (Kai Willadsen)
   * Move to using GtkSourceView style schemes with Meld-specific colour tags
     for highlight colours; this lets themes include colours that match the
     sourceview theme (Kai Willadsen)
   * Offer to open binary files externally (Pratik Dayama)
   * Show the common ancestor in conflicting regions (and the merged file
     everywhere else) when viewing conflicts through Meld's version control
     view; currently this is only supported under Git (Kai Willadsen)
   * Support showing staged/partially staged status of files under Git (Kai
     Willadsen)
   * Update preferences dialog to new style with headerbar (Kai Willadsen)


  Fixes:

   * Documentation updates (Andrew Beyer)
   * Fix crash with some GTK+ versions when using --output (Kai Willadsen)
   * Fix merge-all action not working at all (Kai Willadsen)
   * Fix creating patches with unicode path names (Kai Willadsen)
   * Fix copy-to-clipboard option in patch dialog (Kai Willadsen)
   * Fix diffmap alignment for new GTK+ allocation behaviour (Kai Willadsen)
   * Improve float accuracy in folder comparison timestamp resolution (Kai
     Willadsen)
   * Fix default SVN keyword filter to escape $ characters (Kai Willadsen)
   * Fix display of unicode --help from command line (Kai Willadsen)
   * Fix keyboard shortcut docs (Kai Willadsen)
   * Don't incorrectly show identical notification for changed folder
     comparisons (Kai Willadsen)


  Internal changes:

   * Requirements are now GTK+ 3.14, GtkSourceView 3.14 and GLib 2.36
   * Rewritten version control plugin API
   * Unified colour handling between linkmap, diffmap and file comparison
   * Move all textview drawing to a new GtkSourceView subclass, using the new
     GTK+ draw-layer API


  Translations:

   * Daniel Mustieles (es)
   * Gábor Kelemen (hu)
   * Jiri Grönroos (fi)
   * Josef Andersson (sv)
   * Marek Černocký (cs)
   * Piotr Drąg (pl)

3 files changed, 30 insertions, 30 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index ce936947127..0dc4420feaf 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2015/07/26 23:01:11 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2015/10/15 11:47:14 wiz Exp $
 
-DISTNAME=		meld-3.14.0
+DISTNAME=		meld-3.15.0
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/3.14/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/3.15/}
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		wiz@NetBSD.org
@@ -27,11 +27,11 @@ SUBST_MESSAGE.man=	Fixing man page installation path.
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/distutils.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.34.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.36.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
-BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.6
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.14
 .include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.6
+BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.14
 .include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 5c4a7b61f79..cd7695a9352 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2015/04/27 08:51:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2015/10/15 11:47:14 wiz Exp $
 bin/meld
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/meld/__init__.py
@@ -147,33 +147,15 @@ ${PYSITELIB}/meld/vc/_vc.pyo
 ${PYSITELIB}/meld/vc/bzr.py
 ${PYSITELIB}/meld/vc/bzr.pyc
 ${PYSITELIB}/meld/vc/bzr.pyo
-${PYSITELIB}/meld/vc/cvs.py
-${PYSITELIB}/meld/vc/cvs.pyc
-${PYSITELIB}/meld/vc/cvs.pyo
-${PYSITELIB}/meld/vc/darcs.py
-${PYSITELIB}/meld/vc/darcs.pyc
-${PYSITELIB}/meld/vc/darcs.pyo
-${PYSITELIB}/meld/vc/fossil.py
-${PYSITELIB}/meld/vc/fossil.pyc
-${PYSITELIB}/meld/vc/fossil.pyo
 ${PYSITELIB}/meld/vc/git.py
 ${PYSITELIB}/meld/vc/git.pyc
 ${PYSITELIB}/meld/vc/git.pyo
 ${PYSITELIB}/meld/vc/mercurial.py
 ${PYSITELIB}/meld/vc/mercurial.pyc
 ${PYSITELIB}/meld/vc/mercurial.pyo
-${PYSITELIB}/meld/vc/monotone.py
-${PYSITELIB}/meld/vc/monotone.pyc
-${PYSITELIB}/meld/vc/monotone.pyo
-${PYSITELIB}/meld/vc/svk.py
-${PYSITELIB}/meld/vc/svk.pyc
-${PYSITELIB}/meld/vc/svk.pyo
 ${PYSITELIB}/meld/vc/svn.py
 ${PYSITELIB}/meld/vc/svn.pyc
 ${PYSITELIB}/meld/vc/svn.pyo
-${PYSITELIB}/meld/vc/svn_17.py
-${PYSITELIB}/meld/vc/svn_17.pyc
-${PYSITELIB}/meld/vc/svn_17.pyo
 ${PYSITELIB}/meld/vcview.py
 ${PYSITELIB}/meld/vcview.pyc
 ${PYSITELIB}/meld/vcview.pyo
@@ -263,6 +245,22 @@ 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
@@ -334,8 +332,9 @@ share/meld/icons/vc-push-24.png
 share/meld/icons/vc-remove-24.png
 share/meld/icons/vc-resolve-24.png
 share/meld/icons/vc-update-24.png
-share/meld/meld-dark.css
 share/meld/meld.css
+share/meld/styles/meld-base.xml
+share/meld/styles/meld-dark.xml
 share/meld/ui/EditableList.ui
 share/meld/ui/application.ui
 share/meld/ui/appmenu-fallback.xml
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index 8f0041a86c4..f6b807209c7 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.37 2015/07/26 23:01:11 wiz Exp $
+$NetBSD: distinfo,v 1.38 2015/10/15 11:47:14 wiz Exp $
 
-SHA1 (meld-3.14.0.tar.xz) = 69aa58ebf5356f1f9d39079b8c32f60139f5d63e
-RMD160 (meld-3.14.0.tar.xz) = 0c2106a01bd8e3c98927f6334e84db26e07cfc85
-Size (meld-3.14.0.tar.xz) = 495168 bytes
+SHA1 (meld-3.15.0.tar.xz) = cf9afbcbfa0ffddc5ceabe78ec6ab84d9411aaaa
+RMD160 (meld-3.15.0.tar.xz) = 6f5bfb710421af0110ecf9be0499d7b95887f14e
+SHA512 (meld-3.15.0.tar.xz) = 4f0e4b87c0ee2ddb07fcc6266023320c62537411ca091f96d53cd37fe6165c50a8c7e857b9123e443cf571613e860504db1a1eb652d51e4bca26b90ba5396675
+Size (meld-3.15.0.tar.xz) = 505184 bytes