summaryrefslogtreecommitdiff
path: root/extra/xfce4-screenshooter
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-25 12:00:05 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-25 12:00:05 -0300
commitd59c722c306fa39fcecf011b411b77faffca5cbd (patch)
treed6a3582523245b624d1a905d4b46d8344429e617 /extra/xfce4-screenshooter
parent939541abc901bd03328b55aaed0fb1862f803c05 (diff)
parent5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/gri/PKGBUILD community/multiget/PKGBUILD core/bash/PKGBUILD core/grep/PKGBUILD extra/ffmpeg/PKGBUILD extra/vlc/PKGBUILD extra/xfce4-screenshooter/PKGBUILD extra/xfce4-settings/PKGBUILD libre/linux-libre/PKGBUILD libre/linux-libre/dib0700-fix.patch libre/linux-libre/i915-fix-ghost-tv-output.patch libre/linux-libre/i915-fix-incorrect-error-message.patch libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch libre/linux-libre/linux-libre.install libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'extra/xfce4-screenshooter')
-rw-r--r--extra/xfce4-screenshooter/PKGBUILD54
-rw-r--r--extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch21
-rw-r--r--extra/xfce4-screenshooter/xfce4-screenshooter.install6
3 files changed, 56 insertions, 25 deletions
diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD
index 1b4d93b60..ebfd8fb82 100644
--- a/extra/xfce4-screenshooter/PKGBUILD
+++ b/extra/xfce4-screenshooter/PKGBUILD
@@ -1,42 +1,50 @@
-# $Id: PKGBUILD 134703 2011-08-07 16:23:19Z andyrtr $
-# Maintainer: tobias <tobias funnychar archlinux.org>
+# $Id: PKGBUILD 143213 2011-11-23 12:30:04Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
pkgname=xfce4-screenshooter
pkgver=1.8.0
-pkgrel=1
-pkgdesc="plugin that makes screenshots for the Xfce4 panel"
-arch=(i686 x86_64 'mips64el')
-license=('GPL2')
+pkgrel=2
+pkgdesc="Plugin that makes screenshots for the Xfce panel"
+arch=('i686' 'x86_64' 'mips64el')
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
+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
- fix_segfault.diff)
+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')
-md5sums=('b51ab5725418e7258273c4a6402adb02'
- '355a7d005bf9200f5a5577f0bc901945'
- '794d7e0ff18cad369bd50a78e883f986')
+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
+ 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
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-debug
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
new file mode 100644
index 000000000..47e067144
--- /dev/null
+++ b/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
@@ -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;
+
diff --git a/extra/xfce4-screenshooter/xfce4-screenshooter.install b/extra/xfce4-screenshooter/xfce4-screenshooter.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-screenshooter/xfce4-screenshooter.install
+++ b/extra/xfce4-screenshooter/xfce4-screenshooter.install
@@ -3,9 +3,11 @@ post_install() {
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ post_install
}
+
+# vim:set ts=2 sw=2 et: