version 1.4.1-5

3 files changed, 29 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b25a232401e8..e97f0da6e346 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Dec 14 14:46:35 UTC 2015
 pkgbase = fbdesk
 	pkgdesc = Fluxbox Utility for creating and managing Icons on a Fluxbox Desktop
 	pkgver = 1.4.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://fluxbox.org/fbdesk/
 	changelog = ChangeLog
 	arch = i686
@@ -15,9 +13,11 @@ pkgbase = fbdesk
 	source = http://fluxbox.sourceforge.net/download/fbdesk-1.4.1.tar.gz
 	source = fbdesk-1.4.1-gcc43.patch
 	source = fbdesk-1.4.1-options.patch
+	source = fbdesk-1.4.1-false.patch
 	md5sums = b65136d2d52524492c8a5bc233b7f34b
 	md5sums = 6c0730137cb50185d4c6d88f69553d2d
 	md5sums = 7cc0f132b43dd7fcdf9daac798eb7275
+	md5sums = 2f1cd4c3dab7a48dd0e90c86068c690b
 
 pkgname = fbdesk
 
diff --git a/PKGBUILD b/PKGBUILD
index 92f31db4ec6c..7ff458188601 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=fbdesk
 pkgver=1.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Fluxbox Utility for creating and managing Icons on a Fluxbox Desktop"
 url="http://fluxbox.org/fbdesk/"
 license=('GPL')
@@ -14,15 +14,18 @@ arch=('i686' 'x86_64')
 changelog=ChangeLog
 source=(http://fluxbox.sourceforge.net/download/$pkgname-$pkgver.tar.gz
 	$pkgname-$pkgver-gcc43.patch
-	$pkgname-$pkgver-options.patch)
+	$pkgname-$pkgver-options.patch
+	$pkgname-$pkgver-false.patch)
 md5sums=('b65136d2d52524492c8a5bc233b7f34b'
          '6c0730137cb50185d4c6d88f69553d2d'
-         '7cc0f132b43dd7fcdf9daac798eb7275')
+         '7cc0f132b43dd7fcdf9daac798eb7275'
+         '2f1cd4c3dab7a48dd0e90c86068c690b')
 
 build() {
   cd $pkgname-$pkgver
   patch -p1 <../$pkgname-$pkgver-gcc43.patch
   patch -p1 <../$pkgname-$pkgver-options.patch
+  patch -p1 <../$pkgname-$pkgver-false.patch
   ./configure --prefix=/usr --disable-png
   make
 }
diff --git a/fbdesk-1.4.1-false.patch b/fbdesk-1.4.1-false.patch
new file mode 100644
index 000000000000..bfc105e09d7f
--- /dev/null
+++ b/fbdesk-1.4.1-false.patch
@@ -0,0 +1,20 @@
+diff -up fbdesk-1.4.1/src/FbTk/Image.cc.orig fbdesk-1.4.1/src/FbTk/Image.cc
+--- fbdesk-1.4.1/src/FbTk/Image.cc.orig	2016-08-08 21:01:04.000000000 -0600
++++ fbdesk-1.4.1/src/FbTk/Image.cc	2016-08-08 21:01:12.000000000 -0600
+@@ -85,14 +85,14 @@ PixmapWithMask *Image::load(const std::s
+ 
+ 
+     if (filename == "")
+-        return false;
++        return NULL;
+ 
+     // determine file ending
+     std::string extension(StringUtil::toUpper(StringUtil::findExtension(filename)));
+     
+     // valid handle?
+     if (s_image_map.find(extension) == s_image_map.end())
+-        return false;
++        return NULL;
+     
+     // load file
+     PixmapWithMask *pm = s_image_map[extension]->load(filename, screen_num);