pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/meld Update to 3.12.0, based on meld-devel with ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6f96ee947dce
branches: trunk
changeset: 639922:6f96ee947dce
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Oct 01 09:43:43 2014 +0000
description:
Update to 3.12.0, based on meld-devel with an update. Changes to meld-devel:
2014-09-27 meld 3.12.0
======================
Fixes:
* Ignore missing files when cleaning up our recently-used folder (Kai
Willadsen)
* Guard against dialogs missing properties they should definitely have (Kai
Willadsen)
* Remove old property from patch dialog (Kai Willadsen)
Translations:
* Andika Triwidada (id)
* Marek Černocký (cs)
* Piotr Drąg (pl)
2014-09-19 meld 3.11.4
======================
Fixes:
* Only apply the auto merge flag to the last comparison started (Kai
Willadsen)
* Fix install layout issues on Debian-based systems (Kai Willadsen)
* Fix "Open External" for files on Windows (Kai Willadsen)
* Record installation directory and executable location on Windows (Kai
Willadsen)
* Revert to using latin1 as a fallback encoding; this will be reverted in
the next unstable series (Kai Willadsen)
Translations:
* Andika Triwidada (id)
* Daniel Mustieles (es)
* fr33domlover (he)
* Jiri Grönroos (fi)
* Josef Andersson (sv)
* Marek Černocký (cs)
* Piotr Drąg (pl)
diffstat:
devel/meld/DESCR | 2 +-
devel/meld/Makefile | 42 ++--
devel/meld/PLIST | 441 ++++++++++++++++++++++++++++++---------------------
devel/meld/distinfo | 8 +-
4 files changed, 287 insertions(+), 206 deletions(-)
diffs (truncated from 571 to 300 lines):
diff -r 8c9043d71ec2 -r 6f96ee947dce devel/meld/DESCR
--- a/devel/meld/DESCR Wed Oct 01 09:42:01 2014 +0000
+++ b/devel/meld/DESCR Wed Oct 01 09:43:43 2014 +0000
@@ -4,4 +4,4 @@
browse and view a working copy from popular version control systems
such such as CVS, Subversion, Bazaar-ng and Mercurial.
-This is the stable version based on GTK 2.
+This is the version based on GTK 3.
diff -r 8c9043d71ec2 -r 6f96ee947dce devel/meld/Makefile
--- a/devel/meld/Makefile Wed Oct 01 09:42:01 2014 +0000
+++ b/devel/meld/Makefile Wed Oct 01 09:43:43 2014 +0000
@@ -1,33 +1,37 @@
-# $NetBSD: Makefile,v 1.52 2014/07/19 06:13:37 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2014/10/01 09:43:43 wiz Exp $
-DISTNAME= meld-1.8.6
+DISTNAME= meld-3.12.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.8/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.12/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= wiz%NetBSD.org@localhost
HOMEPAGE= http://meldmerge.org/
-COMMENT= Visual diff and merge tool (GTK2 version)
+COMMENT= Visual diff and merge tool (GTK3 version)
LICENSE= gnu-gpl-v2
-DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2
+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
+
+USE_TOOLS+= intltool msgfmt
-USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt intltool
-MAKE_FLAGS+= prefix=${PREFIX}
-MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-MAKE_FLAGS+= PYTHON=${PYTHONBIN}
-REPLACE_PYTHON= bin/meld
-PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 3.11; 3.12 will probably require 33+
-# remove unnecessarily created empty dirs
-post-install:
- ${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
- ${RMDIR} ${DESTDIR}${PREFIX}/share/pixmaps
+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/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../lang/python/application.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../mk/omf-scrollkeeper.mk"
+.include "../../lang/python/distutils.mk"
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.34.0
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.6
+.include "../../x11/gtk3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.6
+.include "../../x11/gtksourceview3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 8c9043d71ec2 -r 6f96ee947dce devel/meld/PLIST
--- a/devel/meld/PLIST Wed Oct 01 09:42:01 2014 +0000
+++ b/devel/meld/PLIST Wed Oct 01 09:43:43 2014 +0000
@@ -1,179 +1,262 @@
-@comment $NetBSD: PLIST,v 1.21 2013/12/31 18:03:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/10/01 09:43:43 wiz Exp $
bin/meld
-lib/meld/meld/__init__.py
-lib/meld/meld/__init__.pyc
-lib/meld/meld/__init__.pyo
-lib/meld/meld/dbus_service.py
-lib/meld/meld/dbus_service.pyc
-lib/meld/meld/dbus_service.pyo
-lib/meld/meld/diffmap.py
-lib/meld/meld/diffmap.pyc
-lib/meld/meld/diffmap.pyo
-lib/meld/meld/diffutil.py
-lib/meld/meld/diffutil.pyc
-lib/meld/meld/diffutil.pyo
-lib/meld/meld/dirdiff.py
-lib/meld/meld/dirdiff.pyc
-lib/meld/meld/dirdiff.pyo
-lib/meld/meld/filediff.py
-lib/meld/meld/filediff.pyc
-lib/meld/meld/filediff.pyo
-lib/meld/meld/filemerge.py
-lib/meld/meld/filemerge.pyc
-lib/meld/meld/filemerge.pyo
-lib/meld/meld/filters.py
-lib/meld/meld/filters.pyc
-lib/meld/meld/filters.pyo
-lib/meld/meld/linkmap.py
-lib/meld/meld/linkmap.pyc
-lib/meld/meld/linkmap.pyo
-lib/meld/meld/matchers.py
-lib/meld/meld/matchers.pyc
-lib/meld/meld/matchers.pyo
-lib/meld/meld/meldapp.py
-lib/meld/meld/meldapp.pyc
-lib/meld/meld/meldapp.pyo
-lib/meld/meld/meldbuffer.py
-lib/meld/meld/meldbuffer.pyc
-lib/meld/meld/meldbuffer.pyo
-lib/meld/meld/melddoc.py
-lib/meld/meld/melddoc.pyc
-lib/meld/meld/melddoc.pyo
-lib/meld/meld/meldwindow.py
-lib/meld/meld/meldwindow.pyc
-lib/meld/meld/meldwindow.pyo
-lib/meld/meld/merge.py
-lib/meld/meld/merge.pyc
-lib/meld/meld/merge.pyo
-lib/meld/meld/misc.py
-lib/meld/meld/misc.pyc
-lib/meld/meld/misc.pyo
-lib/meld/meld/newdifftab.py
-lib/meld/meld/newdifftab.pyc
-lib/meld/meld/newdifftab.pyo
-lib/meld/meld/patchdialog.py
-lib/meld/meld/patchdialog.pyc
-lib/meld/meld/patchdialog.pyo
-lib/meld/meld/paths.py
-lib/meld/meld/paths.pyc
-lib/meld/meld/paths.pyo
-lib/meld/meld/preferences.py
-lib/meld/meld/preferences.pyc
-lib/meld/meld/preferences.pyo
-lib/meld/meld/recent.py
-lib/meld/meld/recent.pyc
-lib/meld/meld/recent.pyo
-lib/meld/meld/task.py
-lib/meld/meld/task.pyc
-lib/meld/meld/task.pyo
-lib/meld/meld/test_matchers.py
-lib/meld/meld/test_matchers.pyc
-lib/meld/meld/test_matchers.pyo
-lib/meld/meld/tree.py
-lib/meld/meld/tree.pyc
-lib/meld/meld/tree.pyo
-lib/meld/meld/ui/__init__.py
-lib/meld/meld/ui/__init__.pyc
-lib/meld/meld/ui/__init__.pyo
-lib/meld/meld/ui/emblemcellrenderer.py
-lib/meld/meld/ui/emblemcellrenderer.pyc
-lib/meld/meld/ui/emblemcellrenderer.pyo
-lib/meld/meld/ui/findbar.py
-lib/meld/meld/ui/findbar.pyc
-lib/meld/meld/ui/findbar.pyo
-lib/meld/meld/ui/gladesupport.py
-lib/meld/meld/ui/gladesupport.pyc
-lib/meld/meld/ui/gladesupport.pyo
-lib/meld/meld/ui/gnomeglade.py
-lib/meld/meld/ui/gnomeglade.pyc
-lib/meld/meld/ui/gnomeglade.pyo
-lib/meld/meld/ui/historyentry.py
-lib/meld/meld/ui/historyentry.pyc
-lib/meld/meld/ui/historyentry.pyo
-lib/meld/meld/ui/listwidget.py
-lib/meld/meld/ui/listwidget.pyc
-lib/meld/meld/ui/listwidget.pyo
-lib/meld/meld/ui/msgarea.py
-lib/meld/meld/ui/msgarea.pyc
-lib/meld/meld/ui/msgarea.pyo
-lib/meld/meld/ui/notebooklabel.py
-lib/meld/meld/ui/notebooklabel.pyc
-lib/meld/meld/ui/notebooklabel.pyo
-lib/meld/meld/ui/statusbar.py
-lib/meld/meld/ui/statusbar.pyc
-lib/meld/meld/ui/statusbar.pyo
-lib/meld/meld/ui/vcdialogs.py
-lib/meld/meld/ui/vcdialogs.pyc
-lib/meld/meld/ui/vcdialogs.pyo
-lib/meld/meld/ui/wraplabel.py
-lib/meld/meld/ui/wraplabel.pyc
-lib/meld/meld/ui/wraplabel.pyo
-lib/meld/meld/undo.py
-lib/meld/meld/undo.pyc
-lib/meld/meld/undo.pyo
-lib/meld/meld/util/__init__.py
-lib/meld/meld/util/__init__.pyc
-lib/meld/meld/util/__init__.pyo
-lib/meld/meld/util/compat.py
-lib/meld/meld/util/compat.pyc
-lib/meld/meld/util/compat.pyo
-lib/meld/meld/util/prefs.py
-lib/meld/meld/util/prefs.pyc
-lib/meld/meld/util/prefs.pyo
-lib/meld/meld/util/sourceviewer.py
-lib/meld/meld/util/sourceviewer.pyc
-lib/meld/meld/util/sourceviewer.pyo
-lib/meld/meld/vc/__init__.py
-lib/meld/meld/vc/__init__.pyc
-lib/meld/meld/vc/__init__.pyo
-lib/meld/meld/vc/_null.py
-lib/meld/meld/vc/_null.pyc
-lib/meld/meld/vc/_null.pyo
-lib/meld/meld/vc/_vc.py
-lib/meld/meld/vc/_vc.pyc
-lib/meld/meld/vc/_vc.pyo
-lib/meld/meld/vc/bzr.py
-lib/meld/meld/vc/bzr.pyc
-lib/meld/meld/vc/bzr.pyo
-lib/meld/meld/vc/cvs.py
-lib/meld/meld/vc/cvs.pyc
-lib/meld/meld/vc/cvs.pyo
-lib/meld/meld/vc/darcs.py
-lib/meld/meld/vc/darcs.pyc
-lib/meld/meld/vc/darcs.pyo
-lib/meld/meld/vc/fossil.py
-lib/meld/meld/vc/fossil.pyc
-lib/meld/meld/vc/fossil.pyo
-lib/meld/meld/vc/git.py
-lib/meld/meld/vc/git.pyc
-lib/meld/meld/vc/git.pyo
-lib/meld/meld/vc/mercurial.py
-lib/meld/meld/vc/mercurial.pyc
-lib/meld/meld/vc/mercurial.pyo
-lib/meld/meld/vc/monotone.py
-lib/meld/meld/vc/monotone.pyc
-lib/meld/meld/vc/monotone.pyo
-lib/meld/meld/vc/svk.py
-lib/meld/meld/vc/svk.pyc
-lib/meld/meld/vc/svk.pyo
-lib/meld/meld/vc/svn.py
-lib/meld/meld/vc/svn.pyc
-lib/meld/meld/vc/svn.pyo
-lib/meld/meld/vc/svn_17.py
-lib/meld/meld/vc/svn_17.pyc
-lib/meld/meld/vc/svn_17.pyo
-lib/meld/meld/vcview.py
-lib/meld/meld/vcview.pyc
-lib/meld/meld/vcview.pyo
+${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/meld/__init__.py
+${PYSITELIB}/meld/__init__.pyc
+${PYSITELIB}/meld/__init__.pyo
+${PYSITELIB}/meld/build_helpers.py
+${PYSITELIB}/meld/build_helpers.pyc
+${PYSITELIB}/meld/build_helpers.pyo
+${PYSITELIB}/meld/conf.py
+${PYSITELIB}/meld/conf.pyc
+${PYSITELIB}/meld/conf.pyo
+${PYSITELIB}/meld/const.py
+${PYSITELIB}/meld/const.pyc
+${PYSITELIB}/meld/const.pyo
+${PYSITELIB}/meld/diffgrid.py
+${PYSITELIB}/meld/diffgrid.pyc
+${PYSITELIB}/meld/diffgrid.pyo
+${PYSITELIB}/meld/diffmap.py
+${PYSITELIB}/meld/diffmap.pyc
+${PYSITELIB}/meld/diffmap.pyo
+${PYSITELIB}/meld/diffutil.py
+${PYSITELIB}/meld/diffutil.pyc
+${PYSITELIB}/meld/diffutil.pyo
+${PYSITELIB}/meld/dirdiff.py
+${PYSITELIB}/meld/dirdiff.pyc
+${PYSITELIB}/meld/dirdiff.pyo
+${PYSITELIB}/meld/filediff.py
+${PYSITELIB}/meld/filediff.pyc
+${PYSITELIB}/meld/filediff.pyo
+${PYSITELIB}/meld/filemerge.py
+${PYSITELIB}/meld/filemerge.pyc
+${PYSITELIB}/meld/filemerge.pyo
+${PYSITELIB}/meld/filters.py
+${PYSITELIB}/meld/filters.pyc
+${PYSITELIB}/meld/filters.pyo
+${PYSITELIB}/meld/gutterrendererchunk.py
+${PYSITELIB}/meld/gutterrendererchunk.pyc
+${PYSITELIB}/meld/gutterrendererchunk.pyo
+${PYSITELIB}/meld/linkmap.py
+${PYSITELIB}/meld/linkmap.pyc
+${PYSITELIB}/meld/linkmap.pyo
+${PYSITELIB}/meld/matchers.py
+${PYSITELIB}/meld/matchers.pyc
+${PYSITELIB}/meld/matchers.pyo
+${PYSITELIB}/meld/meldapp.py
+${PYSITELIB}/meld/meldapp.pyc
+${PYSITELIB}/meld/meldapp.pyo
+${PYSITELIB}/meld/meldbuffer.py
+${PYSITELIB}/meld/meldbuffer.pyc
+${PYSITELIB}/meld/meldbuffer.pyo
+${PYSITELIB}/meld/melddoc.py
+${PYSITELIB}/meld/melddoc.pyc
+${PYSITELIB}/meld/melddoc.pyo
+${PYSITELIB}/meld/meldwindow.py
+${PYSITELIB}/meld/meldwindow.pyc
+${PYSITELIB}/meld/meldwindow.pyo
+${PYSITELIB}/meld/merge.py
+${PYSITELIB}/meld/merge.pyc
+${PYSITELIB}/meld/merge.pyo
+${PYSITELIB}/meld/misc.py
Home |
Main Index |
Thread Index |
Old Index