diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | fix-unicode.patch | 44 |
3 files changed, 41 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = shutter pkgdesc = a featureful screenshot tool (formerly gscrot) pkgver = 0.93.1 - pkgrel = 6 + pkgrel = 7 url = http://shutter-project.org/ arch = any license = GPL3 @@ -48,7 +48,7 @@ pkgbase = shutter sha512sums = 50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04 sha512sums = 4307cdfe9409e3ff66c74730caa99932e1b8a2698012e948b974157219f4fc572117dd1968b29f6ea08736c0fa44a62cdb11855456cff8c280f4cd60edbc1ed6 sha512sums = 88fe92c33ba2e580328589d0f1f5639aa40580f96fbc92d05903167f87053d02f472d6afcc839ca18029df6fac065c108c440da551d86494c70b1219b0b032dc - sha512sums = 52ac381b5b1bd1ac5ba40cb3f6f425fbfcb5f491855af8c19494b64ba5311e6fdc3579e334a38167e1391cd57aae8d4312e389529d594aade53c6f8a49bc66c8 + sha512sums = 9fe445552ba530358a31c4ab1b03bf4e20f626f138b30e40a948340ce7de0a6549694b84e984dfd3a06b48eac94e9575fe6e6332b1af5cd92bf439bfa448b95d sha512sums = cb6fee947f62d0fdf1f4810136782df8097e764760d6e66fc80945c88af137e4524ab8ec1abd44f9439c1b6c408fe1de779a1c0ff930be0521bedc117c39d4ac sha512sums = 7c7ff590237bb2bd5b54aeec7ad013542d6f64624fa16c0f129875cca908f6d8666328edd2ebf1fa80bdedc683785ba75516d8fdee9ca25b48aca117fb89baf6 @@ -8,7 +8,7 @@ pkgname=shutter pkgver=0.93.1 -pkgrel=6 +pkgrel=7 pkgdesc="a featureful screenshot tool (formerly gscrot)" arch=('any') url="http://shutter-project.org/" @@ -36,7 +36,7 @@ source=("http://shutter-project.org/wp-content/uploads/releases/tars/$pkgname-$p sha512sums=('50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04' '4307cdfe9409e3ff66c74730caa99932e1b8a2698012e948b974157219f4fc572117dd1968b29f6ea08736c0fa44a62cdb11855456cff8c280f4cd60edbc1ed6' '88fe92c33ba2e580328589d0f1f5639aa40580f96fbc92d05903167f87053d02f472d6afcc839ca18029df6fac065c108c440da551d86494c70b1219b0b032dc' - '52ac381b5b1bd1ac5ba40cb3f6f425fbfcb5f491855af8c19494b64ba5311e6fdc3579e334a38167e1391cd57aae8d4312e389529d594aade53c6f8a49bc66c8' + '9fe445552ba530358a31c4ab1b03bf4e20f626f138b30e40a948340ce7de0a6549694b84e984dfd3a06b48eac94e9575fe6e6332b1af5cd92bf439bfa448b95d' 'cb6fee947f62d0fdf1f4810136782df8097e764760d6e66fc80945c88af137e4524ab8ec1abd44f9439c1b6c408fe1de779a1c0ff930be0521bedc117c39d4ac' '7c7ff590237bb2bd5b54aeec7ad013542d6f64624fa16c0f129875cca908f6d8666328edd2ebf1fa80bdedc683785ba75516d8fdee9ca25b48aca117fb89baf6') diff --git a/fix-unicode.patch b/fix-unicode.patch index e89315b8be56..6ed2e9595c23 100644 --- a/fix-unicode.patch +++ b/fix-unicode.patch @@ -1,10 +1,40 @@ ---- bin/shutter 2016-09-11 08:50:24.000000000 +0200 -+++ bin/shutter 2016-09-11 09:20:13.379297948 +0200 -@@ -27,6 +27,7 @@ - #modules - #-------------------------------------- - use utf8; -+use encoding utf8; +From: Boyuan Yang <073plan@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@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); |