From bd65dc7107bfdd881c3b5451d0300824cf435428 Mon Sep 17 00:00:00 2001 From: Parabola Date: Thu, 7 Apr 2011 03:09:25 +0000 Subject: Thu Apr 7 03:09:43 UTC 2011 --- community/blackbox/PKGBUILD | 31 +++++++++++++--------- .../textpropertytostring-unconditional.patch | 28 +++++++++++++++++++ 2 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 community/blackbox/textpropertytostring-unconditional.patch (limited to 'community/blackbox') diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD index af1ff72d1..b312b37c5 100644 --- a/community/blackbox/PKGBUILD +++ b/community/blackbox/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 7982 2010-01-13 18:45:53Z dgriffiths $ +# $Id: PKGBUILD 44299 2011-04-05 08:55:32Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: durbatuluk # Contributor: Steve Ponsford pkgname=blackbox pkgver=0.70.1 -pkgrel=8 +pkgrel=9 pkgdesc="A window manager for X11" +url="http://blackboxwm.sourceforge.net/" arch=('i686' 'x86_64') -depends=('libxft' 'libxext' 'xorg-server') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11') license=('MIT') options=('!libtool') source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz - gcc4.3.patch bbdock.patch bsetbg-feh.patch) -url="http://blackboxwm.sourceforge.net/" + gcc4.3.patch + bbdock.patch + bsetbg-feh.patch + textpropertytostring-unconditional.patch) md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' 'bc7a1335d77cdeb6f85cba4d01e68e63' '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc') + 'e7fb0d5bfd95820c0194ec73df66dadc' + '3b92ad246f07126dd55ae9634d6e875e') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../gcc4.3.patch || return 1 - patch -Np0 -i ../bbdock.patch || return 1 - patch -Np0 -i ../bsetbg-feh.patch || return 1 + patch -Np1 -i ../gcc4.3.patch + patch -Np0 -i ../bbdock.patch + patch -Np0 -i ../bsetbg-feh.patch + patch -Np1 -i ../textpropertytostring-unconditional.patch ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$pkgdir install - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/community/blackbox/textpropertytostring-unconditional.patch @@ -0,0 +1,28 @@ +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include ++ + #include + #include + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + -- cgit v1.2.3-54-g00ecf