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

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


Branch: CURRENT, Version: 3.19.0nb1, Package name: meld-3.19.0nb1, 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/python37]

Required to build:
[pkgtools/x11-links] [x11/xcb-proto] [x11/fixesproto4] [textproc/itstool] [pkgtools/cwrappers] [x11/xorgproto]

Master sites: (Expand)

SHA1: 14e425a276e45518a18f63d9668c50c9b928ddf5
RMD160: 2b93c30f9f1d3b33f915578bb08956c23b18fce6
Filesize: 567.027 KB

Version history: (Expand)


CVS history: (Expand)


   2018-04-16 16:35:28 by Thomas Klausner | Files touched by this commit (1284)
Log message:
Recursive bump for new fribidi dependency in pango.
   2018-04-16 15:15:46 by Thomas Klausner | Files touched by this commit (3) | Package updated
Log message:
meld: update to 3.19.0.

2018-03-28 meld 3.19.0
======================

  Features:

   * Initial Windows build pipeline using Appveyor (Vasily Galkin)
   * Add new per-pane status bar with selectors for syntax highlighting and
     text encoding (Kai Willadsen, with extensive testing by Vasily Galkin)
   * Allow text encoding to be chosen from file selectors (Kai Willadsen)
   * Add new go-to-line action and UI (Kai Willadsen)
   * Folder comparison now explicitly indicates symlinks in the tree, and
     shows the symlink target (Kai Willadsen)
   * Inline highlighting now draws whitespace in any changes it covers (Kai
     Willadsen)
   * Improved contrast in dark theme support (Vitalii Dmitriev)
   * Navigating between changes in file comparison now briefly animates the
     outline, to make it easier to keep track of the focus in busy
     comparisons (Kai Willadsen)

  Fixes:

   * Find bar now hides when pressing Escape (Vladimir Panteleev)
   * Handle file deletion where we can't move to trash (e.g., network mounts)
     (Kai Willadsen)
   * Guess whether we're running a dark theme, for supporting Tweak Tool
     changes (Kai Willadsen)
   * Keybindings for notebook switching work again (Kai Willadsen)
   * Significantly speed up folder and version control comparisons by limiting
     the file metadata we request (Kai Willadsen)
   * Threading fixes for more responsive highlighting and better exit handling
     (Kai Willadsen)
   * Fix memory and file handle leakage for closed comparisons (Kai Willadsen)
   * Make the --auto-compare command line flag work again (Kai Willadsen)
   * Make multiple --diff command line options work again (Kai Willadsen)
   * Fix committing selected files in Mercurial (Kai Willadsen)
   * Fix Bazaar support for our Python 3 port (Kai Willadsen)
   * Avoid a race conditon that made the "Resolve conflict" prompt \ 
unreliable
     (Kai Willadsen)
   * Fix invalid-iter crash when refreshing version control view (Kai
     Willadsen)
   * Make non-existent files writable by default (Kai Willadsen)
   * Several fixes for translations, unicode typography, and typos (Piotr Drąg)
   * Windows compatibility updates (Vasily Galkin, Kai Willadsen)
   * Windows build fixes (Vasily Galkin)
   * Add Gitlab CI for Python styling and lint, and update a lot of old code
     to match (Kai Willadsen)
   * Packaging fixes for AppStream (Balint Reczey)

  Internal changes:

   * Update GTK+ and GtkSourceView requirements to 3.20
   * Migrate recently-used handling, comparison launching, and file
     comparisons to use Gio for URI support (Chris Mayo, Kai Willadsen)
   * Migrated to GNOME Gitlab for hosting and issue tracking

   * Bugs fixed (bugzilla): 589366, 783989, 785313, 785630, 786629, 786867,
     787256, 788455, 788487, 790335, 791173
   * Issues fixed (gitlab): 46, 97, 133, 146, 151, 152, 158, 159, 161, 165
   2018-03-12 12:18:01 by Thomas Klausner | Files touched by this commit (2155)
Log message:
Recursive bumps for fontconfig and libzip dependency changes.
   2017-11-23 18:20:22 by Thomas Klausner | Files touched by this commit (556)
Log message:
recursive bump for libxkbcommon removal from at-spi2-core
   2017-09-10 23:19:33 by Thomas Klausner | Files touched by this commit (2) | Package updated
Log message:
Updated meld to 3.18.0.

2017-09-10 meld 3.18.0
======================

  Fixes:

   * Fix VC status not updating in some situations non-flattened mode (Kai
     Willadsen)
   * Command line errors when invoking a secondary instance will no longer
     cause the second command to hang until the primary exits (Kai Willadsen)

   * Bugs fixed: 786629

  Translations:

   * Emin Tufan Çetin (tr)
   2017-09-04 14:19:42 by Thomas Klausner | Files touched by this commit (3) | Package updated
Log message:
Updated meld to 3.17.4.

2017-08-16 meld 3.17.4
======================

  Fixes:

   * Rebuild source tarball without spurious files
   2017-08-14 22:42:33 by Thomas Klausner | Files touched by this commit (3) | Package updated
Log message:
Updated meld to 3.17.3.

2017-08-13 meld 3.17.3
======================

  Fixes:

   * Fix folder compare when using text filters (Alsan Wong)
   * Make activity spinner show when inline comparisons are running (Kai
     Willadsen)
   * Migrate back from threads to multiprocessing for inline diffs; unusual
     CPU contention caused this to harm interactivity (Kai Willadsen)
   * Manually refreshing a file comparison sometimes caused diff navigation
     to break (Kai Willadsen)
   * Folder comparisons that update their state no longer break navigation
     (Kai Willadsen)
   * Version-control comparison on missing files now work again (Kai
     Willadsen)
   * Fix regression in initial focus for folder comparisons (Kai Willadsen)
   * Fix handling for added, partially staged files in git (Kai Willadsen)

   * Bugs fixed: 784436, 785603, 785859, 786043

  Translations:

   * Daniel Mustieles (es)
   * Matej Urbančič (sl)
   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)