Merge remote-tracking branch 'upstream/master'

NEWS

@@ -1,4 +1,73 @@
 
+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-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-15 meld 3.15.1
 ======================
 

README

@@ -23,6 +23,13 @@ Requirements
 * GtkSourceView 3.14
 
 
+Build requirements
+------------------
+
+* intltool
+* itstool
+
+
 Running
 -------
 

bin/meld

@@ -202,19 +202,6 @@ def setup_resources():
         Gdk.Screen.get_default(), provider,
         Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 
-    # This is a hack to get the LinkMap to use Gtk.TextView background
-    # colour. Ideally we'd have a symbolic colour, or could more easily
-    # do this on the widget itself.
-    textview = Gtk.TextView()
-    textview_context = textview.get_style_context()
-    bg_colour = textview_context.get_background_color(Gtk.StateFlags.NORMAL)
-    linkmap_css = "LinkMap { background-color: %s; }" % bg_colour.to_string()
-    linkmap_provider = Gtk.CssProvider()
-    linkmap_provider.load_from_data(linkmap_css)
-    Gtk.StyleContext.add_provider_for_screen(
-        Gdk.Screen.get_default(), linkmap_provider,
-        Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-
     style_path = os.path.join(meld.conf.DATADIR, "styles")
     GtkSource.StyleSchemeManager.get_default().append_search_path(style_path)
 

data/meld-Makefile

@@ -0,0 +1,5 @@
+all:
+	python2 setup.py build
+
+install:
+	python2 setup.py install --prefix /app

data/meld.css

@@ -1,7 +1,7 @@
 
-.meld-notebook-toolbar.toolbar {
+.meld-notebook-toolbar {
 	background-image: none;
-    background-color: @theme_base_color;
+    background-color: @theme_bg_color;
     border-width: 0 0 1px 0;
     border-style: solid;
     border-color: @borders;
@@ -10,10 +10,16 @@
     padding: 3px 2px 2px 2px;
 }
 
-LinkMap {
+link-map {
     border-width: 0 0 1px 0;
     border-style: solid;
     border-color: @borders;
+    background-color: @theme_bg_color;
+}
+
+/* Only for backwards-compatibility with pre-3.20 GTK+ */
+LinkMap {
+    background-color: @theme_bg_color;
 }
 
 .meld-vc-console-pane {

data/org.gnome.meld-devel.json

@@ -0,0 +1,105 @@
+{
+  "app-id": "org.gnome.meld",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "master",
+  "sdk": "org.gnome.Sdk",
+  "command": "meld",
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig",
+    "/share/pkgconfig",
+    "/share/aclocal",
+    "/man",
+    "/share/man",
+    "/share/gtk-doc",
+    "/share/vala",
+    "*.la",
+    "*.a",
+    "*.pyc",
+    "*.pyo"
+  ],
+  "build-options": {
+    "cflags": "-O2 -g",
+    "cxxflags": "-O2 -g",
+    "env": {
+      "V": "1"
+    }
+  },
+  "rename-appdata-file": "meld.appdata.xml",
+  "rename-desktop-file": "meld.desktop",
+  "rename-icon": "meld",
+  "finish-args": [
+    /* X11 + XShm */
+    "--share=ipc", "--socket=x11",
+    /* Wayland */
+    "--socket=wayland",
+    /* Filesystem */
+    "--filesystem=host",
+    /* dconf */
+    "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+  ],
+  "modules": [
+    {
+      "name": "gtksourceview",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz",
+          "sha256": "60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2"
+        }
+      ]
+    },
+    {
+      "name": "py2cairo",
+      "rm-configure": true,
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://cairographics.org/releases/py2cairo-1.10.0.tar.bz2",
+          "sha256": "d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431"
+        },
+        {
+          "type": "script",
+          "commands": [
+            "libtoolize --force",
+            "aclocal",
+            "autoheader",
+            "automake --force-missing --add-missing --foreign",
+            "autoconf"
+          ],
+          "dest-filename": "autogen.sh"
+        }
+      ]
+    },
+    {
+      "name": "pygobject",
+      "build-options" : {
+        "env": {
+          "PYTHON": "python2"
+        }
+      },
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.18/pygobject-3.18.2.tar.xz",
+          "sha256": "2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f"
+        }
+      ]
+    },
+    {
+      "name": "meld",
+      "no-autogen": true,
+      "sources": [
+        {
+          "type": "git",
+          "url": "git://git.gnome.org/meld"
+        },
+        {
+          "type": "file",
+          "path": "data/meld-Makefile",
+          "dest-filename": "Makefile"
+        }
+      ]
+    }
+  ]
+}

meld/build_helpers.py

@@ -186,7 +186,7 @@ def check_help(self):
 class build_icons(distutils.cmd.Command):
 
     icon_dir = os.path.join("data", "icons")
-    target = "share/icons/"
+    target = "share/icons"
     frozen_target = "share/meld/icons"
 
     def initialize_options(self):

meld/conf.py

@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.15.2"
+__version__ = "3.15.4"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

meld/diffgrid.py

@@ -144,6 +144,7 @@ def _calculate_positions(self, xmin, xmax, wlink1, wlink2,
         return int(round(pos1)), int(round(pos2))
 
     def do_size_allocate(self, allocation):
+        Gtk.Grid.do_size_allocate(self, allocation)
         self.set_allocation(allocation)
         wcols, hrows = self._get_min_sizes()
         yrows = [allocation.y,
@@ -315,7 +316,7 @@ def draw(self, cairocontext):
             return
 
         stylecontext = self._widget.get_style_context()
-        state = self._widget.get_state_flags()
+        state = stylecontext.get_state()
         if self._widget.is_focus():
             state |= Gtk.StateFlags.SELECTED
         if self._prelit:

meld/dirdiff.py

@@ -21,6 +21,7 @@
 import datetime
 import errno
 import functools
+import locale
 import os
 import re
 import shutil
@@ -193,8 +194,9 @@ def _files_same(files, regexes, comparison_args):
         # For probable text files, discard newline differences to match
         # file comparisons.
         contents = ["\n".join(c.splitlines()) for c in contents]
-        for r in regexes:
-            contents = [re.sub(r, "", c) for c in contents]
+
+        contents = [misc.apply_text_filters(c, regexes) for c in contents]
+
         if ignore_blank_lines:
             contents = [remove_blank_lines(c) for c in contents]
         result = SameFiltered if all_same(contents) else Different
@@ -1318,6 +1320,7 @@ def stat(f):
             all_present_same = self.file_compare(lof, regexes)
         different = 1
         one_isdir = [None for i in range(self.model.ntree)]
+        locale_encoding = locale.getpreferredencoding()
         for j in range(self.model.ntree):
             if mod_times[j]:
                 isdir = os.path.isdir( files[j] )
@@ -1345,6 +1348,7 @@ def stat(f):
                 TIME = self.model.column_index(COL_TIME, j)
                 mod_datetime = datetime.datetime.fromtimestamp(mod_times[j])
                 time_str = mod_datetime.strftime("%a %d %b %Y %H:%M:%S")
+                time_str = time_str.decode(locale_encoding, errors='replace')
                 self.model.set_value(it, TIME, time_str)
 
                 def natural_size(bytes):