[arch-commits] Commit in awesome/repos (6 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Wed Apr 9 08:54:28 UTC 2014
Date: Wednesday, April 9, 2014 @ 10:54:27
Author: bpiotrowski
Revision: 108992
archrelease: copy trunk to community-i686, community-x86_64
Added:
awesome/repos/community-i686/PKGBUILD
(from rev 108991, awesome/trunk/PKGBUILD)
awesome/repos/community-i686/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
(from rev 108991, awesome/trunk/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch)
awesome/repos/community-x86_64/PKGBUILD
(from rev 108991, awesome/trunk/PKGBUILD)
awesome/repos/community-x86_64/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
(from rev 108991, awesome/trunk/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch)
Deleted:
awesome/repos/community-i686/PKGBUILD
awesome/repos/community-x86_64/PKGBUILD
------------------------------------------------------------------------------+
/PKGBUILD | 106 ++++++++++
community-i686/PKGBUILD | 48 ----
community-i686/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch | 31 ++
community-x86_64/PKGBUILD | 48 ----
community-x86_64/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch | 31 ++
5 files changed, 168 insertions(+), 96 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-09 08:54:18 UTC (rev 108991)
+++ community-i686/PKGBUILD 2014-04-09 08:54:27 UTC (rev 108992)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Sébastien Luttringer
-# Contributor: xduugu
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Vesa Kaihlavirta
-
-pkgname=awesome
-pkgver=3.5.4
-pkgrel=1
-pkgdesc='Highly configurable framework window manager'
-arch=('i686' 'x86_64')
-url='http://awesome.naquadah.org/'
-license=('GPL2')
-depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua' 'lua-lgi'
- 'pango' 'startup-notification' 'xcb-util-cursor' 'xcb-util-keysyms'
- 'xcb-util-wm' 'xorg-xmessage')
-makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
-optdepends=('rlwrap: readline support for awesome-client'
- 'dex: autostart your desktop files'
- 'vicious: widgets for the Awesome window manager')
-provides=('notification-daemon')
-backup=('etc/xdg/awesome/rc.lua')
-source=($url/download/$pkgname-$pkgver.tar.xz)
-md5sums=('9d52a26bfbc142ace5427bfb55010359')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc \
- -DLUA_LIBRARY=/usr/lib/liblua.so.5.2
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir"/$pkgname-$pkgver/awesome.desktop \
- "$pkgdir/usr/share/xsessions/awesome.desktop"
-}
Copied: awesome/repos/community-i686/PKGBUILD (from rev 108991, awesome/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-09 08:54:27 UTC (rev 108992)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Sébastien Luttringer
+# Contributor: xduugu
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Vesa Kaihlavirta
+
+pkgname=awesome
+pkgver=3.5.4
+pkgrel=2
+pkgdesc='Highly configurable framework window manager'
+arch=('i686' 'x86_64')
+url='http://awesome.naquadah.org/'
+license=('GPL2')
+depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua' 'lua-lgi'
+ 'pango' 'startup-notification' 'xcb-util-cursor' 'xcb-util-keysyms'
+ 'xcb-util-wm' 'xorg-xmessage')
+makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
+optdepends=('rlwrap: readline support for awesome-client'
+ 'dex: autostart your desktop files'
+ 'vicious: widgets for the Awesome window manager')
+provides=('notification-daemon')
+backup=('etc/xdg/awesome/rc.lua')
+source=($url/download/$pkgname-$pkgver.tar.xz
+ awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch)
+md5sums=('9d52a26bfbc142ace5427bfb55010359'
+ '1db70d4e40ca982ce49d7226a4eb3c92')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=RELEASE \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc \
+ -DLUA_LIBRARY=/usr/lib/liblua.so.5.2
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/awesome.desktop \
+ "$pkgdir/usr/share/xsessions/awesome.desktop"
+}
Copied: awesome/repos/community-i686/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch (from rev 108991, awesome/trunk/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch)
===================================================================
--- community-i686/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch (rev 0)
+++ community-i686/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch 2014-04-09 08:54:27 UTC (rev 108992)
@@ -0,0 +1,31 @@
+From 7967d05915c95c8eba7709a46093cc1b6de55572 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon at znc.in>
+Date: Wed, 2 Apr 2014 22:48:06 +0200
+Subject: [PATCH] imagebox: Don't try to scale by infinite (FS#1248)
+
+When an imagebox was drawn with width or height zero, it tried to calculate the
+needed scale factor for making the image fit. Sadly, this would be a division by
+zero aka infinite in this case.
+
+Fix this by just not drawing anything if there is no space available.
+
+Signed-off-by: Uli Schlachter <psychon at znc.in>
+---
+ lib/wibox/widget/imagebox.lua.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/wibox/widget/imagebox.lua.in b/lib/wibox/widget/imagebox.lua.in
+index da51634..5963d0e 100644
+--- a/lib/wibox/widget/imagebox.lua.in
++++ b/lib/wibox/widget/imagebox.lua.in
+@@ -18,6 +18,7 @@ local imagebox = { mt = {} }
+ --- Draw an imagebox with the given cairo context in the given geometry.
+ function imagebox:draw(wibox, cr, width, height)
+ if not self._image then return end
++ if width == 0 or height == 0 then return end
+
+ cr:save()
+
+--
+1.9.1
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-09 08:54:18 UTC (rev 108991)
+++ community-x86_64/PKGBUILD 2014-04-09 08:54:27 UTC (rev 108992)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Sébastien Luttringer
-# Contributor: xduugu
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Vesa Kaihlavirta
-
-pkgname=awesome
-pkgver=3.5.4
-pkgrel=1
-pkgdesc='Highly configurable framework window manager'
-arch=('i686' 'x86_64')
-url='http://awesome.naquadah.org/'
-license=('GPL2')
-depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua' 'lua-lgi'
- 'pango' 'startup-notification' 'xcb-util-cursor' 'xcb-util-keysyms'
- 'xcb-util-wm' 'xorg-xmessage')
-makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
-optdepends=('rlwrap: readline support for awesome-client'
- 'dex: autostart your desktop files'
- 'vicious: widgets for the Awesome window manager')
-provides=('notification-daemon')
-backup=('etc/xdg/awesome/rc.lua')
-source=($url/download/$pkgname-$pkgver.tar.xz)
-md5sums=('9d52a26bfbc142ace5427bfb55010359')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc \
- -DLUA_LIBRARY=/usr/lib/liblua.so.5.2
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir"/$pkgname-$pkgver/awesome.desktop \
- "$pkgdir/usr/share/xsessions/awesome.desktop"
-}
Copied: awesome/repos/community-x86_64/PKGBUILD (from rev 108991, awesome/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-09 08:54:27 UTC (rev 108992)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Sébastien Luttringer
+# Contributor: xduugu
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Vesa Kaihlavirta
+
+pkgname=awesome
+pkgver=3.5.4
+pkgrel=2
+pkgdesc='Highly configurable framework window manager'
+arch=('i686' 'x86_64')
+url='http://awesome.naquadah.org/'
+license=('GPL2')
+depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua' 'lua-lgi'
+ 'pango' 'startup-notification' 'xcb-util-cursor' 'xcb-util-keysyms'
+ 'xcb-util-wm' 'xorg-xmessage')
+makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
+optdepends=('rlwrap: readline support for awesome-client'
+ 'dex: autostart your desktop files'
+ 'vicious: widgets for the Awesome window manager')
+provides=('notification-daemon')
+backup=('etc/xdg/awesome/rc.lua')
+source=($url/download/$pkgname-$pkgver.tar.xz
+ awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch)
+md5sums=('9d52a26bfbc142ace5427bfb55010359'
+ '1db70d4e40ca982ce49d7226a4eb3c92')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=RELEASE \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc \
+ -DLUA_LIBRARY=/usr/lib/liblua.so.5.2
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/awesome.desktop \
+ "$pkgdir/usr/share/xsessions/awesome.desktop"
+}
Copied: awesome/repos/community-x86_64/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch (from rev 108991, awesome/trunk/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch)
===================================================================
--- community-x86_64/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch (rev 0)
+++ community-x86_64/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch 2014-04-09 08:54:27 UTC (rev 108992)
@@ -0,0 +1,31 @@
+From 7967d05915c95c8eba7709a46093cc1b6de55572 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon at znc.in>
+Date: Wed, 2 Apr 2014 22:48:06 +0200
+Subject: [PATCH] imagebox: Don't try to scale by infinite (FS#1248)
+
+When an imagebox was drawn with width or height zero, it tried to calculate the
+needed scale factor for making the image fit. Sadly, this would be a division by
+zero aka infinite in this case.
+
+Fix this by just not drawing anything if there is no space available.
+
+Signed-off-by: Uli Schlachter <psychon at znc.in>
+---
+ lib/wibox/widget/imagebox.lua.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/wibox/widget/imagebox.lua.in b/lib/wibox/widget/imagebox.lua.in
+index da51634..5963d0e 100644
+--- a/lib/wibox/widget/imagebox.lua.in
++++ b/lib/wibox/widget/imagebox.lua.in
+@@ -18,6 +18,7 @@ local imagebox = { mt = {} }
+ --- Draw an imagebox with the given cairo context in the given geometry.
+ function imagebox:draw(wibox, cr, width, height)
+ if not self._image then return end
++ if width == 0 or height == 0 then return end
+
+ cr:save()
+
+--
+1.9.1
+
More information about the arch-commits
mailing list