[arch-commits] Commit in awesome/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Wednesday, April 9, 2014 @ 10:54:18
  Author: bpiotrowski
Revision: 108991

upgpkg: awesome 3.5.4-2

add patch to fix menubar cairo warnings

Added:
  awesome/trunk/awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
Modified:
  awesome/trunk/PKGBUILD

-------------------------------------------------------------+
 PKGBUILD                                                    |   11 ++-
 awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch |   31 ++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-09 07:43:53 UTC (rev 108990)
+++ PKGBUILD	2014-04-09 08:54:18 UTC (rev 108991)
@@ -8,7 +8,7 @@
 
 pkgname=awesome
 pkgver=3.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64')
 url='http://awesome.naquadah.org/'
@@ -22,11 +22,16 @@
             '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')
+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() {

Added: awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
===================================================================
--- awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch	                        (rev 0)
+++ awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch	2014-04-09 08:54:18 UTC (rev 108991)
@@ -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
+