NOTICE: This package has been removed from pkgsrc

./devel/meld-devel, Visual diff and merge tool (GTK3 version)

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ]


Branch: CURRENT, Version: 3.11.3, Package name: meld-3.11.3, Maintainer: wiz

Meld is a visual diff and merge tool. You can compare two or three
files and edit them in place (diffs update dynamically). You can
compare two or three folders and launch file comparisons. You can
browse and view a working copy from popular version control systems
such such as CVS, Subversion, Bazaar-ng and Mercurial.

This is the development version based on GTK 3.


Required to run:
[sysutils/desktop-file-utils] [graphics/hicolor-icon-theme] [devel/glib2] [lang/python27] [x11/gtk3] [devel/py-gobject3] [sysutils/gsettings-desktop-schemas] [x11/gtksourceview3]

Required to build:
[pkgtools/x11-links] [x11/compositeproto] [x11/glproto] [x11/renderproto] [x11/xproto] [x11/xf86vidmodeproto] [x11/xf86driproto] [x11/damageproto] [x11/inputproto] [x11/xextproto] [x11/randrproto] [x11/dri2proto] [x11/xcb-proto] [x11/fixesproto4] [textproc/itstool]

Master sites: (Expand)

SHA1: c5ad856bbbd554394c25781ecc25c32e6a51d075
RMD160: 5cdb381ea2cf04296197da60c9ca24049a462022
Filesize: 432.324 KB

Version history: (Expand)


CVS history: (Expand)


   2014-10-01 11:44:26 by Thomas Klausner | Files touched by this commit (4) | Package removed
Log message:
Remove meld-devel, meld is now newer again.
   2014-08-23 07:24:25 by Thomas Klausner | Files touched by this commit (3)
Log message:
Update to 3.11.3:

2014-08-23 meld 3.11.3
======================

  Features:

   * Manually handle app menu fallback for non-Gnome shells (Kai Willadsen)
   * Save and restore window maximisation state (Kai Willadsen)

  Fixes:

   * Add missing/incomplete "Language" entries (Lars Wendler)
   * Miscellaneous code cleanups (Christoph Brill)
   * Handle broken locale settings better (Kai Willadsen)
   * Fix size allocation issues in preferences UI (Kai Willadsen)
   * Update shebang for environments with Python 3 as default (Kai Willadsen)

  Translations:

   * Daniel Mustieles (es)
   * Marek Černocký (cs)
   * Piotr Drąg (pl)
   * Rafael Ferreira (pt_BR)
   2014-07-12 16:34:37 by Thomas Klausner | Files touched by this commit (3)
Log message:
Update to 3.11.2:

2014-7-12 meld 3.11.2
=====================

  Features:

   * File and folder comparison panes can now be resized (Marco Brito)
   * Folder comparisons now support scrolling between chunks using the mouse
     wheel in the link map, like file comparisons (Kai Willadsen)

  Fixes:

   * Don't draw spurious actions for equal chunks (Kai Willadsen)
   * Remove default sourceview behaviour for Alt+Left/Right (Kai Willadsen)
   * Fix storing translated column names in configuration (Kai Willadsen)
   * Several fixes for multiple windows in single-instance handling:
     * Resolve relative paths relative to the correct instance (Kai Willadsen)
     * Don't create windows in the original instance when the calling instance
       errors out (Kai Willadsen)
     * Raise the correct window for new windows in the same instance (Kai
       Willadsen)
     * Exit correctly for command line errors in the calling instance (Kai
       Willadsen)
   * Fix display of unicode paths in repositories (Kai Willadsen)
   * Fix handling of unicode paths in recent files store (Kai Willadsen)
   * Improve behaviour of Open External action, and handle spaces in filenames
     for the custom editor option (Kai Willadsen)
   * Improve support custom installation prefixes (Kai Willadsen)

  Translations:

   * Benjamin Steinwender (de)
   * Daniel Mustieles (es)
   * Lasse Liehu (fi)
   * Marek Černocký (cs)
   * Matej Urbančič (sl)
   * Piotr Drąg (pl)
   * Rafael Ferreira (pt_BR)
   * Yuri Myasoedov (ru)
   2014-05-27 20:10:53 by Thomas Klausner | Files touched by this commit (4)
Log message:
Update to 3.11.1:

2014-5-26 meld 3.11.1
=====================

  Features:

   * New (alpha) infrastructure for stand-alone Windows builds (Kai Willadsen)
   * Display renames and metadata in Bazaar repositories (Louis des Landes)
   * Improved tab labels in version control comparisons (Kai Willadsen)
   * New merge-order preference to accompany comparison-order (Kai Willadsen)
   * Added a prompt to mark a conflict as resolved from file comparison (Kai
     Willadsen)

  Fixes:

   * Fix filtering for shallow folder comparisons (Casey)
   * Several install and distribution fixes (Kai Willadsen)
   * Sundry bug fixes (Dominique Leuenberger, Thomas Klausner, Louis des
     Landes, Kai Willadsen)

  Translations:

   * Andika Triwidada (id)
   * Benjamin Steinwender (de)
   * Daniel Mustieles (es)
   * Facundo Dario Illanes (es)
   * Inaki Larranaga Murgoitio (eu)
   * Jiri Grönroos (fi)
   * Marek Černocký (cs)
   * Milo Casagrande (it)
   * Piotr Drąg (pl)
   * Rafael Ferreira (pt_BR)
   * Tom Tryfonidis (el)
   * Ville-Pekka Vainio (fi)
   * Мирослав Николић (sr, sr@latin)
   2014-05-09 09:37:28 by Thomas Klausner | Files touched by this commit (553)
Log message:
Mark packages that are not ready for python-3.3 also not ready for 3.4,
until proven otherwise.
   2014-05-05 02:48:38 by Ryo ONODERA | Files touched by this commit (1155)
Log message:
Recursive revbump from x11/pixman
Fix PR pkg/48777
   2014-02-24 22:04:41 by Thomas Klausner | Files touched by this commit (1)
Log message:
Mark as not ready for python-3.x, as discussed with upstream.
3.12 will probably be python-3.x only.

Bump PKGREVISION.
   2014-02-24 13:24:11 by Thomas Klausner | Files touched by this commit (5) | Package updated
Log message:
Import meld-3.11.0 as devel/meld-devel.

Meld is a visual diff and merge tool. You can compare two or three
files and edit them in place (diffs update dynamically). You can
compare two or three folders and launch file comparisons. You can
browse and view a working copy from popular version control systems
such such as CVS, Subversion, Bazaar-ng and Mercurial.

This is the development version based on GTK 3.