diff options
author | Photon89 | 2017-02-16 14:20:51 +0100 |
---|---|---|
committer | Photon89 | 2017-02-16 14:20:51 +0100 |
commit | 3dc1d48cd550271568bf5a4c0ef1e6939fc60451 (patch) | |
tree | 0552331c1ade437011bdfc50c6b88e1987e50d35 | |
parent | 7cf3140eb7ae2a31582587f93adee5e0c5755bde (diff) | |
download | aur-3dc1d48cd550271568bf5a4c0ef1e6939fc60451.tar.gz |
Finally a patch which completely fixes the second instance crash!
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | fix-second-instance-crash.patch | 79 |
3 files changed, 58 insertions, 32 deletions
@@ -1,7 +1,7 @@ pkgbase = shutter pkgdesc = A featureful screenshot tool (formerly gscrot) pkgver = 0.93.1 - pkgrel = 10 + pkgrel = 11 url = http://shutter-project.org/ arch = any license = GPL3 @@ -49,7 +49,7 @@ pkgbase = shutter sha512sums = 4307cdfe9409e3ff66c74730caa99932e1b8a2698012e948b974157219f4fc572117dd1968b29f6ea08736c0fa44a62cdb11855456cff8c280f4cd60edbc1ed6 sha512sums = 88fe92c33ba2e580328589d0f1f5639aa40580f96fbc92d05903167f87053d02f472d6afcc839ca18029df6fac065c108c440da551d86494c70b1219b0b032dc sha512sums = 9fe445552ba530358a31c4ab1b03bf4e20f626f138b30e40a948340ce7de0a6549694b84e984dfd3a06b48eac94e9575fe6e6332b1af5cd92bf439bfa448b95d - sha512sums = cb6fee947f62d0fdf1f4810136782df8097e764760d6e66fc80945c88af137e4524ab8ec1abd44f9439c1b6c408fe1de779a1c0ff930be0521bedc117c39d4ac + sha512sums = 3b0fb654fb3338ea51cc9c1413b03186557eda54743333a36ff9ca2ffd40cdc6b3cfe58f8f7dd377351ec8e114d0ebf5c79ada8d1034375d4d5e1866114bcd4b sha512sums = 7c7ff590237bb2bd5b54aeec7ad013542d6f64624fa16c0f129875cca908f6d8666328edd2ebf1fa80bdedc683785ba75516d8fdee9ca25b48aca117fb89baf6 sha512sums = fe3906073b0fa0dcd5468a8ae16181d959edb691ae7c722aa4139e11baaa130fd79939162199cda09c43b5fb29d0690b602932dcaaebbea53730f5acbd89e9a1 @@ -8,7 +8,7 @@ pkgname=shutter pkgver=0.93.1 -pkgrel=10 +pkgrel=11 pkgdesc="A featureful screenshot tool (formerly gscrot)" arch=('any') url="http://shutter-project.org/" @@ -38,7 +38,7 @@ sha512sums=('50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ec '4307cdfe9409e3ff66c74730caa99932e1b8a2698012e948b974157219f4fc572117dd1968b29f6ea08736c0fa44a62cdb11855456cff8c280f4cd60edbc1ed6' '88fe92c33ba2e580328589d0f1f5639aa40580f96fbc92d05903167f87053d02f472d6afcc839ca18029df6fac065c108c440da551d86494c70b1219b0b032dc' '9fe445552ba530358a31c4ab1b03bf4e20f626f138b30e40a948340ce7de0a6549694b84e984dfd3a06b48eac94e9575fe6e6332b1af5cd92bf439bfa448b95d' - 'cb6fee947f62d0fdf1f4810136782df8097e764760d6e66fc80945c88af137e4524ab8ec1abd44f9439c1b6c408fe1de779a1c0ff930be0521bedc117c39d4ac' + '3b0fb654fb3338ea51cc9c1413b03186557eda54743333a36ff9ca2ffd40cdc6b3cfe58f8f7dd377351ec8e114d0ebf5c79ada8d1034375d4d5e1866114bcd4b' '7c7ff590237bb2bd5b54aeec7ad013542d6f64624fa16c0f129875cca908f6d8666328edd2ebf1fa80bdedc683785ba75516d8fdee9ca25b48aca117fb89baf6' 'fe3906073b0fa0dcd5468a8ae16181d959edb691ae7c722aa4139e11baaa130fd79939162199cda09c43b5fb29d0690b602932dcaaebbea53730f5acbd89e9a1') @@ -53,7 +53,8 @@ prepare() { patch -p0 < "${srcdir}/fix-dropbox.patch" # patch -p0 < "${srcdir}/fix-unicode.patch" patch ${srcdir}/$pkgname-$pkgver/bin/shutter < "${srcdir}/fix-unicode.patch" - patch -p0 < "${srcdir}/fix-second-instance-crash.patch" +# patch -p0 < "${srcdir}/fix-second-instance-crash.patch" + patch ${srcdir}/$pkgname-$pkgver/bin/shutter < "${srcdir}/fix-second-instance-crash.patch" patch -p0 < "${srcdir}/fix-imgur.patch" patch ${srcdir}/$pkgname-$pkgver/bin/shutter < "${srcdir}/fix-mail-sendto.patch" } diff --git a/fix-second-instance-crash.patch b/fix-second-instance-crash.patch index df2571d11616..ec84d448694c 100644 --- a/fix-second-instance-crash.patch +++ b/fix-second-instance-crash.patch @@ -1,35 +1,60 @@ ---- bin/shutter 2017-01-04 10:56:38.404752277 +0100 -+++ bin/shutter-fixed 2017-01-04 11:15:49.794702540 +0100 -@@ -322,6 +322,12 @@ +From 380c313840dd223e5b6c35720a79c338780f42d6 Mon Sep 17 00:00:00 2001 +From: Lionel Miller <delonorm@gmail.com> +Date: Wed, 14 Dec 2016 02:31:52 +0300 +Subject: [PATCH] Fixed segfaults on Manjaro + +On Manjaro Linux, shutter would segfault whenever it would receive +a message from another running instance of itself. This was caused +by the fact that dbus did not handle correctly messages with empty +text. This patch adds an extra check to prevent that. +--- + bin/shutter | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/bin/shutter b/bin/shutter +index a0495d4..f70980c 100755 +--- a/bin/shutter ++++ b/bin/shutter +@@ -442,12 +442,14 @@ else { + #set export filename + } + elsif ( $cmd eq 'exfilename' ) { +- $sc->set_export_filename( $message->get_text ); ++ my $arg = defined $message->get ? $message->get_text : ""; ++ $sc->set_export_filename( $arg ); + + #set delay + } + elsif ( $cmd eq 'delay' ) { +- $sc->set_delay( $message->get_text ); ++ my $arg = defined $message->get ? $message->get_text : ""; ++ $sc->set_delay( $arg ); + + #set include_cursor flag + } +@@ -464,12 +466,13 @@ else { + #set nosession flag + } + elsif ( $cmd eq 'nosession' ) { +- $sc->set_no_session( $message->get_text ); ++ my $arg = defined $message->get ? $message->get_text : ""; ++ $sc->set_no_session( $arg ); - #send $cmdid - if ( defined $cmdid && defined $extra ) { -+ if (!$extra) { -+ # Quick fix to avoid segmentation fault in some environments. -+ -+ $extra = "text=>null"; -+ } -+ - $app->send_message( $cmdid, text => $extra ); - } - elsif ( defined $cmdid ) { -@@ -487,7 +493,13 @@ + #open new files + } + elsif ( $cmd eq 'fopen' ) { +- my @init_files = $message->get_uris; ++ my @init_files = defined $message->get ? $message->get_uris : (); + if ( scalar @init_files > 0 ) { + &fct_open_files(@init_files); + } +@@ -483,7 +486,8 @@ else { #take screenshot } else { - &evt_take_screenshot( 'global_keybinding', $cmd, undef, $message->get_text ); -+ my $extra = $message->get_text; -+ -+ if ( $extra eq "text=>null" ) { -+ $extra = ''; -+ } -+ -+ &evt_take_screenshot( 'global_keybinding', $cmd, undef, $extra ); ++ my $arg = defined $message->get ? $message->get_text : ""; ++ &evt_take_screenshot( 'global_keybinding', $cmd, undef, $arg ); } } -@@ -11334,3 +11346,4 @@ - B<https://bugs.launchpad.net/shutter/+filebug> - - =cut -+ |