[arch-commits] Commit in xfce4-screenshooter/trunk (2 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Nov 23 12:29:30 UTC 2011
Date: Wednesday, November 23, 2011 @ 07:29:30
Author: foutrelis
Revision: 143212
upgpkg: xfce4-screenshooter 1.8.0-2
Attempt to fix FS#25873: segfaults trying to capture screenshot of active window in awesome WM
Added:
xfce4-screenshooter/trunk/fs-25873-segfault-in-awesome-wm.patch
Modified:
xfce4-screenshooter/trunk/PKGBUILD
---------------------------------------+
PKGBUILD | 16 ++++++++++------
fs-25873-segfault-in-awesome-wm.patch | 21 +++++++++++++++++++++
2 files changed, 31 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-11-23 12:04:45 UTC (rev 143211)
+++ PKGBUILD 2011-11-23 12:29:30 UTC (rev 143212)
@@ -4,7 +4,7 @@
pkgname=xfce4-screenshooter
pkgver=1.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Plugin that makes screenshots for the Xfce panel"
arch=('i686' 'x86_64')
url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
@@ -16,19 +16,23 @@
options=('!libtool')
source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2
xfce4-screenshooter-1.7.9-dsofix.patch
- fix_segfault.diff)
+ fs-25873-segfault-in-awesome-wm.patch)
conflicts=('xfce4-screenshooter-plugin')
replaces=('xfce4-screenshooter-plugin')
-sha1sums=('cc105a5d3b17248542705cf01368827ef860bec9'
- 'd3e803d5dd544f8b6368d7efe22f32a6f0aa0f21'
- '5493cccc4f906d8e4acb44f18e94c91e745b51a3')
+sha256sums=('68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e'
+ '6902495c0394af19a76e2f90399ca7295e8dfb3ffb29d3b4f3b3a9fb7489c464'
+ '76cc9127167c9f4a800b01e9d16b85bf3af335d0eb44588d859739aa9d457e38')
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -Np1 -i "$srcdir/xfce4-screenshooter-1.7.9-dsofix.patch"
- #patch -Np1 -i ${srcdir}/fix_segfault.diff
+ # 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 \
Added: fs-25873-segfault-in-awesome-wm.patch
===================================================================
--- fs-25873-segfault-in-awesome-wm.patch (rev 0)
+++ fs-25873-segfault-in-awesome-wm.patch 2011-11-23 12:29:30 UTC (rev 143212)
@@ -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;
+
More information about the arch-commits
mailing list