From ec66ae45868cf3895275f406317f8f4a8779eacc Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Wed, 7 Sep 2011 13:11:39 +0200 Subject: [PATCH] wbar: updated to 2.2.2 --- wbar/.footprint | 53 ++++++++-------- wbar/.md5sum | 4 +- wbar/Pkgfile | 33 +++++----- wbar/README | 8 +++ wbar/wbar-1.3.3-dot.wbar.patch | 109 --------------------------------- wbar/wbar-1.3.3_gcc43.patch | 33 ---------- 6 files changed, 53 insertions(+), 187 deletions(-) create mode 100644 wbar/README delete mode 100644 wbar/wbar-1.3.3-dot.wbar.patch delete mode 100644 wbar/wbar-1.3.3_gcc43.patch diff --git a/wbar/.footprint b/wbar/.footprint index 584238f76..58718fad3 100644 --- a/wbar/.footprint +++ b/wbar/.footprint @@ -1,31 +1,34 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/wbar +-rwxr-xr-x root/root usr/bin/wbar-config drwxr-xr-x root/root usr/etc/ --rw-r--r-- root/root usr/etc/dot.wbar +drwxr-xr-x root/root usr/etc/wbar/ +-rw-r--r-- root/root usr/etc/wbar/wbar.cfg +drwxr-xr-x root/root usr/etc/xdg/ +drwxr-xr-x root/root usr/etc/xdg/autostart/ +-rw-r--r-- root/root usr/etc/xdg/autostart/wbar.desktop +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/es/ +drwxr-xr-x root/root usr/man/es/man1/ +-rw-r--r-- root/root usr/man/es/man1/wbar-config.1 +-rw-r--r-- root/root usr/man/es/man1/wbar.1 +drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/wbar-config.1.gz +-rw-r--r-- root/root usr/man/man1/wbar.1.gz drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/pixmaps/ +-rw-r--r-- root/root usr/share/pixmaps/wbar.png +drwxr-xr-x root/root usr/share/pixmaps/wbar/ +-rw-r--r-- root/root usr/share/pixmaps/wbar/anjuta.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/bluefish.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/gimp.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/ooffice.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/osxbarback.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/pidgin.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/synaptic.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/terminal.png +-rw-r--r-- root/root usr/share/pixmaps/wbar/wbar.png 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 --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 +drwxr-xr-x root/root usr/share/wbar/glade/ +-rw-r--r-- root/root usr/share/wbar/glade/wbar.glade diff --git a/wbar/.md5sum b/wbar/.md5sum index a5c793765..7f26545a5 100644 --- a/wbar/.md5sum +++ b/wbar/.md5sum @@ -1,3 +1 @@ -96b4c7b507b996460d9a9c2f8cc9727e wbar-1.3.3-dot.wbar.patch -542335a273188de0d6a93102501351a4 wbar-1.3.3.tbz2 -043c7676b626fc4abd9108d7ca26f84e wbar-1.3.3_gcc43.patch +7ee752ad4f3268ccbc24ca72e463d847 wbar-2.2.2.tbz2 diff --git a/wbar/Pkgfile b/wbar/Pkgfile index f501fd09f..3a7af6a49 100644 --- a/wbar/Pkgfile +++ b/wbar/Pkgfile @@ -1,25 +1,24 @@ # Description: Quick launch bar -# URL: http://code.google.com/p/wbar/ -# Packager: Younes Hafri, ycrux at club-internet dot fr -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Depends on: imlib2 +# URL: http://code.google.com/p/wbar/ +# Maintainer: Jose V Beneyto, sepen at crux dot nu +# Packager: Younes Hafri, ycrux at club-internet dot fr +# Depends on: imlib2 name=wbar -version=1.3.3 +version=2.2.2 release=1 -source=(http://$name.googlecode.com/files/$name-$version.tbz2 -$name-$version-dot.wbar.patch $name-${version}_gcc43.patch) +source=(http://$name.googlecode.com/files/$name-$version.tbz2) build() { - tar --use-compress-program=bzip2 -xf $name-$version.tbz2 cd $name-$version - patch -p1 -i $SRC/$name-$version-dot.wbar.patch - patch -p1 -i $SRC/$name-${version}_gcc43.patch - sed -i "/CXXFLAGS/s/-O2/$CXXFLAGS/" Makefile - make - mkdir -p $PKG/usr/share/$name - mv iconpack $PKG/usr/share/$name - install -D -m 0644 dot.$name $PKG/usr/etc/dot.$name - install -D -m 0755 $name $PKG/usr/bin/$name -} + sed -i configure \ + -e 's|DEFAULT_CONFIGDIR=.*|DEFAULT_CONFIGDIR=/usr/etc/wbar|g' + + ./configure --prefix=/usr \ + --mandir=/usr/man \ + --disable-nls + make + make DESTDIR=$PKG install + rm -rf $PKG/usr/share/locale +} diff --git a/wbar/README b/wbar/README new file mode 100644 index 000000000..7fc81f68b --- /dev/null +++ b/wbar/README @@ -0,0 +1,8 @@ + +README for wbar + + +POST-INSTALL + + The wbar-config utility requires gtk to be installed + diff --git a/wbar/wbar-1.3.3-dot.wbar.patch b/wbar/wbar-1.3.3-dot.wbar.patch deleted file mode 100644 index 0064356ca..000000000 --- a/wbar/wbar-1.3.3-dot.wbar.patch +++ /dev/null @@ -1,109 +0,0 @@ -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 "; diff --git a/wbar/wbar-1.3.3_gcc43.patch b/wbar/wbar-1.3.3_gcc43.patch deleted file mode 100644 index 3cd866a1d..000000000 --- a/wbar/wbar-1.3.3_gcc43.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - #include - #include -+#include - }; - - #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 - #include - #include -+#include -+#include - - #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 - - using namespace std; -