Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2014-11-18 22:44:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2014-11-04 17:29:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2014-11-18 22:44:55.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Nov 3 17:32:28 UTC 2014 - [email protected] + +- Add patches from upstream: + + meld-fix-tab-width-handling.patch: fix GtkSourceView tab width + property binding (bgo#738001) + + meld-ignore-error-when-copying-metadata.patch: Ignore ENOTSUP + when copying file metadata + + meld-SIGINT-handler.patch: add a SIGINT signal handler for + convenience (bgo#739719) + + meld-starting-from-different-name-symlink.patch: allow + starting Meld from differently-named symlink (bgo#739399) + +------------------------------------------------------------------- New: ---- meld-SIGINT-handler.patch meld-fix-tab-width-handling.patch meld-ignore-error-when-copying-metadata.patch meld-starting-from-different-name-symlink.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.BcXDQ3/_old 2014-11-18 22:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.BcXDQ3/_new 2014-11-18 22:44:56.000000000 +0100 @@ -26,6 +26,14 @@ Source: http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch [email protected] -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch +#PATCH-FIX-UPSTREAM meld-fix-tab-width-handling.patch bgo#738001 [email protected] -- Fix GtkSourceView tab width property binding +Patch1: meld-fix-tab-width-handling.patch +#PATCH-FIX-UPSTREAM meld-ignore-error-when-copying-metadata.patch [email protected] -- Ignore ENOTSUP when copying file metadata +Patch2: meld-ignore-error-when-copying-metadata.patch +#PATCH-FIX-UPSTREAM meld-SIGINT-handler.patch bgo#739719 [email protected] -- Add a SIGINT signal handler for convenience +Patch3: meld-SIGINT-handler.patch +#PATCH-FIX-UPSTREAM meld-starting-from-different-name-symlink.patch bgo#739399 [email protected] -- Allow starting Meld from differently-named symlink (bgo#739399) +Patch4: meld-starting-from-different-name-symlink.patch BuildRequires: fdupes # Needed for glib2_gsettings_schema macros BuildRequires: glib2-devel @@ -72,6 +80,10 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 translation-update-upstream %build ++++++ meld-SIGINT-handler.patch ++++++ >From af258a4125fa5bd6f2bbd8cb9cc032847c077d5d Mon Sep 17 00:00:00 2001 From: Kai Willadsen <[email protected]> Date: Sun, 9 Nov 2014 08:43:01 +1000 Subject: bin/meld: Add a SIGINT signal handler for convenience (bgo#739719) This handler does no nice cleanup or anything, but that makes it functionally equivalent to Meld 1.8.x in terms of behaviour. We *could* add nicer handling to ensure that e.g., VC temp files get cleaned up, but that's another problem. diff --git a/bin/meld b/bin/meld index 6da1a80..1e53d59 100755 --- a/bin/meld +++ b/bin/meld @@ -21,6 +21,7 @@ from __future__ import print_function import locale import logging import os +import signal import subprocess import sys @@ -251,5 +252,6 @@ if __name__ == '__main__': setup_resources() import meld.meldapp + signal.signal(signal.SIGINT, lambda *args: meld.meldapp.app.quit()) status = meld.meldapp.app.run(sys.argv) sys.exit(status) -- cgit v0.10.1 ++++++ meld-fix-tab-width-handling.patch ++++++ >From 6d27183fd85b052bf4f98e13d186b02abd7b6af2 Mon Sep 17 00:00:00 2001 From: Kai Willadsen <[email protected]> Date: Tue, 28 Oct 2014 06:42:02 +1000 Subject: sourceview: Fix GtkSourceView tab width property binding (bgo#738001) The tab-width and indent-width properties interact weirdly if they're different. This was a breakage in the GtkSourceView 3 migration, so just switch the binding back over here. This might cause some pain in the future if we want to support setting both for some reason, but I don't actually know why we'd want to do that. diff --git a/meld/sourceview.py b/meld/sourceview.py index 48aa9a2..a0c9e4f 100644 --- a/meld/sourceview.py +++ b/meld/sourceview.py @@ -49,7 +49,7 @@ class MeldSourceView(GtkSource.View): __gtype_name__ = "MeldSourceView" __gsettings_bindings__ = ( - ('indent-width', 'indent-width'), + ('indent-width', 'tab-width'), ('insert-spaces-instead-of-tabs', 'insert-spaces-instead-of-tabs'), ('show-line-numbers', 'show-line-numbers'), ('draw-spaces', 'draw-spaces'), -- cgit v0.10.1 ++++++ meld-ignore-error-when-copying-metadata.patch ++++++ >From 23b8078103bc257ef091400a10540321b0527f19 Mon Sep 17 00:00:00 2001 From: Kai Willadsen <[email protected]> Date: Sun, 9 Nov 2014 08:34:21 +1000 Subject: misc: Ignore ENOTSUP when copying file metadata This error will be thrown when, for example, trying to copy files to an FTP mount. Getting this error is a very strong indication that doing this metadata modification on this location will *never* work, so there's not a lot of point in showing the user an error. diff --git a/meld/misc.py b/meld/misc.py index 5bed516..f6530e8 100644 --- a/meld/misc.py +++ b/meld/misc.py @@ -322,7 +322,7 @@ def copy2(src, dst): try: shutil.copystat(src, dst) except OSError as e: - if e.errno != errno.EPERM: + if e.errno not in (errno.EPERM, errno.ENOTSUP): raise def copytree(src, dst): -- cgit v0.10.1 ++++++ meld-starting-from-different-name-symlink.patch ++++++ >From a2df04fa8301283d8f5872379e873c77a101d74a Mon Sep 17 00:00:00 2001 From: Kai Willadsen <[email protected]> Date: Sun, 9 Nov 2014 07:11:59 +1000 Subject: bin/meld: Fix starting Meld from differently-named symlink (bgo#739399) diff --git a/bin/meld b/bin/meld index dcef225..8cfa713 100755 --- a/bin/meld +++ b/bin/meld @@ -57,8 +57,7 @@ def get_meld_dir(): return os.path.dirname(sys.executable) # Support running from an uninstalled version - if os.path.basename(__file__) == "meld": - self_path = os.path.realpath(__file__) + self_path = os.path.realpath(__file__) return os.path.abspath(os.path.join(os.path.dirname(self_path), "..")) frozen = getattr(sys, 'frozen', False) -- cgit v0.10.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
