Sun Dec 27 21:48:50 2015 UTC ()
Update meld to 3.15.1:

2015-12-15 meld 3.15.1
======================

  Features:

   * Text ignored by filters is now dimmed to give some visual feedback that
     it's being ignored (David Rabel)
   * Text filters now apply independently, improving consistency; note that
     this is a behaviour change as filter order no longer matters, and filters
     will always apply to the original (not the filtered) text (David Rabel,
     Kai Willadsen)
   * Recent menu items now show more detail in tooltips (Alan Suran)
   * Update dialog action area layout for GTK+ theme changes (Kai Willadsen)

  Fixes:

   * Conflict resolution prompt now resolves properly again (Andrew Sutherland)
   * Silence some GTK+ assertions on window close (Zain)
   * Fix default filter issues from recent rework (Erik Schilling)
   * Percent-containing commit messages no longer corrupt our recent commit
     messages store (Kai Willadsen)
   * Fix some problems with unicode user directories on Windows (Kai Willadsen)
   * Fix encoding issues when saving files with load errors (Kai Willadsen)
   * Fix drawing corruption when scrolling horizontally (Kai Willadsen)
   * Fix clicking on the diffmap scrolling to the wrong location (Kai Willadsen)
   * Fix off-by-one drawing error for final line in file (Kai Willadsen)
   * Fix introspection requires to silence startup warnings (Kai Willadsen)
   * Fix clearing syncpoints (Kai Willadsen)
   * Add manual appdata kudos markers (Kai Willadsen)
   * PEP8 fixes (David Rabel, Kai Willadsen)

  Translations:

   * Daniel Mustieles (es)
   * Marek Černocký (cs)
   * Milo Casagrande (it)
   * Pedro Albuquerque (pt)
   * Piotr Drąg (pl)
   * Rafael Fontenelle (pt_BR)


(wiz)
diff -r1.63 -r1.64 pkgsrc/devel/meld/Makefile
diff -r1.40 -r1.41 pkgsrc/devel/meld/distinfo
cvs diff -r1.63 -r1.64 pkgsrc/devel/meld/Makefile (switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2015/12/05 21:25:36 1.63
+++ pkgsrc/devel/meld/Makefile 2015/12/27 21:48:49 1.64
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.63 2015/12/05 21:25:36 adam Exp $ 1# $NetBSD: Makefile,v 1.64 2015/12/27 21:48:49 wiz Exp $
2 2
3DISTNAME= meld-3.15.0 3DISTNAME= meld-3.15.1
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.15/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.15/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://meldmerge.org/ 9HOMEPAGE= http://meldmerge.org/
10COMMENT= Visual diff and merge tool (GTK3 version) 10COMMENT= Visual diff and merge tool (GTK3 version)
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 13BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
14DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3 14DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3
15DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas 15DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
16 16
17USE_TOOLS+= intltool msgfmt 17USE_TOOLS+= intltool msgfmt
18 18
19PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 3.11; 3.12 will probably require 33+ 19PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 3.11; 3.12 will probably require 33+
20 20
21SUBST_CLASSES+= man 21SUBST_CLASSES+= man
22SUBST_FILES.man= setup.py 22SUBST_FILES.man= setup.py
23SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1," 23SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1,"
24SUBST_STAGE.man= pre-build 24SUBST_STAGE.man= pre-build
25SUBST_MESSAGE.man= Fixing man page installation path. 25SUBST_MESSAGE.man= Fixing man page installation path.
26 26
27.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 27.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
28.include "../../sysutils/desktop-file-utils/desktopdb.mk" 28.include "../../sysutils/desktop-file-utils/desktopdb.mk"
29.include "../../lang/python/distutils.mk" 29.include "../../lang/python/distutils.mk"
30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0 30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0
31.include "../../devel/glib2/buildlink3.mk" 31.include "../../devel/glib2/buildlink3.mk"
32.include "../../devel/glib2/schemas.mk" 32.include "../../devel/glib2/schemas.mk"
33BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.14 33BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.14
34.include "../../x11/gtk3/buildlink3.mk" 34.include "../../x11/gtk3/buildlink3.mk"
35BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.14 35BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.14
36.include "../../x11/gtksourceview3/buildlink3.mk" 36.include "../../x11/gtksourceview3/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.40 -r1.41 pkgsrc/devel/meld/distinfo (switch to unified diff)

--- pkgsrc/devel/meld/distinfo 2015/11/04 17:41:17 1.40
+++ pkgsrc/devel/meld/distinfo 2015/12/27 21:48:49 1.41
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.40 2015/11/04 17:41:17 agc Exp $ 1$NetBSD: distinfo,v 1.41 2015/12/27 21:48:49 wiz Exp $
2 2
3SHA1 (meld-3.15.0.tar.xz) = cf9afbcbfa0ffddc5ceabe78ec6ab84d9411aaaa 3SHA1 (meld-3.15.1.tar.xz) = 43c0b089711843524935cf2d611c35cf24bf29e0
4RMD160 (meld-3.15.0.tar.xz) = 6f5bfb710421af0110ecf9be0499d7b95887f14e 4RMD160 (meld-3.15.1.tar.xz) = 35726330387cee22e50f50899bcf9323f1a838ea
5SHA512 (meld-3.15.0.tar.xz) = 4f0e4b87c0ee2ddb07fcc6266023320c62537411ca091f96d53cd37fe6165c50a8c7e857b9123e443cf571613e860504db1a1eb652d51e4bca26b90ba5396675 5SHA512 (meld-3.15.1.tar.xz) = 29590c5055428be2bc13df6be09626b08a3c20cd8bf855da6ba9eb25d0e121df17098b7ed8908e76c82e7352afcc10b8e7818336c18c73b9ad1b0693dc8b5e4a
6Size (meld-3.15.0.tar.xz) = 505184 bytes 6Size (meld-3.15.1.tar.xz) = 504628 bytes