r43898 - in /packages/unstable/meld/debian: changelog patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch patches/series

[rbalint at users.alioth.debian.org]

Author: rbalint
Date: Mon Nov 24 21:24:07 2014
New Revision: 43898

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43898
Log:
Fix SIGINT handling using upstream patch

Added:
    packages/unstable/meld/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/series

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=43898&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog	[utf-8] (original)
+++ packages/unstable/meld/debian/changelog	[utf-8] Mon Nov 24 21:24:07 2014
@@ -1,3 +1,10 @@
+meld (3.12.1-2) unstable; urgency=medium
+
+  * Fix SIGINT handling by cherry-picking patch from upstream
+    (Closes: #768180)
+
+ -- Balint Reczey <balint at balintreczey.hu>  Tue, 28 Oct 2014 00:52:16 +0100
+
 meld (3.12.1-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/unstable/meld/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch?rev=43898&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch	(added)
+++ packages/unstable/meld/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch	[utf-8] Mon Nov 24 21:24:07 2014
@@ -0,0 +1,42 @@
+From 74e15dda8536b1b381e91496527ead06c3182c35 Mon Sep 17 00:00:00 2001
+From: Kai Willadsen <kai.willadsen at gmail.com>
+Date: Sat, 22 Nov 2014 08:07:16 +1000
+Subject: [PATCH] bin/meld: Hook SIGINT using GLib instead of Python for
+ instant quitting
+
+The previous solution worked, but waited until the window got focus,
+repainted or we otherwise ran the event loop, which was weird. This
+just works straight away.
+---
+ bin/meld | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/bin/meld
++++ b/bin/meld
+@@ -21,6 +21,7 @@
+ import locale
+ import logging
+ import os
++import signal
+ import subprocess
+ import sys
+ 
+@@ -130,7 +131,7 @@
+ 
+     pyver = (2, 7)
+     gtk_requirement = (3, 6)
+-    glib_requirement = (2, 34, 0)
++    glib_requirement = (2, 36, 0)
+     gtksourceview_requirement = (3, 6, 0)
+ 
+     def missing_reqs(mod, ver, exception=None):
+@@ -243,5 +244,9 @@
+     setup_resources()
+ 
+     import meld.meldapp
++    if sys.platform != 'win32':
++        from gi.repository import GLib
++        GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT,
++                             lambda *args: meld.meldapp.app.quit(), None)
+     status = meld.meldapp.app.run(sys.argv)
+     sys.exit(status)

Modified: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=43898&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/series	[utf-8] (original)
+++ packages/unstable/meld/debian/patches/series	[utf-8] Mon Nov 24 21:24:07 2014
@@ -1,2 +1,3 @@
 01_skip_compile_schema_and_icon_cache_update.patch
 0001-meld.vc.svn-Make-repository-validity-check-relative-.patch
+0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch