wok-undigest rev 296

blackbox: Fixed. Add patch from archlinux to get it to build.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Jun 07 09:16:08 2011 +0000 (2011-06-07)
parents 7892b349ecf8
children 320de0221423
files blackbox/receipt blackbox/stuff/textpropertytostring-unconditional.patch
line diff
     1.1 --- a/blackbox/receipt	Tue Jun 07 16:18:35 2011 +0000
     1.2 +++ b/blackbox/receipt	Tue Jun 07 09:16:08 2011 +0000
     1.3 @@ -8,7 +8,9 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.5  WEB_SITE="http://blackboxwm.sourceforge.net/"
     1.6  WGET_URL="$SF_MIRROR/blackboxwm/$TARBALL"
     1.7 -DEPENDS="xorg-libXt xorg-libXft sed xorg-xextproto"
     1.8 +
     1.9 +DEPENDS="xorg-libXt xorg-libXft"
    1.10 +BUILD_DEPENDS="xorg-libXt-dev xorg-libXft-dev xorg-xextproto"
    1.11  
    1.12  # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc
    1.13  # to let user use the wm via slim/F1 or by default with 'tazx blackbox'.
    1.14 @@ -17,11 +19,12 @@
    1.15  compile_rules()
    1.16  {
    1.17  	cd $src
    1.18 -	./configure --prefix=/usr --sysconfdir=/etc \
    1.19 +	patch -p1 < $stuff/blackbox-0.70.1-gcc-4.3.patch
    1.20 +	patch -p0 < $stuff/blackbox-0.70.1-asneeded.patch
    1.21 +	patch -p1 < $stuff/textpropertytostring-unconditional.patch
    1.22 +	./configure --sysconfdir=/etc \
    1.23  	--libexecdir=/usr/bin --mandir=/usr/share/man \
    1.24  	$CONFIGURE_ARGS &&
    1.25 -	patch -p1 < $stuff/blackbox-0.70.1-gcc-4.3.patch
    1.26 -	patch -p1 < $stuff/blackbox-0.70.1-asneeded.patch
    1.27  	make &&
    1.28  	make DESTDIR=$DESTDIR install
    1.29  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/blackbox/stuff/textpropertytostring-unconditional.patch	Tue Jun 07 09:16:08 2011 +0000
     2.3 @@ -0,0 +1,28 @@
     2.4 +Description: Declare bt::textPropertyToString unconditionally.
     2.5 +Author: Jakub Wilk <jwilk@debian.org>
     2.6 +Forwarded: no
     2.7 +Bug-Debian: http://bugs.debian.org/614468
     2.8 +Last-Update: 2011-03-12
     2.9 +
    2.10 +--- a/lib/Util.hh
    2.11 ++++ b/lib/Util.hh
    2.12 +@@ -25,6 +25,8 @@
    2.13 + #ifndef __Util_hh
    2.14 + #define __Util_hh
    2.15 + 
    2.16 ++#include <X11/Xutil.h>
    2.17 ++
    2.18 + #include <limits.h>
    2.19 + #include <string>
    2.20 + 
    2.21 +@@ -94,10 +96,8 @@
    2.22 + 
    2.23 +   std::string tolower(const std::string &string);
    2.24 + 
    2.25 +-#ifdef _XUTIL_H_
    2.26 +   std::string textPropertyToString(::Display *display,
    2.27 +                                    ::XTextProperty& text_prop);
    2.28 +-#endif
    2.29 + 
    2.30 + } // namespace bt
    2.31 +