Added patch fixing the crashes when starting a second instance of Shutter

3 files changed, 67 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc3974c7dbf4..bc6c7fa9573b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = shutter
 	pkgdesc = a featureful screenshot tool (formerly gscrot)
 	pkgver = 0.93.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://shutter-project.org/
 	arch = any
 	license = GPL3
 	depends = xdg-utils
 	depends = imagemagick
-	depends = bc
 	depends = procps
 	depends = librsvg
 	depends = gnome-perl
@@ -16,12 +15,9 @@ pkgbase = shutter
 	depends = perl-gtk2-imageview
 	depends = perl-gtk2-unique
 	depends = perl-x11-protocol
-	depends = perl-image-exiftool
 	depends = perl-proc-simple
 	depends = perl-proc-processtable
 	depends = perl-net-dbus
-	depends = perl-net-dropbox-api
-	depends = perl-goo-canvas
 	depends = perl-sort-naturally
 	depends = perl-json
 	depends = perl-json-xs
@@ -33,16 +29,25 @@ pkgbase = shutter
 	depends = perl-file-copy-recursive
 	depends = perl-path-class
 	depends = perl-xml-simple
-	optdepends = nautilus-sendto: "Send To" functionality in right-click and main menu
-	optdepends = gnome-web-photo: Support for capturing websites
+	optdepends = gnome-web-photo: web screenshot support
+	optdepends = perl-image-exiftool: read and write EXIF data
+	optdepends = nautilus-sendto: integration in Nautilus
+	optdepends = perl-goo-canvas: editing screenshots
+	optdepends = perl-gtk2-appindicator: AppIndicators support
+	optdepends = perl-net-dropbox-api: Dropbox upload support
+	optdepends = perl-path-class: Dropbox upload support
+	optdepends = perl-lwp-protocol-https: Dropbox upload support
+	optdepends = bc: 3D Rotate and 3D Reflection plugins support
 	source = http://shutter-project.org/wp-content/uploads/releases/tars/shutter-0.93.1.tar.gz
 	source = CVE-2015-0854.patch
 	source = fix-dropbox.patch
 	source = fix-unicode.patch
+	source = fix-second-instance-crash.patch
 	sha512sums = 50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04
 	sha512sums = 4307cdfe9409e3ff66c74730caa99932e1b8a2698012e948b974157219f4fc572117dd1968b29f6ea08736c0fa44a62cdb11855456cff8c280f4cd60edbc1ed6
 	sha512sums = 88fe92c33ba2e580328589d0f1f5639aa40580f96fbc92d05903167f87053d02f472d6afcc839ca18029df6fac065c108c440da551d86494c70b1219b0b032dc
 	sha512sums = 52ac381b5b1bd1ac5ba40cb3f6f425fbfcb5f491855af8c19494b64ba5311e6fdc3579e334a38167e1391cd57aae8d4312e389529d594aade53c6f8a49bc66c8
+	sha512sums = cb6fee947f62d0fdf1f4810136782df8097e764760d6e66fc80945c88af137e4524ab8ec1abd44f9439c1b6c408fe1de779a1c0ff930be0521bedc117c39d4ac
 
 pkgname = shutter
 
diff --git a/PKGBUILD b/PKGBUILD
index 0bb9c94fe2a6..878cdaa64ed7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # $Id: PKGBUILD 195553 2016-11-14 01:48:18Z anthraxx $
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Maintainer: PhotonX <photon89 [at] gmail.com>
+# Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Caleb Maclennan <caleb@alerque.com>
 # Contributor: Shanto <shanto@hotmail.com>
 # Contributor: Athurg <athurg@gooth.cn>
@@ -7,27 +8,35 @@
 
 pkgname=shutter
 pkgver=0.93.1
-pkgrel=3
+pkgrel=4
 pkgdesc="a featureful screenshot tool (formerly gscrot)"
 arch=('any')
 url="http://shutter-project.org/"
 license=('GPL3')
-depends=(xdg-utils imagemagick bc procps librsvg gnome-perl desktop-file-utils
-         perl-{gnome2-wnck,gtk2-{imageview,unique},x11-protocol,image-exiftool}
-         perl-{proc-{simple,processtable},net-{dbus,dropbox-api},goo-canvas}
+depends=(xdg-utils imagemagick procps librsvg gnome-perl desktop-file-utils
+         perl-{gnome2-wnck,gtk2-{imageview,unique},x11-protocol}
+         perl-{proc-{simple,processtable},net-dbus}
          perl-{sort-naturally,json,json-xs,xml-simple,www-mechanize,locale-gettext}
          perl-{file-{which,basedir,copy-recursive},path-class,xml-simple})
-optdepends=('nautilus-sendto: "Send To" functionality in right-click and main menu'
-            'gnome-web-photo: Support for capturing websites')
-           #'perl-gtk2-appindicator: AppIndicator support')
+optdepends=('gnome-web-photo: web screenshot support'
+		'perl-image-exiftool: read and write EXIF data'
+		'nautilus-sendto: integration in Nautilus'
+		'perl-goo-canvas: editing screenshots'
+		'perl-gtk2-appindicator: AppIndicators support'
+		'perl-net-dropbox-api: Dropbox upload support'
+		'perl-path-class: Dropbox upload support'
+		'perl-lwp-protocol-https: Dropbox upload support'
+		'bc: 3D Rotate and 3D Reflection plugins support')
 source=("http://shutter-project.org/wp-content/uploads/releases/tars/$pkgname-$pkgver.tar.gz"
         CVE-2015-0854.patch
         fix-dropbox.patch
-        fix-unicode.patch)
+        fix-unicode.patch
+	  fix-second-instance-crash.patch)
 sha512sums=('50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04'
             '4307cdfe9409e3ff66c74730caa99932e1b8a2698012e948b974157219f4fc572117dd1968b29f6ea08736c0fa44a62cdb11855456cff8c280f4cd60edbc1ed6'
             '88fe92c33ba2e580328589d0f1f5639aa40580f96fbc92d05903167f87053d02f472d6afcc839ca18029df6fac065c108c440da551d86494c70b1219b0b032dc'
-            '52ac381b5b1bd1ac5ba40cb3f6f425fbfcb5f491855af8c19494b64ba5311e6fdc3579e334a38167e1391cd57aae8d4312e389529d594aade53c6f8a49bc66c8')
+            '52ac381b5b1bd1ac5ba40cb3f6f425fbfcb5f491855af8c19494b64ba5311e6fdc3579e334a38167e1391cd57aae8d4312e389529d594aade53c6f8a49bc66c8'
+		'cb6fee947f62d0fdf1f4810136782df8097e764760d6e66fc80945c88af137e4524ab8ec1abd44f9439c1b6c408fe1de779a1c0ff930be0521bedc117c39d4ac')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -39,6 +48,7 @@ prepare() {
   patch -p0 < "${srcdir}/CVE-2015-0854.patch"
   patch -p0 < "${srcdir}/fix-dropbox.patch"
   patch -p0 < "${srcdir}/fix-unicode.patch"
+  patch -p0 < "${srcdir}/fix-second-instance-crash.patch"
 }
 
 package() {
diff --git a/fix-second-instance-crash.patch b/fix-second-instance-crash.patch
new file mode 100644
index 000000000000..df2571d11616
--- /dev/null
+++ b/fix-second-instance-crash.patch
@@ -0,0 +1,35 @@
+--- 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 @@
+ 
+     #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 @@
+                     #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 );
+                 }
+             }
+ 
+@@ -11334,3 +11346,4 @@
+ B<https://bugs.launchpad.net/shutter/+filebug>
+ 
+ =cut
++