[arch-commits] Commit in xfce4-screenshooter/repos (7 files)

[Evangelos Foutras]

    Date: Saturday, April 28, 2012 @ 22:55:10
  Author: foutrelis
Revision: 157695

db-move: moved xfce4-screenshooter from [staging] to [testing] (x86_64)

Added:
  xfce4-screenshooter/repos/testing-x86_64/
  xfce4-screenshooter/repos/testing-x86_64/PKGBUILD
    (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/PKGBUILD)
  xfce4-screenshooter/repos/testing-x86_64/fix_segfault.diff
    (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/fix_segfault.diff)
  xfce4-screenshooter/repos/testing-x86_64/fs-25873-segfault-in-awesome-wm.patch
    (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/fs-25873-segfault-in-awesome-wm.patch)
  xfce4-screenshooter/repos/testing-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch
    (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch)
  xfce4-screenshooter/repos/testing-x86_64/xfce4-screenshooter.install
    (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/xfce4-screenshooter.install)
Deleted:
  xfce4-screenshooter/repos/staging-x86_64/

----------------------------------------+
 PKGBUILD                               |   50 +++++++++++++++++++++++++++++++
 fix_segfault.diff                      |   17 ++++++++++
 fs-25873-segfault-in-awesome-wm.patch  |   21 +++++++++++++
 xfce4-screenshooter-1.7.9-dsofix.patch |   11 ++++++
 xfce4-screenshooter.install            |   13 ++++++++
 5 files changed, 112 insertions(+)

Copied: xfce4-screenshooter/repos/testing-x86_64/PKGBUILD (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-04-29 02:55:10 UTC (rev 157695)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-screenshooter
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="Plugin that makes screenshots for the Xfce panel"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
+license=('GPL2')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme')
+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)
+conflicts=('xfce4-screenshooter-plugin')
+replaces=('xfce4-screenshooter-plugin')
+sha256sums=('68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e'
+            '6902495c0394af19a76e2f90399ca7295e8dfb3ffb29d3b4f3b3a9fb7489c464'
+            '76cc9127167c9f4a800b01e9d16b85bf3af335d0eb44588d859739aa9d457e38')
+
+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 \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-screenshooter/repos/testing-x86_64/fix_segfault.diff (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/fix_segfault.diff)
===================================================================
--- testing-x86_64/fix_segfault.diff	                        (rev 0)
+++ testing-x86_64/fix_segfault.diff	2012-04-29 02:55:10 UTC (rev 157695)
@@ -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 */

Copied: xfce4-screenshooter/repos/testing-x86_64/fs-25873-segfault-in-awesome-wm.patch (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/fs-25873-segfault-in-awesome-wm.patch)
===================================================================
--- testing-x86_64/fs-25873-segfault-in-awesome-wm.patch	                        (rev 0)
+++ testing-x86_64/fs-25873-segfault-in-awesome-wm.patch	2012-04-29 02:55:10 UTC (rev 157695)
@@ -0,0 +1,21 @@
+--- 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;
+ 

Copied: xfce4-screenshooter/repos/testing-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch)
===================================================================
--- testing-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch	                        (rev 0)
+++ testing-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch	2012-04-29 02:55:10 UTC (rev 157695)
@@ -0,0 +1,11 @@
+--- 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@

Copied: xfce4-screenshooter/repos/testing-x86_64/xfce4-screenshooter.install (from rev 157627, xfce4-screenshooter/repos/staging-x86_64/xfce4-screenshooter.install)
===================================================================
--- testing-x86_64/xfce4-screenshooter.install	                        (rev 0)
+++ testing-x86_64/xfce4-screenshooter.install	2012-04-29 02:55:10 UTC (rev 157695)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et: