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

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]


Branch: CURRENT, Version: 3.17.2, Package name: meld-3.17.2, 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 version based on GTK 3.


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

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] [pkgtools/cwrappers]

Master sites: (Expand)

SHA1: 3751e1420284a0705f6622c6628f953758dde272
RMD160: a5c56dc184587d8beab04af39cadc9f5435ae1ab
Filesize: 539.758 KB

Version history: (Expand)


CVS history: (Expand)


   2017-06-14 16:03:54 by Thomas Klausner | Files touched by this commit (3) | Package updated
Log message:
Updated meld to 3.17.2.

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)
   2017-03-13 10:24:09 by Thomas Klausner | Files touched by this commit (2) | Package updated
Log message:
Updated meld to 3.17.1.

2017-03-11 meld 3.17.1
======================

  Features:

   * Improve version checking, and try to show users a nice error dialog when
     Meld's requirements aren't installed (Vasily Galkin)

  Fixes:

   * Help and documentation fixes (Anders Jonsson, Kai Willadsen)
   * Re-silence GTK+ logging with glib 2.46 structured logging changes (Kai
     Willadsen)
   * Fix chunk deletion at EOF with CRLF endings (Kai Willadsen)
   * Note filter performance effects in folder preferences (Kai Willadsen)
   * Fix button alignment for new chunk action buttons (Kai Willadsen)
   * Improve use of the newer emblem in folder comparison by showing it only
     when meaningful (Kai Willadsen)
   * Fix crash caused by bad colour theme lookup (Kai Willadsen)

  Translations:

   * Alan Mortensen (da)
   * Anders Jonsson (sv)
   * Daniel Mustieles (es)
   * Josef Andersson (sv)
   * Marek Černocký (cs)
   * Paul Seyfert (de)
   * Piotr Drąg (pl)
   * Rafael Fontenelle (pt_BR)
   * Мирослав Николић (sr, sr@latin)
   2017-02-20 11:33:35 by Thomas Klausner | Files touched by this commit (3) | Package updated
Log message:
Updated meld to 3.17.0.

2016-12-18 meld 3.17.0
======================

  Python 3 porting:

   * Python 3 support; we now require Python 3.3 as a minimum
   * Python 3 compatibility fixes; too many cases of bytes/string confusion,
     syntax changes and other miscellany to mention individually (Vasily
     Galkin, Kai Willadsen)
   * Handle new unicode-escape behaviour and unicode/bytes confusion for
     process interaction and version control plugins (Vasily Galkin, Kai
     Willadsen)
   * Add support for byte-based filters, to support directory vs. file
     comparison filters (Kai Willadsen)

  UI changes:

   * The "Tabs" menu item has been removed, to better match up with more
     modern GTK+ design. All of the actions are still available in the
     expected key bindings, and there is a new per-tab context menu.
   * The change action buttons in the central pane divider now correctly
     render as flat buttons (Kai Willadsen)
   * The curves in the central pane divider are now... smoother!

  Internal changes:

   * Handle reload notifications better in asynchronous saving (Vasily Galkin)
   * Remove multi-process diff in favour of asynchronous (threaded, but
     GIL-throttled) matching (Kai Willadsen)
   * Performance improvements in rendering of multiple widgets, as well as for
     initial text comparison (Kai Willadsen)
   * Many updates for GTK+ 3.20 and 3.22 ABI changes (Kai Willadsen)
   * NOTE: Windows support is currently untested

  Fixes:

   * Update supported version control list (Kai Willadsen)
   * Update requirements and build requirements lists (Kai Willadsen)
   * Don't create empty help/figures directories (Kai Willadsen)
   * Translation maintenance (Piotr Drąg)
   2017-02-12 07:26:18 by Ryo ONODERA | Files touched by this commit (1451)
Log message:
Recursive revbump from fonts/harfbuzz
   2017-02-06 14:56:14 by Thomas Klausner | Files touched by this commit (1452)
Log message:
Recursive bump for harfbuzz's new graphite2 dependency.
   2017-01-22 15:44:15 by Leonardo Taccari | Files touched by this commit (1) | Package updated
Log message:
Add a dependency to graphics/adwaita-icon-theme
Bump PKGREVISION

Pointed out via pkg/51835 by Joern Clausen.

Approved by <wiz>
   2017-01-01 15:44:09 by Thomas Klausner | Files touched by this commit (577)
Log message:
Add python-3.6 to incompatible versions.
   2016-12-19 09:53:21 by Thomas Klausner | Files touched by this commit (2) | Package updated
Log message:
Updated meld to 3.16.4.

2016-12-18 meld 3.16.4
======================

  Fixes:

   * Make error displaying more robust with non-ASCII locales (Vasily Galkin)
   * Handle themes with scrollbar steppers better (Kai Willadsen)
   * Fix a traceback when pane has no file (Claude Paroz)
   * Fix triggering "Delete Change" actions from menu (Kai Willadsen)
   * Handle style theme not existing (Patrick Griffis)
   * Fix unintentional glib requirement bump (Kai Willadsen)

  Translations:

   * Claude Paroz (fr)