[arch-commits] Commit in xfce4-screenshooter/repos (16 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed May 2 22:02:34 UTC 2012
Date: Wednesday, May 2, 2012 @ 18:02:34
Author: foutrelis
Revision: 158096
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfce4-screenshooter/repos/extra-i686/PKGBUILD
(from rev 158095, xfce4-screenshooter/trunk/PKGBUILD)
xfce4-screenshooter/repos/extra-i686/fix_segfault.diff
(from rev 158095, xfce4-screenshooter/trunk/fix_segfault.diff)
xfce4-screenshooter/repos/extra-i686/xfce4-screenshooter.install
(from rev 158095, xfce4-screenshooter/trunk/xfce4-screenshooter.install)
xfce4-screenshooter/repos/extra-x86_64/PKGBUILD
(from rev 158095, xfce4-screenshooter/trunk/PKGBUILD)
xfce4-screenshooter/repos/extra-x86_64/fix_segfault.diff
(from rev 158095, xfce4-screenshooter/trunk/fix_segfault.diff)
xfce4-screenshooter/repos/extra-x86_64/xfce4-screenshooter.install
(from rev 158095, xfce4-screenshooter/trunk/xfce4-screenshooter.install)
Deleted:
xfce4-screenshooter/repos/extra-i686/PKGBUILD
xfce4-screenshooter/repos/extra-i686/fix_segfault.diff
xfce4-screenshooter/repos/extra-i686/fs-25873-segfault-in-awesome-wm.patch
xfce4-screenshooter/repos/extra-i686/xfce4-screenshooter-1.7.9-dsofix.patch
xfce4-screenshooter/repos/extra-i686/xfce4-screenshooter.install
xfce4-screenshooter/repos/extra-x86_64/PKGBUILD
xfce4-screenshooter/repos/extra-x86_64/fix_segfault.diff
xfce4-screenshooter/repos/extra-x86_64/fs-25873-segfault-in-awesome-wm.patch
xfce4-screenshooter/repos/extra-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch
xfce4-screenshooter/repos/extra-x86_64/xfce4-screenshooter.install
-----------------------------------------------------+
extra-i686/PKGBUILD | 90 ++++++++----------
extra-i686/fix_segfault.diff | 34 +++---
extra-i686/fs-25873-segfault-in-awesome-wm.patch | 21 ----
extra-i686/xfce4-screenshooter-1.7.9-dsofix.patch | 11 --
extra-i686/xfce4-screenshooter.install | 26 ++---
extra-x86_64/PKGBUILD | 90 ++++++++----------
extra-x86_64/fix_segfault.diff | 34 +++---
extra-x86_64/fs-25873-segfault-in-awesome-wm.patch | 21 ----
extra-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch | 11 --
extra-x86_64/xfce4-screenshooter.install | 26 ++---
10 files changed, 140 insertions(+), 224 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-i686/PKGBUILD 2012-05-02 22:02:34 UTC (rev 158096)
@@ -1,50 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 158095, xfce4-screenshooter/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-05-02 22:02:34 UTC (rev 158096)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-screenshooter
+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"
+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)
+conflicts=('xfce4-screenshooter-plugin')
+replaces=('xfce4-screenshooter-plugin')
+sha256sums=('40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./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:
Deleted: extra-i686/fix_segfault.diff
===================================================================
--- extra-i686/fix_segfault.diff 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-i686/fix_segfault.diff 2012-05-02 22:02:34 UTC (rev 158096)
@@ -1,17 +0,0 @@
---- 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/extra-i686/fix_segfault.diff (from rev 158095, xfce4-screenshooter/trunk/fix_segfault.diff)
===================================================================
--- extra-i686/fix_segfault.diff (rev 0)
+++ extra-i686/fix_segfault.diff 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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 */
Deleted: extra-i686/fs-25873-segfault-in-awesome-wm.patch
===================================================================
--- extra-i686/fs-25873-segfault-in-awesome-wm.patch 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-i686/fs-25873-segfault-in-awesome-wm.patch 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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: extra-i686/xfce4-screenshooter-1.7.9-dsofix.patch
===================================================================
--- extra-i686/xfce4-screenshooter-1.7.9-dsofix.patch 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-i686/xfce4-screenshooter-1.7.9-dsofix.patch 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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@
Deleted: extra-i686/xfce4-screenshooter.install
===================================================================
--- extra-i686/xfce4-screenshooter.install 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-i686/xfce4-screenshooter.install 2012-05-02 22:02:34 UTC (rev 158096)
@@ -1,13 +0,0 @@
-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:
Copied: xfce4-screenshooter/repos/extra-i686/xfce4-screenshooter.install (from rev 158095, xfce4-screenshooter/trunk/xfce4-screenshooter.install)
===================================================================
--- extra-i686/xfce4-screenshooter.install (rev 0)
+++ extra-i686/xfce4-screenshooter.install 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-x86_64/PKGBUILD 2012-05-02 22:02:34 UTC (rev 158096)
@@ -1,50 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 158095, xfce4-screenshooter/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-05-02 22:02:34 UTC (rev 158096)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-screenshooter
+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"
+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)
+conflicts=('xfce4-screenshooter-plugin')
+replaces=('xfce4-screenshooter-plugin')
+sha256sums=('40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./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:
Deleted: extra-x86_64/fix_segfault.diff
===================================================================
--- extra-x86_64/fix_segfault.diff 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-x86_64/fix_segfault.diff 2012-05-02 22:02:34 UTC (rev 158096)
@@ -1,17 +0,0 @@
---- 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/extra-x86_64/fix_segfault.diff (from rev 158095, xfce4-screenshooter/trunk/fix_segfault.diff)
===================================================================
--- extra-x86_64/fix_segfault.diff (rev 0)
+++ extra-x86_64/fix_segfault.diff 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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 */
Deleted: extra-x86_64/fs-25873-segfault-in-awesome-wm.patch
===================================================================
--- extra-x86_64/fs-25873-segfault-in-awesome-wm.patch 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-x86_64/fs-25873-segfault-in-awesome-wm.patch 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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: extra-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch
===================================================================
--- extra-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-x86_64/xfce4-screenshooter-1.7.9-dsofix.patch 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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@
Deleted: extra-x86_64/xfce4-screenshooter.install
===================================================================
--- extra-x86_64/xfce4-screenshooter.install 2012-05-02 22:02:07 UTC (rev 158095)
+++ extra-x86_64/xfce4-screenshooter.install 2012-05-02 22:02:34 UTC (rev 158096)
@@ -1,13 +0,0 @@
-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:
Copied: xfce4-screenshooter/repos/extra-x86_64/xfce4-screenshooter.install (from rev 158095, xfce4-screenshooter/trunk/xfce4-screenshooter.install)
===================================================================
--- extra-x86_64/xfce4-screenshooter.install (rev 0)
+++ extra-x86_64/xfce4-screenshooter.install 2012-05-02 22:02:34 UTC (rev 158096)
@@ -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:
More information about the arch-commits
mailing list