[shutter] 64/73: d/patches: 0002: force utf-8 for window menu.

[ChangZhuo Chen]

This is an automated email from the git hooks/post-receive script.

czchen pushed a commit to branch master
in repository shutter.

commit f49eac0e4476b93d381d4081c5a90d5b4ae44d01
Author: Boyuan Yang <073plan at gmail.com>
Date:   Thu Nov 5 21:48:31 2015 -0500

    d/patches: 0002: force utf-8 for window menu.
    
    Signed-off-by: Boyuan Yang <073plan at gmail.com>
---
 debian/changelog                                   |  9 +++++
 ...-utf8-for-retrieved-window-name-from-Gtk2.patch | 40 ++++++++++++++++++++++
 debian/patches/insecure_use_of_system.patch        | 21 +++++++-----
 debian/patches/series                              |  1 +
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84454f2..53abd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+shutter (0.93.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to fix messy display for non-latin characters.
+    (Closes: #847051, LP: #1556021, LP: #1618310)
+  * Add patch to fix crash on sending email. (Closes: #819149)
+
+ -- Boyuan Yang <073plan at gmail.com>  Tue, 06 Dec 2016 17:21:36 +0800
+
 shutter (0.93.1-1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch b/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch
new file mode 100644
index 0000000..6ed2e95
--- /dev/null
+++ b/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch
@@ -0,0 +1,40 @@
+From: Boyuan Yang <073plan at gmail.com>
+Date: Mon, 5 Dec 2016 16:21:51 +0800
+Subject: Force utf8 for retrieved window name from Gtk2.
+
+Transform the window name retrieved from Gtk2 to utf8
+to prevent messy encoding problem. Otherwise latin-1
+would be used and cause mess.
+
+This should work on most contemporary systems.
+
+Signed-off-by: Boyuan Yang <073plan at gmail.com>
+---
+ bin/shutter | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/bin/shutter b/bin/shutter
+index a0495d4..38eeedd 100755
+--- a/bin/shutter
++++ b/bin/shutter
+@@ -30,6 +30,9 @@ use utf8;
+ use strict;
+ use warnings;
+ 
++#Deal with encoding problem
++use Encode;
++
+ #Gnome2 libraries
+ use Gnome2;
+ use Gnome2::Wnck;
+@@ -8624,7 +8627,9 @@ else {
+         #add all windows to menu to capture it directly
+         foreach my $win ( $wnck_screen->get_windows_stacked ) {
+             if ( $active_workspace && $win->is_on_workspace($active_workspace) ) {
+-                my $window_item = Gtk2::ImageMenuItem->new_with_label( $win->get_name );
++                my $win_name = $win->get_name;
++                Encode::_utf8_on( $win_name );
++                my $window_item = Gtk2::ImageMenuItem->new_with_label( $win_name );
+                 foreach my $child ( $window_item->get_children ) {
+                     if ( $child =~ /Gtk2::AccelLabel/ ) {
+                         $child->set_width_chars(50);
diff --git a/debian/patches/insecure_use_of_system.patch b/debian/patches/insecure_use_of_system.patch
index e71a44f..1cd93c2 100644
--- a/debian/patches/insecure_use_of_system.patch
+++ b/debian/patches/insecure_use_of_system.patch
@@ -1,13 +1,18 @@
-Description: Fix insecure use of system()
-Author: Luke Faraone <lfaraone at debian.org>
+From: Loke Faraone <lfaraone at debian.org>
+Date: Thu, 5 Nov 2015 21:35:37 -0500
+Subject: Fix insecure use of system()
 Bug: https://bugs.launchpad.net/shutter/+bug/1495163
-Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798862
+Debian-Bug: https://bugs.debian.org/798862
 
-Index: shutter/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm
-===================================================================
---- shutter.orig/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm	2015-11-05 21:34:34.222313258 -0500
-+++ shutter/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm	2015-11-05 21:35:37.299461116 -0500
-@@ -53,7 +53,8 @@
+---
+ share/shutter/resources/modules/Shutter/App/HelperFunctions.pm | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm
+index 0de1a6c..ffd0de1 100644
+--- a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm
++++ b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm
+@@ -53,7 +53,8 @@ sub new {
  
  sub xdg_open {
  	my ( $self, $dialog, $link, $user_data ) = @_;
diff --git a/debian/patches/series b/debian/patches/series
index 3c3a073..f01ee2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 insecure_use_of_system.patch
+0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/shutter.git