From 6c65cc475e982b044d3524b949cce0786e47d8e5 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Mon, 4 Jan 2010 17:57:46 +0100
Subject: [PATCH] wbar: initial import (verified compilation)

---
 wbar/.footprint                |  32 ++++++++++
 wbar/.md5sum                   |   3 +
 wbar/Pkgfile                   |  33 ++++++++++
 wbar/wbar-1.3.3-dot.wbar.patch | 109 +++++++++++++++++++++++++++++++++
 wbar/wbar-1.3.3_gcc43.patch    |  33 ++++++++++
 5 files changed, 210 insertions(+)
 create mode 100644 wbar/.footprint
 create mode 100644 wbar/.md5sum
 create mode 100644 wbar/Pkgfile
 create mode 100644 wbar/wbar-1.3.3-dot.wbar.patch
 create mode 100644 wbar/wbar-1.3.3_gcc43.patch

diff --git a/wbar/.footprint b/wbar/.footprint
new file mode 100644
index 0000000..25a211b
--- /dev/null
+++ b/wbar/.footprint
@@ -0,0 +1,32 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/wbar
+drwxr-xr-x	root/root	usr/etc/
+-rw-r--r--	root/root	usr/etc/dot.wbar
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/wbar/
+drwxr-xr-x	root/root	usr/share/wbar/iconpack/
+-rw-r--r--	root/root	usr/share/wbar/iconpack/comic.ttf
+drwxr-xr-x	root/root	usr/share/wbar/iconpack/wbar.osx/
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/acroread.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/beagle.png
+-rwxr-xr-x	root/root	usr/share/wbar/iconpack/wbar.osx/blender.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/cedega.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/firefox.png
+lrwxrwxrwx	root/root	usr/share/wbar/iconpack/wbar.osx/font.ttf -> /usr/share/wbar/iconpack/comic.ttf
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/gearth.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/gimp.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/gmplayer.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/gnucash.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/gqview.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/inkscape.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/mlgui.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/nautilus.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/ooffice.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/osxbarback.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/picasa.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/psi.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/skype.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/thunderbird.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/vmware.png
+-rw-r--r--	root/root	usr/share/wbar/iconpack/wbar.osx/xmms.png
diff --git a/wbar/.md5sum b/wbar/.md5sum
new file mode 100644
index 0000000..a5c7937
--- /dev/null
+++ b/wbar/.md5sum
@@ -0,0 +1,3 @@
+96b4c7b507b996460d9a9c2f8cc9727e  wbar-1.3.3-dot.wbar.patch
+542335a273188de0d6a93102501351a4  wbar-1.3.3.tbz2
+043c7676b626fc4abd9108d7ca26f84e  wbar-1.3.3_gcc43.patch
diff --git a/wbar/Pkgfile b/wbar/Pkgfile
new file mode 100644
index 0000000..d6cd3ee
--- /dev/null
+++ b/wbar/Pkgfile
@@ -0,0 +1,33 @@
+# Description: quick launch bar
+# URL: http://code.google.com/p/wbar/
+# Packager: Younes Hafri, ycrux at club-internet dot fr
+# Maintainer:  Bartlomiej Palmowski, rotwang at crux dot org dot pl
+# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Depends on: imlib2
+
+name=wbar
+version=1.3.3
+release=1
+source=(http://$name.googlecode.com/files/$name-$version.tbz2
+        $name-$version-dot.wbar.patch \
+        $name-${version}_gcc43.patch)
+
+build() {
+  tar --use-compress-program=bzip2 -xf $name-$version.tbz2
+  cd $name-$version
+
+  patch -p1 -i $SRC/$name-$version-dot.$name.patch
+  patch -p1 -i $SRC/$name-${version}_gcc43.patch
+  sed -i Makefile \
+      -e "s|g++ |$CXX |" \
+      -e "s|CXXFLAGS=\`imlib2-config --cflags\`|CXXFLAGS = $CXXFLAGS -I$CLFS/usr/include -I$CLFS/usr/include/freetype2|" \
+      -e "s|LDFLAGS=\`imlib2-config --libs\`|LDFLAGS = $LDFLAGS -L$CLFS/usr/lib -lImlib2 -lfreetype -lz -lX11 -lXext -ldl -lm|"
+
+  make 
+
+  install -d $PKG/usr/share/$name
+  mv iconpack $PKG/usr/share/$name
+  ln -sf /usr/share/$name/iconpack/comic.ttf $PKG/usr/share/$name/iconpack/wbar.osx/font.ttf
+  install -D -m 0644 dot.$name $PKG/usr/etc/dot.$name
+  install -D -m 0755 $name $PKG/usr/bin/$name
+}
diff --git a/wbar/wbar-1.3.3-dot.wbar.patch b/wbar/wbar-1.3.3-dot.wbar.patch
new file mode 100644
index 0000000..0064356
--- /dev/null
+++ b/wbar/wbar-1.3.3-dot.wbar.patch
@@ -0,0 +1,109 @@
+diff -pruN wbar-1.3.3.orig/dot.wbar wbar-1.3.3/dot.wbar
+--- wbar-1.3.3.orig/dot.wbar	2008-05-18 20:36:31.000000000 +0200
++++ wbar-1.3.3/dot.wbar	2008-05-18 20:36:41.000000000 +0200
+@@ -1,72 +1,72 @@
+ # The Bar && Font
+-i: iconpack/wbar.osx/osxbarback.png
+-t: iconpack/wbar.osx/font/12
++i: /usr/share/wbar/iconpack/wbar.osx/osxbarback.png
++t: /usr/share/wbar/iconpack/comic/12
+ c:
+ 
+-i: iconpack/wbar.osx/nautilus.png
++i: /usr/share/wbar/iconpack/wbar.osx/nautilus.png
+ c: nautilus --no-desktop --browser
+ t: nautilus
+ 
+-i: iconpack/wbar.osx/cedega.png
++i: /usr/share/wbar/iconpack/wbar.osx/cedega.png
+ c: 
+ t: wine
+ 
+-i: iconpack/wbar.osx/firefox.png
++i: /usr/share/wbar/iconpack/wbar.osx/firefox.png
+ c: firefox
+ t: firefox
+ 
+-i: iconpack/wbar.osx/thunderbird.png
++i: /usr/share/wbar/iconpack/wbar.osx/thunderbird.png
+ c: thunderbird
+ t: thunderbird
+ 
+-i: iconpack/wbar.osx/gearth.png
++i: /usr/share/wbar/iconpack/wbar.osx/gearth.png
+ c: 
+ t: gearth
+ 
+-i: iconpack/wbar.osx/skype.png
++i: /usr/share/wbar/iconpack/wbar.osx/skype.png
+ c: skype
+ t: skype
+ 
+-i: iconpack/wbar.osx/psi.png
++i: /usr/share/wbar/iconpack/wbar.osx/psi.png
+ c: pidgin
+ t: pidgin
+ 
+-i: iconpack/wbar.osx/mlgui.png
++i: /usr/share/wbar/iconpack/wbar.osx/mlgui.png
+ c: 
+ t: sancho
+ 
+-i: iconpack/wbar.osx/ooffice.png
++i: /usr/share/wbar/iconpack/wbar.osx/ooffice.png
+ c: soffice
+ t: ooffice
+ 
+-i: iconpack/wbar.osx/acroread.png
++i: /usr/share/wbar/iconpack/wbar.osx/acroread.png
+ c: acroread
+ t: acroread
+ 
+-i: iconpack/wbar.osx/beagle.png
++i: /usr/share/wbar/iconpack/wbar.osx/beagle.png
+ c: beagle-search
+ t: beagle
+ 
+-i: iconpack/wbar.osx/gimp.png
++i: /usr/share/wbar/iconpack/wbar.osx/gimp.png
+ c: gimp
+ t: gimp
+ 
+-i: iconpack/wbar.osx/picasa.png
++i: /usr/share/wbar/iconpack/wbar.osx/picasa.png
+ c: picasa
+ t: picasa
+ 
+-i: iconpack/wbar.osx/gqview.png
++i: /usr/share/wbar/iconpack/wbar.osx/gqview.png
+ c: gqview
+ t: gqview
+ 
+-i: iconpack/wbar.osx/xmms.png
++i: /usr/share/wbar/iconpack/wbar.osx/xmms.png
+ c: audacious
+ t: audacious
+ 
+-i: iconpack/wbar.osx/gnucash.png
++i: /usr/share/wbar/iconpack/wbar.osx/gnucash.png
+ c: gnucash
+ t: gnucash
+ 
+-i: iconpack/wbar.osx/gmplayer.png
++i: /usr/share/wbar/iconpack/wbar.osx/gmplayer.png
+ c: gmplayer
+ t: gmplayer
+diff -pruN wbar-1.3.3.orig/IconLoader.cc wbar-1.3.3/IconLoader.cc
+--- wbar-1.3.3.orig/IconLoader.cc	2008-05-18 20:36:31.000000000 +0200
++++ wbar-1.3.3/IconLoader.cc	2008-05-18 20:37:52.000000000 +0200
+@@ -24,8 +24,8 @@ IconLoader::IconLoader(const char *cfgFi
+ 	else if( !stat("dot.wbar", &cfg_stat) )
+ 	    configFile = "dot.wbar";
+ 
+-	else if( !stat("/usr/share/wbar/dot.wbar", &cfg_stat) )
+-	    configFile = "/usr/share/wbar/dot.wbar";
++	else if( !stat("/usr/etc/dot.wbar", &cfg_stat) )
++	    configFile = "/usr/etc/dot.wbar";
+ 
+ 	else 
+ 	    throw "Can't stat a config file. Try # make install or -config <cfgfile>";
diff --git a/wbar/wbar-1.3.3_gcc43.patch b/wbar/wbar-1.3.3_gcc43.patch
new file mode 100644
index 0000000..3cd866a
--- /dev/null
+++ b/wbar/wbar-1.3.3_gcc43.patch
@@ -0,0 +1,33 @@
+diff -Naur wbar-1.3.3.orig/IconLoader.cc wbar-1.3.3/IconLoader.cc
+--- wbar-1.3.3.orig/IconLoader.cc	2006-12-29 01:54:29.000000000 +0000
++++ wbar-1.3.3/IconLoader.cc	2008-08-06 15:35:58.000000000 +0000
+@@ -2,6 +2,7 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <cstdlib>
+ };
+ 
+ #include "IconLoader.h"
+diff -Naur wbar-1.3.3.orig/Main.cc wbar-1.3.3/Main.cc
+--- wbar-1.3.3.orig/Main.cc	2007-08-06 12:28:11.000000000 +0000
++++ wbar-1.3.3/Main.cc	2008-08-06 15:35:00.000000000 +0000
+@@ -4,6 +4,8 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <iostream>
++#include <cstdlib>
++#include <memory>
+ 
+ #include "XWin.h"
+ #include "ImgWrap.h"
+diff -Naur wbar-1.3.3.orig/SuperBar.cc wbar-1.3.3/SuperBar.cc
+--- wbar-1.3.3.orig/SuperBar.cc	2007-08-04 00:24:34.000000000 +0000
++++ wbar-1.3.3/SuperBar.cc	2008-08-06 15:51:14.000000000 +0000
+@@ -1,5 +1,6 @@
+ #include "SuperBar.h"
+ #include "SuperIcon.h"
++#include <cstdlib>
+ 
+ using namespace std;
+ 
-- 
2.26.2