Merge remote-tracking branch 'upstream/master'

Author: yousseb

NEWS

@@ -1,4 +1,221 @@
 
+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-08-16 meld 3.17.4
+======================
+
+  Fixes:
+
+   * Rebuild source tarball without spurious files
+
+
+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-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-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)
+
+
+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)
+
+
+  Fixes included in 3.16 releases:
+
+   * 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 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)
+   * Fix performance regression in text filtering (Kai Willadsen)
+   * Fix regression in respecting custom text encoding (Kai Willadsen)
+   * 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)
+
+
+  Translations:
+
+   * Anders Jonsson (sv)
+   * Andika Triwidada (id)
+   * Balázs Meskó (hu)
+   * Claude Paroz (fr)
+   * Daniel Mustieles (es)
+   * Jiri Grönroos (fi)
+   * Marek Černocký (cs)
+   * Mario Blättermann (de)
+   * Matej Urbančič (sl)
+   * Rafael Fontenelle (pt_BR)
+   * Tiago Santos (pt)
+   * Мирослав Николић (sr, sr@latin)
+
+
 2016-05-01 meld 3.16.0
 ======================
 

README

@@ -16,18 +16,20 @@ Meld is licensed under the GPL v2 or later.
 Requirements
 ------------
 
-* Python 2.7
-* GTK+ 3.14
+* Python 3.4
+* GTK+ 3.20
 * GLib 2.36
-* PyGObject 3.8
-* GtkSourceView 3.14
+* PyGObject 3.20
+* GtkSourceView 3.20
+* pycairo
 
 
 Build requirements
 ------------------
 
 * intltool
 * itstool
+* xmllint
 
 
 Running
@@ -39,11 +41,11 @@ Meld can be run directly from this directory. Just type:
 
 Alternatively, you can install Meld system-wide by running:
 
- * `python setup.py install`
+ * `python3 setup.py install`
 
 or if you're on Ubuntu, instead try:
 
- * `python setup.py install --prefix=/usr`
+ * `python3 setup.py install --prefix=/usr`
 
 ...but you should probably just get a RPM/deb/installer instead, depending on
 your system. Meld packages are available for just about every \*nix
@@ -73,20 +75,33 @@ such as:
 These arguments need to be passed to `setup.py` itself, *not* to the install
 command. In other words, do this:
 
-    python setup.py --no-compile-schemas install
+    python3 setup.py --no-compile-schemas install
 
 **not** this:
 
-    python setup.py install --no-compile-schemas
+    python3 setup.py install --no-compile-schemas
 
 
-Contacting
-----------
+Contributing
+------------
+
+Meld uses Bugzilla to track bugs, and user questions and development
+discussions happen on the Meld mailing list. The development team is small,
+and new contributors are always welcome!
+
+Report a bug:   https://bugzilla.gnome.org/enter_bug.cgi?product=meld
+
+List of bugs:   https://bugzilla.gnome.org/buglist.cgi?quicksearch=product%3A%22meld%22
+
+Mailing list:   https://mail.gnome.org/mailman/listinfo/meld-list
+
+
+
+Links
+-----
 
 Home page:      http://meldmerge.org
 
 Documentation:  http://meldmerge.org/help
 
 Wiki:           https://wiki.gnome.org/Apps/Meld
-
-Mailing list:   https://mail.gnome.org/mailman/listinfo/meld-list

appveyor.yml

@@ -0,0 +1,53 @@
+version: tag-or-branch-set-from-init-script.{build}
+
+# Limit builds to release branches
+branches:
+  only:
+    - master
+    - meld-3-18
+
+# Only build tags automatically
+skip_non_tags: true
+
+init:
+  - ps: |
+      if ($env:APPVEYOR_REPO_TAG -eq "true") {
+          Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME.$env:APPVEYOR_BUILD_NUMBER"
+      }
+      else {
+          Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_BRANCH-$($env:APPVEYOR_REPO_COMMIT.substring(0,7)).$env:APPVEYOR_BUILD_NUMBER"
+      }
+
+environment:
+  PYTHON_PREFIX: C:\Python34
+  PATH: $(PYTHON_PREFIX);$(PYTHON_PREFIX)\Lib\site-packages\gnome;$(PATH)
+
+install:
+  # Install cxFreeze
+  - cmd: |
+      python -m pip install pypiwin32==219
+      python -m pip install cx_Freeze==5.0.2
+
+  # Download and extract the PyGI all-in-one installer
+  - cmd: |
+      curl "https://sourceforge.net/projects/pygobjectwin32/files/pygi-aio-3.24.1_rev1-setup_049a323fe25432b10f7e9f543b74598d4be74a39.exe/download" --location --output pygi-aio-setup.exe
+      set SOURCEPATH=%cd%\pygi-aio-source
+      mkdir %SOURCEPATH%
+      7z.exe x -o%SOURCEPATH% pygi-aio-setup.exe
+      mkdir pygi-aio-setup
+      7z.exe x -opygi-aio-setup %SOURCEPATH%\setup.exe
+      set GIR=True
+
+  # %PYTHON_PREFIX% is used because it is the last supported by
+  # pygi-aio, GTK is installed as a dependency of GTKSourceView
+  - cmd: |
+      pygi-aio-setup\rcmd.exe /c "cd pygi-aio-setup && setup.bat %PYTHON_PREFIX% GTKSourceView >pygi-aio-setup.log"
+
+build_script:
+  - cmd: |
+      %PYTHON_PREFIX%\Lib\site-packages\gnome\glib-compile-schemas data
+      %PYTHON_PREFIX%\python setup_win32.py bdist_msi
+
+artifacts:
+  - path: dist/*.msi
+    name: Meld installer