5f15db505d
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)
39 lines
1.4 KiB
Makefile
39 lines
1.4 KiB
Makefile
# $NetBSD: Makefile,v 1.81 2017/06/14 14:03:54 wiz Exp $
|
|
|
|
DISTNAME= meld-3.17.2
|
|
CATEGORIES= devel
|
|
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.17/}
|
|
EXTRACT_SUFX= .tar.xz
|
|
|
|
MAINTAINER= wiz@NetBSD.org
|
|
HOMEPAGE= http://meldmerge.org/
|
|
COMMENT= Visual diff and merge tool (GTK3 version)
|
|
LICENSE= gnu-gpl-v2
|
|
|
|
BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
|
|
DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3
|
|
DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
|
|
DEPENDS+= dconf-[0-9]*:../../devel/dconf
|
|
|
|
USE_TOOLS+= intltool msgfmt
|
|
|
|
PYTHON_VERSIONS_INCOMPATIBLE= 27 # not supported any longer
|
|
|
|
SUBST_CLASSES+= man
|
|
SUBST_FILES.man= setup.py
|
|
SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1,"
|
|
SUBST_STAGE.man= pre-build
|
|
SUBST_MESSAGE.man= Fixing man page installation path.
|
|
|
|
.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
|
|
.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.36.0
|
|
.include "../../devel/glib2/buildlink3.mk"
|
|
.include "../../devel/glib2/schemas.mk"
|
|
BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.14
|
|
.include "../../x11/gtk3/buildlink3.mk"
|
|
BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.14
|
|
.include "../../x11/gtksourceview3/buildlink3.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|