Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2014-12-23 11:50:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-18 22:44:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2014-12-23 11:49:26.000000000 +0100 @@ -1,0 +2,28 @@ +Thu Dec 18 00:45:56 UTC 2014 - [email protected] + +- Add meld-Dont-pass-git-env-vars.patch and + meld-Repaint-TextView-background.patch from upstream. Fixes + boo#909824. + +------------------------------------------------------------------- +Thu Nov 13 00:21:04 UTC 2014 - [email protected] + +- Update to version 3.12.2: + + Fix display of change action buttons and line numbers when + line numbers are shown + + Fix positioning of the change action buttons + + Fix tab width setting not working correctly + + Fix starting comparison of Subversion checkouts from a + subdirectory + + Fix starting Meld from a differently-named symlink + + Ignore errors when copying file metadata if the destination + file system doesn't support it + + Automatically recompile stale in-place gschemas + + Handle SIGINT to support previous quit-on-Ctrl-C behaviour + + Drop patches (incorporated upstream): + - meld-ignore-error-when-copying-metadata.patch + - meld-fix-tab-width-handling.patch + - meld-starting-from-different-name-symlink.patch + - meld-SIGINT-handler.patch. + +------------------------------------------------------------------- Old: ---- meld-3.12.1.tar.xz meld-SIGINT-handler.patch meld-fix-tab-width-handling.patch meld-ignore-error-when-copying-metadata.patch meld-starting-from-different-name-symlink.patch New: ---- meld-3.12.2.tar.xz meld-Dont-pass-git-env-vars.patch meld-Repaint-TextView-background.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.rsycqs/_old 2014-12-23 11:49:29.000000000 +0100 +++ /var/tmp/diff_new_pack.rsycqs/_new 2014-12-23 11:49:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: meld -Version: 3.12.1 +Version: 3.12.2 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ @@ -26,14 +26,10 @@ 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 +# PATCH-FIX-UPSTREAM meld-Dont-pass-git-env-vars.patch [email protected] bgo#741142 -- Don't pass git environment vars on to children, patch from upstream git +Patch1: meld-Dont-pass-git-env-vars.patch +# PATCH-FIX-UPSTREAM meld-Repaint-TextView-background.patch [email protected] bgo#741287 boo#909824 -- Repaint TextView background for modified CSS. Patch from upstream git +Patch2: meld-Repaint-TextView-background.patch BuildRequires: fdupes # Needed for glib2_gsettings_schema macros BuildRequires: glib2-devel @@ -82,8 +78,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 translation-update-upstream %build ++++++ meld-3.12.1.tar.xz -> meld-3.12.2.tar.xz ++++++ ++++ 2400 lines of diff (skipped) ++++++ meld-Dont-pass-git-env-vars.patch ++++++ >From fb085b23a4f3a22d051b8e6c0d2c5cf8a9a7ca20 Mon Sep 17 00:00:00 2001 From: Kai Willadsen <[email protected]> Date: Sat, 13 Dec 2014 06:21:43 +1000 Subject: bin/meld: Don't pass git environment vars on to children (bgo#741142) GIT_DIR and GIT_WORK_TREE are somewhat-helpfully set by some helper tools such as git-gui. However, since we are quite good about setting the cwd everywhere we call our git helpers, this sometimes messes with things for us when invoking from subdirectories and whatnot. Since these vars aren't helping us anyway, we'll just unset them in Meld's environment altogether. diff --git a/bin/meld b/bin/meld index 3d73b1b..f8e4118 100755 --- a/bin/meld +++ b/bin/meld @@ -244,12 +244,23 @@ def setup_logging(): log.addHandler(handler) +def environment_hacks(): + # We manage cwd ourselves for git operations, and GIT_DIR in particular + # can mess with this when set. + for var in ('GIT_DIR', 'GIT_WORK_TREE'): + try: + del os.environ[var] + except KeyError: + pass + + if __name__ == '__main__': setup_logging() disable_stdout_buffering() check_requirements() setup_settings() setup_resources() + environment_hacks() import meld.meldapp if sys.platform != 'win32': -- cgit v0.10.1 ++++++ meld-Repaint-TextView-background.patch ++++++ >From 281583a05117b9d05acb010c98adfebfeb27f70c Mon Sep 17 00:00:00 2001 From: Kai Willadsen <[email protected]> Date: Sat, 13 Dec 2014 08:34:04 +1000 Subject: filediff: Repaint TextView background for modified CSS (bgo#741287) In cases when we've messed with our TextView's CSS to fix GTK+ 3.14 regressions, we need to also repaint the background because some themes don't otherwise do so. Specifically, this breaks oxygen-gtk3 such that diff regions have a background colour, but the rest of the text view is unpainted, which is pretty terrible. diff --git a/bin/meld b/bin/meld index f8e4118..888de37 100755 --- a/bin/meld +++ b/bin/meld @@ -196,12 +196,16 @@ def setup_resources(): style.set_path(widget_path) # This is basically indefensible internal GTK+ ABI, but... whatever. style.add_class(Gtk.STYLE_CLASS_VIEW) + old_bg_color = style.get_background_color( + Gtk.StateFlags.NORMAL).to_string() color = style.get_background_color(Gtk.StateFlags.SELECTED).to_string() fixes_provider = Gtk.CssProvider() fixes_provider.load_from_data( + "@define-color override-background-color %s; " "MeldSourceView { background-color: rgba(0.0, 0.0, 0.0, 0.0); } " - "MeldSourceView:selected { background-color: %s; } " % color) + "MeldSourceView:selected { background-color: %s; } " % + (old_bg_color, color)) Gtk.StyleContext.add_provider_for_screen( Gdk.Screen.get_default(), fixes_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) diff --git a/meld/filediff.py b/meld/filediff.py index 724456e..2c9f027 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -419,6 +419,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component): tag = buf.get_tag_table().lookup("inline") tag.props.background_rgba = lookup("inline-bg", "LightSteelBlue2") + override_bg = style.lookup_color("override-background-color") + self.override_bg = override_bg[1] if override_bg[0] else None + self.fill_colors = {"insert" : lookup("insert-bg", "DarkSeaGreen1"), "delete" : lookup("insert-bg", "DarkSeaGreen1"), "conflict": lookup("conflict-bg", "Pink"), @@ -1529,6 +1532,11 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component): width, height = view_allocation.width, view_allocation.height context.set_line_width(1.0) + if self.override_bg: + context.set_source_rgba(*self.override_bg) + context.rectangle(0, 0, width, height) + context.fill() + for change in self.linediffer.single_changes(pane, bounds): ypos0 = textview.get_y_for_line_num(change[1]) - visible.y ypos1 = textview.get_y_for_line_num(change[2]) - visible.y -- cgit v0.10.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
