summaryrefslogtreecommitdiff
path: root/devel/meld
AgeCommit message (Collapse)AuthorFilesLines
2017-09-10Updated meld to 3.18.0.wiz2-8/+8
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-04Updated meld to 3.17.4.wiz3-12/+8
2017-08-16 meld 3.17.4 ====================== Fixes: * Rebuild source tarball without spurious files
2017-08-14Updated meld to 3.17.3.wiz3-8/+12
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-14Updated meld to 3.17.2.wiz3-11/+9
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-13Updated meld to 3.17.1.wiz2-7/+7
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-20Updated meld to 3.17.0.wiz3-26/+34
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-12Recursive revbump from fonts/harfbuzzryoon1-2/+2
2017-02-06Recursive bump for harfbuzz's new graphite2 dependency.wiz1-2/+2
2017-01-22Add a dependency to graphics/adwaita-icon-themeleot1-1/+3
Bump PKGREVISION Pointed out via pkg/51835 by Joern Clausen. Approved by <wiz>
2017-01-01Add python-3.6 to incompatible versions.wiz1-2/+2
2016-12-19Updated meld to 3.16.4.wiz2-7/+7
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)
2016-10-03Updated meld to 3.16.3.wiz2-8/+7
2016-09-26 meld 3.16.3 ====================== Fixes: * Fix bad scroll syncing and inability to move between comparison chunks in file comparisons (Vasily Galkin) * Improve version control view behaviour when opening missing paths (Vasily Galkin) * Fix saving of text created in blank comparison (Vasily Galkin) * GTK+ 3.22 compatibility fixes for saving window size (Kai Willadsen) * Fix formatted patches missing newlines in certain cases (Kai Willadsen) * Silence GTK+ warning logging if not running in uninstalled (i.e., development) mode (Kai Willadsen) * Update AppData (Kai Willadsen) Translations: * Anders Jonsson (sv) * Balázs Meskó (hu) * Daniel Mustieles (es) * Marek Černocký (cs) * Mario Blättermann (de) * Piotr Drąg (pl) * Rafael Fontenelle (pt_BR) * Tiago Santos (pt) * Мирослав Николић (sr, sr@latin)
2016-08-03Revbump after graphics/gd updateadam1-1/+2
2016-08-01Updated meld to 3.16.2.wiz2-7/+7
2016-07-30 meld 3.16.2 ====================== Fixes: * Fix performance regression in text filtering (Kai Willadsen) * Fix regression in respecting custom text encoding (Kai Willadsen) Translations: * Andika Triwidada (id)
2016-07-09Remove python33: adapt all packages that refer to it.wiz1-2/+2
2016-06-19Updated meld to 3.16.1.wiz2-7/+7
2016-06-19 meld 3.16.1 ====================== Fixes: * Fix regression in support for file comparisons from pipes (Kai Willadsen) * Add open build service directories to the version control filter (Dominique Leuenberger) * Add darcs to list of loaded plugins (pbgc) * Fix the dark style (Kai Willadsen) * Windows build fixes (Kai Willadsen)
2016-05-05Updated meld to 3.16.0.wiz2-8/+8
2016-05-01 meld 3.16.0 ====================== Translations: * Josef Andersson (sv)
2016-04-24Updated meld to 3.15.3.wiz2-7/+7
2016-04-20 meld 3.15.3 ====================== Fixes: * Handle unicode dates in non-UTF8 locales in folder comparison (Kai Willadsen) * Try to auto-detect when to use our dark theme highlighting (Kai Willadsen) * After undo/redo actions in file comparisons, place the cursor at the natural edit position and scroll it back onscreen (Kai Willadsen)
2016-04-08Update meld to 3.15.2.wiz3-9/+12
2016-03-28 meld 3.15.2 ====================== Features: * Port to use GtkSourceView's file loader and saver helpers, bringing several benefits (Kai Willadsen) * Loading and saving speed are significantly improved, and are asychronous * We try a wider range of locale-specific file encodings by default, and still support user-specified default encodings (requires GtkSourceView 3.18 or later) * We now support saving files with inconsistent newline types * Binary files will now be loaded on a best-effort basis * Reinstate support for Darcs; this is currently limited to very new (>2.10.3) versions (Guillaume Hoffmann) * Folder comparisons now apply text filters in the same way as file comparisons (David Rabel) * Add support for showing new shortcuts help dialog (Kai Willadsen, Piotr Drąg) * Preliminary support for building Meld as an xdg-app (Kai Willadsen) Fixes: * Many fixes for GTK+ 3.20 theming changes and widget compatibility issues (Kai Willadsen) * All accelerators should now consistently use the Primary key, for better integration on OSX systems (Youssef Adnan) * Significantly improve text filter performance (Jason Gauci) * Fix performance regression where scanning for missing files was extremely slow, especially in large repositories (Kai Willadsen) * Fix truncated line number display in short file (Kai Willadsen) * Fix filter dropdown not appearing below button (Kai Willadsen) * Add more documentation on setup and installation requirements (Jesse Sheridan, Martin Thoma) * Update the AppData to spec version 0.7+ (Richard Hughes) Translations: * Anders Jonsson (sv) * Benjamin Steinwender (de) * Bernd Homuth (de) * Cédric Valmary (oc) * Daniel Mustieles (es) * Gábor Kelemen (hu) * Jiri Grönroos (fi) * Luisa Cerón Perea (es) * Marek Černocký (cs) * Mario Blättermann (de) * Muhammet Kara (tr) * Pedro Albuquerque (pt) * Piotr Drąg (pl) * Rafael Fontenelle (pt_BR) * Мирослав Николић (sr, sr@latin)
2015-12-29Add dependency on dconf so settings can be saved - issue reported by Jan ↵abs1-1/+3
Danielsson and fix from wiz@
2015-12-27Update meld to 3.15.1:wiz2-7/+7
2015-12-15 meld 3.15.1 ====================== Features: * Text ignored by filters is now dimmed to give some visual feedback that it's being ignored (David Rabel) * Text filters now apply independently, improving consistency; note that this is a behaviour change as filter order no longer matters, and filters will always apply to the original (not the filtered) text (David Rabel, Kai Willadsen) * Recent menu items now show more detail in tooltips (Alan Suran) * Update dialog action area layout for GTK+ theme changes (Kai Willadsen) Fixes: * Conflict resolution prompt now resolves properly again (Andrew Sutherland) * Silence some GTK+ assertions on window close (Zain) * Fix default filter issues from recent rework (Erik Schilling) * Percent-containing commit messages no longer corrupt our recent commit messages store (Kai Willadsen) * Fix some problems with unicode user directories on Windows (Kai Willadsen) * Fix encoding issues when saving files with load errors (Kai Willadsen) * Fix drawing corruption when scrolling horizontally (Kai Willadsen) * Fix clicking on the diffmap scrolling to the wrong location (Kai Willadsen) * Fix off-by-one drawing error for final line in file (Kai Willadsen) * Fix introspection requires to silence startup warnings (Kai Willadsen) * Fix clearing syncpoints (Kai Willadsen) * Add manual appdata kudos markers (Kai Willadsen) * PEP8 fixes (David Rabel, Kai Willadsen) Translations: * Daniel Mustieles (es) * Marek Černocký (cs) * Milo Casagrande (it) * Pedro Albuquerque (pt) * Piotr Drąg (pl) * Rafael Fontenelle (pt_BR)
2015-12-05Extend PYTHON_VERSIONS_INCOMPATIBLE to 35adam1-2/+2
2015-11-04Remove duplicate SHA512 digests that crept in.agc1-2/+1
2015-11-03Add SHA512 digests for distfiles for devel categoryagc1-1/+2
Issues found with existing distfiles: distfiles/eclipse-sourceBuild-srcIncluded-3.0.1.zip distfiles/fortran-utils-1.1.tar.gz distfiles/ivykis-0.39.tar.gz distfiles/enum-1.11.tar.gz distfiles/pvs-3.2-libraries.tgz distfiles/pvs-3.2-linux.tgz distfiles/pvs-3.2-solaris.tgz distfiles/pvs-3.2-system.tgz No changes made to these distinfo files. Otherwise, existing SHA1 digests verified and found to be the same on the machine holding the existing distfiles (morden). All existing SHA1 digests retained for now as an audit trail.
2015-10-15Update meld to 3.15.0:wiz3-30/+30
2015-10-05 meld 3.15.0 ====================== Features: * New API for version control plugins with more consistent interfaces and data structures across different plugins, enabling many minor improvements (Kai Willadsen) * Support the conflict resolution prompt in file comparisons for all VCs * Improve caching behaviour for some version control plugins * Better sensitivity handling for version control actions * Cache and show more metadata (e.g., file renames) * Several version control plugins have not been ported to the new API; the current list of support plugins is: Git, Mercurial, Subversion 1.7+, Bazaar * Faster rendering in file comparison view, enabled by new GtkTextView API (Kai Willadsen) * Move to using GtkSourceView style schemes with Meld-specific colour tags for highlight colours; this lets themes include colours that match the sourceview theme (Kai Willadsen) * Offer to open binary files externally (Pratik Dayama) * Show the common ancestor in conflicting regions (and the merged file everywhere else) when viewing conflicts through Meld's version control view; currently this is only supported under Git (Kai Willadsen) * Support showing staged/partially staged status of files under Git (Kai Willadsen) * Update preferences dialog to new style with headerbar (Kai Willadsen) Fixes: * Documentation updates (Andrew Beyer) * Fix crash with some GTK+ versions when using --output (Kai Willadsen) * Fix merge-all action not working at all (Kai Willadsen) * Fix creating patches with unicode path names (Kai Willadsen) * Fix copy-to-clipboard option in patch dialog (Kai Willadsen) * Fix diffmap alignment for new GTK+ allocation behaviour (Kai Willadsen) * Improve float accuracy in folder comparison timestamp resolution (Kai Willadsen) * Fix default SVN keyword filter to escape $ characters (Kai Willadsen) * Fix display of unicode --help from command line (Kai Willadsen) * Fix keyboard shortcut docs (Kai Willadsen) * Don't incorrectly show identical notification for changed folder comparisons (Kai Willadsen) Internal changes: * Requirements are now GTK+ 3.14, GtkSourceView 3.14 and GLib 2.36 * Rewritten version control plugin API * Unified colour handling between linkmap, diffmap and file comparison * Move all textview drawing to a new GtkSourceView subclass, using the new GTK+ draw-layer API Translations: * Daniel Mustieles (es) * Gábor Kelemen (hu) * Jiri Grönroos (fi) * Josef Andersson (sv) * Marek Černocký (cs) * Piotr Drąg (pl)
2015-07-26Update to 3.14.0:wiz2-7/+7
2015-07-23 meld 3.14.0 ====================== Fixes: * Fix crash when starting folder comparison on Windows (Kai Willadsen) * Fix bad chunk action behaviour for middle-to-right actions in three pane conflicts (Kai Willadsen) * Documentation fixes (Anders Jonsson) Translations: * Josef Andersson (sv) * Marek Černocký (cs)
2015-07-14Update to 3.13.3:wiz2-6/+6
2015-07-12 meld 3.13.3 ====================== Fixes: * Fix syntax highlighting under Windows (Kai Willadsen) * Update Windows build for newer pygi bundled libraries (Kai Willadsen) * Fixes for incorrect descriptions in manual (Anders Jonsson, Kai Willadsen)
2015-07-05Update to 3.13.2:wiz2-6/+6
2015-07-04 meld 3.13.2 ====================== Fixes: * Several fixes for argument handling and tab creation: * Create --diff created comparisons after args-created ones (Kai Willadsen) * Fix --label flag incorrectly applying to --diff created comparisons (Kai Willadsen) * Create --diff created comparisons after args-created ones (Kai Willadsen) * Fix relative path interpretation for --output when created from a secondary instance (Kai Willadsen) * Fix window presentation ordering when creating a secondary instance (Kai Willadsen) * Several fixes to unicode filename handling in git comparisons and manually-assigned labels (Kai Willadsen) * Fix incorrect comparison display caused by unicode (U+2028) newline (Kai Willadsen) * Fix not being able to activate some change bar actions by temporarily disabling overlay scrolling support on GTK+ 3.14 (Kai Willadsen) * Stop recreating duplicate recently-used file placeholders (Kai Willadsen) * Fix out-of-date man page documentation (Kai Willadsen) * Test fixes and testing improvements (Magnus Ihse Bursie) * Documentation fixes (Anders Jonsson) Translations: * Gábor Kelemen (hu) * Marek Černocký (cs) * Pedro Albuquerque (pt)
2015-04-27Update to 3.13.1:wiz3-8/+26
2015-04-20 meld 3.13.1 ====================== Features: * Previously, Meld could show very different results in file vs. folder comparisons when the files differed in line endings. These are now much more consistent. * In folder comparisons, applying filters now also normalises line endings (Kai Willadsen) * In a file comparison, if the files-are-identical notification is shown when files differ in line endings, this now mentioned (Kai Willadsen) * There is a new preferences controlling whether to apply text filters during folder comparisons, defaulting to on, which also controls line ending normalisation (Kai Willadsen) * Help documentation has been updated with details of how text filters are applied in folder comparison (Kai Willadsen) * Folder comparisons will now show an identical notification similar to the one used in file comparison (Kai Willadsen) * The "New blank comparion" button now works for folder comparisons as well as file ones (Kai Willadsen) * In folder comparisons, the expansion state of the tree is now remembered when you collapse and re-expand a row (Kai Willadsen) Fixes: * Install fixes (oco) * Code style fixes (Sandro Bonazzola) * Better support RTL locales by flipping icons and panes consistently (Kai Willadsen) * Fixes for file encoding when saving with bad or missing encodings (Kai Willadsen) * More consistent dialog handling and appearance (Kai Willadsen) * Deprecation updates and compatibility fixes (Kai Willadsen) * Fix bad comparison offset when multiple line breaks occurred on a single line (don't ask) (Kai Willadsen) * Unicode fixes for file change notifications (Kai Willadsen) * Warnings (such as deprecation warnings) are now explicitly silenced in stable Meld (Kai Willadsen) * Folder actions are now disabled while Meld is still scanning folders (Kai Willadsen) * Fix some command line handling for ambiguous relative paths and invalid URIs (Kai Willadsen) * Fix updating the comparison map when a file is updated within Meld (Kai Willadsen) Translations: * Anders Jonsson (sv) * Cheng-Chia Tseng (zh_TW) * Christian Kirbach (de) * Daniel Mustieles (es) * Jordi Mas (ca) * Marek Černocký (cs) * Matej Urbančič (sl) * Piotr Drąg (pl) * Samir Ribic (bs) * Tibor Kaputa (sk)
2015-04-25Recursive revbump following MesaLib update, categories a through f.tnn1-1/+2
2014-12-31Update to 3.13.0:wiz2-7/+7
2014-12-31 meld 3.13.0 ====================== Features: * Make syntax highlighting style configurable (Mark Pariente) * Implemented incremental search, match highlighting and many other find-related fixes (Robert Roth) * Add support for GTK+ global dark theme setting (Kai Willadsen) * Add support for pushing change deletions (Kai Willadsen) * Remove cycle-pane action in favour of previous/next pane actions (Kai Willadsen) Fixes: * Handle Unicode filenames in a git tree correctly (Hasan Arous, Kai Willadsen) * Many fixes for recent GTK+ deprecation warnings (Kai Willadsen) * Fixing flickering inline highlighting on updates (Kai Willadsen) * Multiple work arounds for change colours not displaying on GTK+ 3.14 (Kai Willadsen) * Fix inconsistent file chooser when cancelling file selection (Kai Willadsen) * UTF-8 encode patches created from the patch dialog (Kai Willadsen) * Fix text-wrapping reset caused by the commit dialog (Kai Willadsen) * Fix text background display on certain themes (Kai Willadsen) * Fix for launching Meld with certain Git environment variables (Kai Willadsen) * Add GTK's settings.ini file for font blurriness fix on Windows (Kai Willadsen) * Fix display of change action buttons and line numbers when line numbers are shown (Kai Willadsen) * Fix positioning of the change action buttons (Kai Willadsen) * Fix tab width setting not working correctly (Kai Willadsen) * Fix starting comparison of Subversion checkouts from a subdirectory (Kai Willadsen) * Fix starting Meld from a differently-named symlink (Kai Willadsen) * Ignore errors when copying file metadata if the destination file system doesn't support it (Kai Willadsen) * Automatically recompile stale in-place gschemas (Kai Willadsen) * Handle SIGINT to support previous quit-on-Ctrl-C behaviour (Kai Willadsen) * Fix missing cache opcodes in some circumstances (Kai Willadsen) * Fix text view expansion when resizing patch dialog (Kai Willadsen) * Build fix to always include C locale when LINGUAS is set (Kai Willadsen) Translations: * Andika Triwidada (id) * Carles Ferrando (ca@valencia) * Gábor Kelemen (hu) * Jean Jordaan (cs, el, es) * Joan Coll (ca) * Jordi Mas (ca) * Marek Černocký (cs) * Maria Mavridou (el) * Piotr Drąg (pl) * Мирослав Николић (sr, sr@latin)
2014-11-27Update to 3.12.2:wiz2-6/+6
2014-11-25 meld 3.12.2 ====================== Fixes: * Fix display of change action buttons and line numbers when line numbers are shown (Kai Willadsen) * Fix positioning of the change action buttons (Kai Willadsen) * Fix tab width setting not working correctly (Kai Willadsen) * Fix starting comparison of Subversion checkouts from a subdirectory (Kai Willadsen) * Fix starting Meld from a differently-named symlink (Kai Willadsen) * Ignore errors when copying file metadata if the destination file system doesn't support it (Kai Willadsen) * Automatically recompile stale in-place gschemas (Kai Willadsen) * Handle SIGINT to support previous quit-on-Ctrl-C behaviour (Kai Willadsen) Translations: * Dimitris Spingos (el) * Marek Černocký (cs)
2014-10-26Update to 3.12.1:wiz2-6/+6
2014-10-26 meld 3.12.1 ====================== Fixes: * Work around change colours not displaying on GTK+ 3.14 (Kai Willadsen) * Fix missing cache opcodes in some circumstances (Kai Willadsen) * Fix text view expansion when resizing patch dialog (Kai Willadsen) * Build fix to always include C locale when LINGUAS is set (Kai Willadsen) Translations: * Rafael Ferreira (pt_BR) * Мирослав Николић (sr, sr@latin)
2014-10-01Update to 3.12.0, based on meld-devel with an update. Changes to meld-devel:wiz4-206/+287
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)
2014-07-19Update to 1.8.6:wiz2-6/+6
Meld 1.8.6 has been released. Fixes: * Handle spaces in filenames with external editor (Kai Willadsen) * Fix storing translated column names in configuration (Kai Willadsen) * Backport fix for "Open externally" sensitivity setting (Daniel Macks) * Fix support for fake comparisons in null VC (Kai Willadsen) * Fix "Same" filter for shallow comparison cases (Kai Willadsen) Translations: * Benjamin Steinwender(de) * Daniel Mustieles (es) * Inaki Larranaga Murgoitio (eu) * Lasse Liehu (fi)
2014-05-20Update to 1.8.5:wiz2-6/+6
Fixes: * Fix findbar crash with older pygtk (Kai Willadsen) Translations: * Daniel Mustieles (es) * Dimitris Spingos (el) * Facundo Dario Illanes (es) * Мирослав Николић (sr, sr@latin) * Tom Tryfonidis (el)
2014-05-09Mark packages that are not ready for python-3.3 also not ready for 3.4,wiz1-2/+2
until proven otherwise.
2014-02-24Mark as stable GTK 2 version.wiz2-2/+4
2014-01-27Update to 1.8.4:wiz2-6/+6
2013-1-23 meld 1.8.4 ==================== Fixes: * Fix crash when scanning CVS-only folders (Kai Willadsen) * Fix crash on Windows when missing cdll.intl (Bartosz Dziewoński) * Fix crash with Italian (it_IT.utf8) locale (Balint Reczey) Translations: * Andika Triwidada (id) * Benjamin Steinwender (de) * Daniel Mustieles (es)
2014-01-25No need to have two variables for the same logic.wiz1-2/+2
Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.
2014-01-25Mark packages as not ready for python-3.x where applicable;wiz1-1/+2
either because they themselves are not ready or because a dependency isn't. This is annotated by PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z or PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar respectively, please use the same style for other packages, and check during updates. Use versioned_dependencies.mk where applicable. Use REPLACE_PYTHON instead of handcoded alternatives, where applicable. Reorder Makefile sections into standard order, where applicable. Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default with the next commit. Whitespace cleanups and other nits corrected, where necessary.
2013-12-31Update to 1.8.3:wiz3-7/+8
2013-12-15 meld 1.8.3 ===================== Fixes: * Fix subdirectory comparisons for Subversion 1.6 (Ben Ross) * Fix git status parsing for some statuses (Tom Scytale) * Don't disable updating when syncpoints aren't yet active (Kai Willadsen) * Fix modifying column properties causing crashes when using .ini config backend (Kai Willadsen) Translations: * Andika Triwidada (id) * Milo Casagrande (it) * zodiac111 (zh_CN)
2013-10-18Update to 1.8.2:wiz2-6/+6
2013-10-18 meld 1.8.2 ===================== Fixes: * Fix regression selecting Subversion 1.6 repositories (Kai Willadsen) * Fix for unicode usernames on Windows; note that this change also moves Meld config from the remote to the local app data folder (Kai Willadsen) * Add copyright string to appdata file (Kai Willadsen) Translations: * Fran Diéguez (gl) * Matej Urbančič (sl)
2013-09-30Update to 1.8.1:wiz3-7/+8
2013-9-22 meld 1.8.1 ==================== Fixes: * Add AppData file (Kai Willadsen) * Change order of version control selection for CVS and old SVN (Kai Willadsen) * Fix escaped markup in folder comparisons (Kai Willadsen) Translations: * Daniel Mustieles (es) * Enrico Nicoletto (pt_BR) * Gabor Kelemen (hu) * Marek Černocký (cs) * Milo Casagrande (it) * Piotr Drąg (pl)
2013-09-15Update to 1.8.0:wiz2-7/+7
2013-9-15 meld 1.8.0 ==================== Fixes: * Minor fixes (Kai Willadsen) Translations: * Matej Urbančič (sl)
2013-09-02Update to 1.7.5:wiz2-6/+6
2013-9-1 meld 1.7.5 =================== Features: * Open the version control console view when the exit code of a VC operation indicates that there was an error (Kai Willadsen) * Improve our handling of bad gconf setups, and add a file-system key to force a no-gconf fallback for persistent issues (Daniel Richard G) * Add a preference for whether to highlight the current line of a file comparison (Kai Willadsen) * Keyboard shortcut for the commit dialog (Kai Willadsen) Fixes: * Fix traversing symlink loops in version control comparisons (Kai Willadsen) * Minor fixes and cleanups (Boruch Baum, Sandro Bonazzola, Kai Willadsen) Translations: * Antonio Fernandes C. Neto (pt_BR) * Daniel Mustieles (es) * Fran Diéguez (gl) * Marek Černocký (cs) * Rafael Ferreira (pt_BR) * Piotr Drąg (pl)
2013-08-20Pick up maintainership.wiz1-2/+2
2013-07-28Update to 1.7.4:wiz3-16/+10
2013-7-28 meld 1.7.4 ==================== Features: * Commit dialog can now automatically wrap commit messages (Kai Willadsen) * Add Bazaar support for pushing changes, and improve sensitivity setting (Louis des Landes) * Support Subversion 1.8 (Yuri) * Type-ahead-find search now works in folder comparisons (Kai Willadsen) * Preference to swap pane order left = local (Kai Willadsen) * Arch, Codeville and RCS are no longer supported (Kai Willadsen) Fixes: * When opening new tabs from the command line, bring new tab to the front (Richard Simmons) * Current chunk highlight is now customisable using gtkrc (Louis des Landes) * Syncpoints now prevent chunks from being re-merged, syncpoints move with insertions, and disable automatic updating (Kai Willadsen) * Various version control updates and fixes (Louis des Landes, Kai Willadsen) * Sensitivity fixes (Kai Willadsen) * Translation string fixes (Marek Černocký) Translations: * Daniel Mustieles (es) * Dimitris Spingos (el) * Fran Diéguez (gl) * Marek Černocký (cs) * Matej Urbančič (sl) * Piotr Drąg (pl)
2013-06-04Update to 1.7.3:wiz3-8/+11
2013-5-4 meld 1.7.3 ==================== Features: * Support launching conflict comparisons from Subversion (Louis des Landes) * The external text editor setting now supports opening files at a particular line number (Konstantin Starojitski) * A host of minor improvements to the version control UI, including: * Add a new Push action for VC modules, currently supported in Git (Kai Willadsen) * Show a summary of unpushed commits, currently supported in Git (Kai Willadsen) * Reworked commit dialog, including more details about files to be committed and more useful previous-log selection (Kai Willadsen) * Console output for VC comparisons is now formatted to better distinguish commands, output and errors (Kai Willadsen) * Support better sensitivity handling in VC comparisons, currently implemented by Git (Kai Willadsen) * Sundry minor UI improvements: * Much HIG-ification and better wording for actions, dialogs and labels (Kai Willadsen, with diligent bug reporting from Adam Dingle) * Make columns user-resizable in version control and folder comparisons (Kai Willadsen) * There is now a Save All action, to save all modified files in the current comparison (Kai Willadsen) * Rather than giving up on long inline-highlighting comparisons, Meld now prompts to continue the comparison (Kai Willadsen) * F5 is now a additional shortcut for Refresh (Kai Willadsen) * Reload has been renamed to Revert and its UI has been improved for file comparisons (Kai Willadsen) Fixes: * Version control updates and miscellaneous fixes (Dominique Leuenberger, Louis des Landes, Timothy Babych, Kai Willadsen) * When guessing file types for syntax highlighting, we now use file contents as well as extension (Kai Willadsen) * Prev/Next Change navigation now centres changes slightly more aggressively (Kai Willadsen) Translations: * Daniel Mustieles (es) * Gabor Kelemen (hu) * Inaki Larranaga Murgoitio (eu) * Jiro Matsuzawa (ja) * Marek Černocký (cs) * Martin Srebotnjak (sl) * Matej Urbančič (sl) * Pere Orga (ca) * Piotr Drąg (pl) * Rafael Ferreira (pt_BR) * Мирослав Николић (sr, sr@latin)
2013-04-21Update to 1.7.2:wiz3-7/+10
2013-4-16 meld 1.7.2 ==================== Features: * In version control view, conflicts now open in a three-way merge mode for Bazaar and Git, with other VCs to follow (Louis des Landes) * Manual synchronisation of split points for comparisons (Piotr Piastucki, Kai Willadsen) * The "Ignore blank lines" setting is now used in folder comparisons, in same manner as text filters (Kai Willadsen) Fixes: * Many minor Windows compatibility fixes (Vincent Legoll, Robert Wahler, Kai Willadsen) * Version control compatibility updates and fixes (Manuel Siggen, Kai Willadsen) * Better handling of Unicode filenames (Kai Willadsen) * Better support for cross-platform newline behaviour, particularly on Windows (Kai Willadsen) * Sensitivity fixes for file and folder comparisons (Kai Willadsen) * Build and installation fixes (Kalev Lember, Kai Willadsen) Translations: * Daniel Mustieles (es) * Gabor Kelemen (hu) * Marek Černocký (cs) * Martin Srebotnjak (sl). * Matej Urbančič (sl) * Мирослав Николић (sr, sr@latin) * Piotr Drąg (pl) * Rafael Ferreira (pt_BR)
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 03:35:54 +0000