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

[Andrea Scarpino]

    Date: Friday, April 11, 2014 @ 11:38:59
  Author: andrea
Revision: 109198

upgpkg: awesome 3.5.5-1

Upstream release

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-11 09:23:59 UTC (rev 109197)
+++ PKGBUILD	2014-04-11 09:38:59 UTC (rev 109198)
@@ -7,8 +7,8 @@
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.5.4
-pkgrel=2
+pkgver=3.5.5
+pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64')
 url='http://awesome.naquadah.org/'
@@ -22,16 +22,11 @@
             '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')
+source=($url/download/$pkgname-$pkgver.tar.xz)
+md5sums=('48a00b747f0279e6164d8b7e9c964346')
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch
 }
 
 build() {

Deleted: 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	2014-04-11 09:23:59 UTC (rev 109197)
+++ awesome-3.5.4-imagebox-Don-t-try-to-scale-by-infinite.patch	2014-04-11 09:38:59 UTC (rev 109198)
@@ -1,31 +0,0 @@
-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
-