[arch-commits] Commit in xfce4-screenshooter/trunk (PKGBUILD fix_segfault.diff)

[andyrtr at archlinux.org]

    Date: Tuesday, January 4, 2011 @ 16:47:46
  Author: andyrtr
Revision: 104774

upgpkg: xfce4-screenshooter 1.7.9-2
rebuild for Xfce 4.8pre3 release candidate - add a segfault fix preventing it to start

Added:
  xfce4-screenshooter/trunk/fix_segfault.diff
Modified:
  xfce4-screenshooter/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   28 ++++++++++++++++++----------
 fix_segfault.diff |   17 +++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-04 21:41:30 UTC (rev 104773)
+++ PKGBUILD	2011-01-04 21:47:46 UTC (rev 104774)
@@ -4,32 +4,40 @@
 
 pkgname=xfce4-screenshooter
 pkgver=1.7.9
-pkgrel=1
+pkgrel=2
 pkgdesc="plugin that makes screenshots for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
+#depends=('xfce4-panel' 'libxfcegui4' 'libxfce4ui' 'exo' 'libsoup' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libxfcegui4' 'libsoup' 'hicolor-icon-theme')
+makedepends=('intltool')
 install=${pkgname}.install
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2
-	xfce4-screenshooter-1.7.9-dsofix.patch)
+	xfce4-screenshooter-1.7.9-dsofix.patch
+	fix_segfault.diff)
 conflicts=('xfce4-screenshooter-plugin')
 replaces=('xfce4-screenshooter-plugin')
 md5sums=('c01d1cf3830bf8d60e09c0cdd223034c'
-         '355a7d005bf9200f5a5577f0bc901945')
+         '355a7d005bf9200f5a5577f0bc901945'
+         '794d7e0ff18cad369bd50a78e883f986')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/xfce4-screenshooter-1.7.9-dsofix.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
+  patch -Np1 -i ${srcdir}/xfce4-screenshooter-1.7.9-dsofix.patch
+  patch -Np1 -i ${srcdir}/fix_segfault.diff
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--disable-debug
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }

Added: fix_segfault.diff
===================================================================
--- fix_segfault.diff	                        (rev 0)
+++ fix_segfault.diff	2011-01-04 21:47:46 UTC (rev 104774)
@@ -0,0 +1,17 @@
+--- xfce4-screenshooter-1.7.9/lib/screenshooter-utils.c.orig	2010-01-02 12:42:24.000000000 +0100
++++ xfce4-screenshooter-1.7.9/lib/screenshooter-utils.c	2010-05-20 22:40:38.347861374 +0200
+@@ -94,11 +94,11 @@
+           g_free (title);
+           title =
+             g_strdup (xfce_rc_read_entry (rc, "title", _("Screenshot")));
+-        }
+ 
+-      TRACE ("Close the rc file");
++          TRACE ("Close the rc file");
+ 
+-      xfce_rc_close (rc);
++          xfce_rc_close (rc);
++        }
+     }
+ 
+   /* And set the sd values */