[arch-commits] Commit in xfce4-screenshooter/trunk (3 files)

[Evangelos Foutras]

    Date: Wednesday, May 2, 2012 @ 18:02:07
  Author: foutrelis
Revision: 158095

upgpkg: xfce4-screenshooter 1.8.1-1

New upstream release.

Modified:
  xfce4-screenshooter/trunk/PKGBUILD
Deleted:
  xfce4-screenshooter/trunk/fs-25873-segfault-in-awesome-wm.patch
  xfce4-screenshooter/trunk/xfce4-screenshooter-1.7.9-dsofix.patch

----------------------------------------+
 PKGBUILD                               |   22 ++++++----------------
 fs-25873-segfault-in-awesome-wm.patch  |   21 ---------------------
 xfce4-screenshooter-1.7.9-dsofix.patch |   11 -----------
 3 files changed, 6 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-02 20:46:41 UTC (rev 158094)
+++ PKGBUILD	2012-05-02 22:02:07 UTC (rev 158095)
@@ -3,8 +3,8 @@
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-screenshooter
-pkgver=1.8.0
-pkgrel=3
+pkgver=1.8.1
+pkgrel=1
 pkgdesc="Plugin that makes screenshots for the Xfce panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
@@ -14,26 +14,16 @@
 makedepends=('intltool')
 install=$pkgname.install
 options=('!libtool')
-source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2
-        xfce4-screenshooter-1.7.9-dsofix.patch
-        fs-25873-segfault-in-awesome-wm.patch)
+source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2)
 conflicts=('xfce4-screenshooter-plugin')
 replaces=('xfce4-screenshooter-plugin')
-sha256sums=('68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e'
-            '6902495c0394af19a76e2f90399ca7295e8dfb3ffb29d3b4f3b3a9fb7489c464'
-            '76cc9127167c9f4a800b01e9d16b85bf3af335d0eb44588d859739aa9d457e38')
+sha256sums=('40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/xfce4-screenshooter-1.7.9-dsofix.patch"
-
-  # segfaults trying to capture screenshot of active window in awesome WM
-  # https://bugs.archlinux.org/task/25873
-  # patch by Bruno Ramos @ https://bugzilla.xfce.org/show_bug.cgi?id=8080#c2
-  patch -Np1 -i "$srcdir/fs-25873-segfault-in-awesome-wm.patch"
-
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \

Deleted: fs-25873-segfault-in-awesome-wm.patch
===================================================================
--- fs-25873-segfault-in-awesome-wm.patch	2012-05-02 20:46:41 UTC (rev 158094)
+++ fs-25873-segfault-in-awesome-wm.patch	2012-05-02 22:02:07 UTC (rev 158095)
@@ -1,21 +0,0 @@
---- a/lib/screenshooter-capture.c	
-+++ a/lib/screenshooter-capture.c	
-@@ -381,6 +381,18 @@ static GdkPixbuf
-                   rec_height += rectangle.y;
-                 }
- 
-+              if (rec_x < 0)
-+                {
-+                  rec_width = rec_width + rec_x;
-+                  rec_x = 0;
-+                }
-+
-+              if (rec_y < 0)
-+                {
-+                  rec_height = rec_height + rec_y;
-+                  rec_y = 0;
-+                }
-+
-               if (x_orig + rec_x + rec_width > gdk_screen_width ())
-                 rec_width = gdk_screen_width () - x_orig - rec_x;
- 

Deleted: xfce4-screenshooter-1.7.9-dsofix.patch
===================================================================
--- xfce4-screenshooter-1.7.9-dsofix.patch	2012-05-02 20:46:41 UTC (rev 158094)
+++ xfce4-screenshooter-1.7.9-dsofix.patch	2012-05-02 22:02:07 UTC (rev 158095)
@@ -1,11 +0,0 @@
---- xfce4-screenshooter-1.7.9.orig/Makefile.in	2010-02-07 14:45:15.000000000 +0100
-+++ xfce4-screenshooter-1.7.9/Makefile.in	2010-02-16 23:57:31.000000000 +0100
-@@ -282,7 +282,7 @@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lm -lX11
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@