diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-30 07:06:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-30 07:10:36 +0000 |
| commit | 6da44a2076421c57c05bfbbe39b43452d68f727f (patch) | |
| tree | d177710b78a19c3fff8e43006eec83d71128c77a /main/xfce4-screenshooter | |
| parent | 772c441346998168601fdb2ab64d6818b48ebc14 (diff) | |
| download | aports-6da44a2076421c57c05bfbbe39b43452d68f727f.tar.bz2 aports-6da44a2076421c57c05bfbbe39b43452d68f727f.tar.xz | |
main/xfce4-screenshooter: remove install scripts + linker fix
and anohter patch from Arch Linux
Diffstat (limited to 'main/xfce4-screenshooter')
7 files changed, 68 insertions, 14 deletions
diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD index d43ff17325..d75aaaf9da 100644 --- a/main/xfce4-screenshooter/APKBUILD +++ b/main/xfce4-screenshooter/APKBUILD @@ -1,21 +1,32 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-screenshooter pkgver=1.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="screenshot application for Xfce4" url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" arch="all" license="GPL2" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-lang" depends= makedepends="xfce4-panel-dev hicolor-icon-theme libsoup-dev libxfce4ui-dev exo-dev libxext-dev" -install="xfce4-screenshooter.post-install xfce4-screenshooter.post-upgrade - xfce4-screenshooter.post-deinstall" -source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2" +install= +source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2 + fs-25873-segfault-in-awesome-wm.patch + xfce4-screenshooter-1.7.9-dsofix.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build () { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -25,8 +36,10 @@ build () { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="b51ab5725418e7258273c4a6402adb02 xfce4-screenshooter-1.8.0.tar.bz2" +md5sums="b51ab5725418e7258273c4a6402adb02 xfce4-screenshooter-1.8.0.tar.bz2 +18042622c40c37a13da958aee216cafb fs-25873-segfault-in-awesome-wm.patch +a8a30afa060e0f65cbc8a0809f2d8c31 xfce4-screenshooter-1.7.9-dsofix.patch" diff --git a/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch new file mode 100644 index 0000000000..47e0671446 --- /dev/null +++ b/main/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/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch b/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch new file mode 100644 index 0000000000..c383b2e52a --- /dev/null +++ b/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch @@ -0,0 +1,13 @@ +Upstream: https://bugzilla.xfce.org/show_bug.cgi?id=7985 + +--- 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@ diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.install b/main/xfce4-screenshooter/xfce4-screenshooter.install new file mode 100644 index 0000000000..e4f8fd06c1 --- /dev/null +++ b/main/xfce4-screenshooter/xfce4-screenshooter.install @@ -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: diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall b/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall deleted file mode 120000 index 735306e31d..0000000000 --- a/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall +++ /dev/null @@ -1 +0,0 @@ -xfce4-screenshooter.post-install
\ No newline at end of file diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-install b/main/xfce4-screenshooter/xfce4-screenshooter.post-install deleted file mode 100644 index c523d78da0..0000000000 --- a/main/xfce4-screenshooter/xfce4-screenshooter.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade b/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade deleted file mode 120000 index 735306e31d..0000000000 --- a/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -xfce4-screenshooter.post-install
\ No newline at end of file |