initial version

5 files changed, 194 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..d4aa1ee500e9
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = fbdesk
+	pkgdesc = Fluxbox Utility for creating and managing Icons on a Fluxbox Desktop
+	pkgver = 1.4.1
+	pkgrel = 3
+	url = http://fluxbox.org/fbdesk/
+	changelog = ChangeLog
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = libxft
+	depends = imlib2
+	depends = libxpm
+	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
+	md5sums = b65136d2d52524492c8a5bc233b7f34b
+	md5sums = 6c0730137cb50185d4c6d88f69553d2d
+	md5sums = 7cc0f132b43dd7fcdf9daac798eb7275
+
+pkgname = fbdesk
+
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000000..b75780427b8c
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,13 @@
+2013-04-12 Brian Bidulock <bidulock@openss7.org>
+
+	* 1.4.1-2 :
+	rewrote PKGBUILD to support makepkg 4.1.0
+	add --disable-png to ./configure because it is a part
+	of FbTk that is not used by fbdesk anyway.
+
+	* options.patch :
+	patches options processing in src/main.cc
+	original author could not count!
+
+	* ChangeLog :
+	added changelog
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..3940eacfa504
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Marcel Novotny <marcel.novotny@certicon.cz>
+# Contributor: Atsutane <darkandevil@hotmail.de>
+# Contributor: Clemens Novak <e0025574@student.tuwien.ac.at>
+
+pkgname=fbdesk
+pkgver=1.4.1
+pkgrel=3
+pkgdesc="Fluxbox Utility for creating and managing Icons on a Fluxbox Desktop"
+url="http://fluxbox.org/fbdesk/"
+license=('GPL')
+depends=('libxft' 'imlib2' 'libxpm')
+arch=('i686' 'x86_64')
+changelog=ChangeLog
+source=(http://fluxbox.sourceforge.net/download/$pkgname-$pkgver.tar.gz
+	$pkgname-$pkgver-gcc43.patch
+	$pkgname-$pkgver-options.patch)
+md5sums=('b65136d2d52524492c8a5bc233b7f34b'
+         '6c0730137cb50185d4c6d88f69553d2d'
+         '7cc0f132b43dd7fcdf9daac798eb7275')
+
+build() {
+  cd "$srcdir/fbdesk-$pkgver"
+  patch -p1 <../$pkgname-$pkgver-gcc43.patch || return 1
+  patch -p1 <../$pkgname-$pkgver-options.patch || return 1
+  ./configure --prefix=/usr --disable-png || return 1
+  make
+}
+package() {
+  cd "$srcdir/fbdesk-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/fbdesk-1.4.1-gcc43.patch b/fbdesk-1.4.1-gcc43.patch
new file mode 100644
index 000000000000..b1e51e4d5a74
--- /dev/null
+++ b/fbdesk-1.4.1-gcc43.patch
@@ -0,0 +1,112 @@
+diff -up fbdesk-1.4.1/src/main.cc.gcc43 fbdesk-1.4.1/src/main.cc
+--- fbdesk-1.4.1/src/main.cc.gcc43	2008-03-31 23:36:49.000000000 -0400
++++ fbdesk-1.4.1/src/main.cc	2008-03-31 23:37:12.000000000 -0400
+@@ -23,6 +23,8 @@
+ #include "FbDesk.hh"
+ #include "version.h"
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <iostream>
+ #include <stdexcept>
+ #include <signal.h>
+diff -up fbdesk-1.4.1/src/FbDesk.cc.gcc43 fbdesk-1.4.1/src/FbDesk.cc
+--- fbdesk-1.4.1/src/FbDesk.cc.gcc43	2008-03-31 23:36:06.000000000 -0400
++++ fbdesk-1.4.1/src/FbDesk.cc	2008-03-31 23:36:32.000000000 -0400
+@@ -39,6 +39,7 @@
+ #include <algorithm>
+ #include <unistd.h>
+ #include <cstdio>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace FbTk;
+diff -up fbdesk-1.4.1/src/FbTk/KeyUtil.cc.gcc43 fbdesk-1.4.1/src/FbTk/KeyUtil.cc
+--- fbdesk-1.4.1/src/FbTk/KeyUtil.cc.gcc43	2008-03-31 23:34:03.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/KeyUtil.cc	2008-03-31 23:34:13.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include "KeyUtil.hh"
+ #include "App.hh"
+ 
++#include <cstring>
+ #include <string>
+ 
+ namespace {
+diff -up fbdesk-1.4.1/src/FbTk/ThemeItems.cc.gcc43 fbdesk-1.4.1/src/FbTk/ThemeItems.cc
+--- fbdesk-1.4.1/src/FbTk/ThemeItems.cc.gcc43	2008-03-31 23:34:33.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/ThemeItems.cc	2008-03-31 23:34:59.000000000 -0400
+@@ -39,6 +39,8 @@
+ #include "Image.hh"
+ #include "StringUtil.hh"
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+ #ifdef HAVE_CSTDIO
+   #include <cstdio>
+diff -up fbdesk-1.4.1/src/FbTk/FbPixmap.cc.gcc43 fbdesk-1.4.1/src/FbTk/FbPixmap.cc
+--- fbdesk-1.4.1/src/FbTk/FbPixmap.cc.gcc43	2008-03-31 23:32:29.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/FbPixmap.cc	2008-03-31 23:32:45.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include <X11/Xatom.h>
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up fbdesk-1.4.1/src/FbTk/Theme.cc.gcc43 fbdesk-1.4.1/src/FbTk/Theme.cc
+--- fbdesk-1.4.1/src/FbTk/Theme.cc.gcc43	2008-03-31 23:30:11.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/Theme.cc	2008-03-31 23:31:24.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include "FileUtil.hh"
+ #include "Image.hh"
+ 
++#include <algorithm>
+ #ifdef HAVE_CSTDIO
+   #include <cstdio>
+ #else
+diff -up fbdesk-1.4.1/src/FbTk/TextBox.cc.gcc43 fbdesk-1.4.1/src/FbTk/TextBox.cc
+--- fbdesk-1.4.1/src/FbTk/TextBox.cc.gcc43	2008-03-31 23:33:15.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/TextBox.cc	2008-03-31 23:33:27.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include "App.hh"
+ #include "KeyUtil.hh"
+ 
++#include <cstdlib>
+ #ifdef HAVE_CCTYPE
+   #include <cctype>
+ #else
+diff -up fbdesk-1.4.1/src/FbTk/XFontImp.cc.gcc43 fbdesk-1.4.1/src/FbTk/XFontImp.cc
+--- fbdesk-1.4.1/src/FbTk/XFontImp.cc.gcc43	2006-03-25 06:53:47.000000000 -0500
++++ fbdesk-1.4.1/src/FbTk/XFontImp.cc	2008-03-31 23:26:33.000000000 -0400
+@@ -28,6 +28,7 @@
+ 
+ #include <X11/Xutil.h>
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <new>
+ #ifdef HAVE_CSTDIO
+diff -up fbdesk-1.4.1/src/FbTk/StringUtil.cc.gcc43 fbdesk-1.4.1/src/FbTk/StringUtil.cc
+--- fbdesk-1.4.1/src/FbTk/StringUtil.cc.gcc43	2008-03-31 23:31:48.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/StringUtil.cc	2008-03-31 23:32:07.000000000 -0400
+@@ -49,6 +49,7 @@
+ #include <memory>
+ #include <algorithm>
+ #include <string>
++#include <cstring>
+ 
+ using std::string;
+ using std::transform;
+diff -up fbdesk-1.4.1/src/FbTk/TextureRender.cc.gcc43 fbdesk-1.4.1/src/FbTk/TextureRender.cc
+--- fbdesk-1.4.1/src/FbTk/TextureRender.cc.gcc43	2008-03-31 23:27:43.000000000 -0400
++++ fbdesk-1.4.1/src/FbTk/TextureRender.cc	2008-03-31 23:29:41.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include "FbPixmap.hh"
+ #include "GContext.hh"
+ 
++#include <cstring>
+ #include <iostream>
+ #include <string>
+ #ifdef HAVE_CSTDIO
diff --git a/fbdesk-1.4.1-options.patch b/fbdesk-1.4.1-options.patch
new file mode 100644
index 000000000000..43ca9e90a99d
--- /dev/null
+++ b/fbdesk-1.4.1-options.patch
@@ -0,0 +1,16 @@
+diff -purN fbdesk-1.4.1.patched/src/main.cc fbdesk-1.4.1/src/main.cc
+--- fbdesk-1.4.1.patched/src/main.cc	2013-04-12 02:35:49.000000000 -0600
++++ fbdesk-1.4.1/src/main.cc	2013-04-12 02:36:37.000000000 -0600
+@@ -70,10 +70,10 @@ int main(int argc, char **argv) try {
+     // determine arguments
+     for (int i=1; i<argc; ++i) {
+         if (strcmp("-display", argv[i]) == 0 && // display connection
+-            i + 1 < argc) {
++            i + 1 <= argc) {
+             displaystr = argv[++i];
+         } else if (strcmp("-rc", argv[i]) == 0 && // resource file
+-                   i + 1 < argc) {
++                   i + 1 <= argc) {
+             resource_filename = argv[++i];
+         } if (strcmp("-v", argv[i]) == 0) {
+             cout<<"FbDesk "<<FBDESK_VERSION<<" Copyright (c) 2003-2006 Henrik Kinnunen"<<endl;