From: <bra...@us...> - 2008-04-23 05:48:03
|
Update of /cvsroot/blackboxwm/blackbox/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7417/lib Modified Files: Image.cc Resource.cc XDG.cc libbt.pc.in Log Message: apply patch from debian to compile with gcc 4.3.0 Index: Image.cc =================================================================== RCS file: /cvsroot/blackboxwm/blackbox/lib/Image.cc,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Image.cc 8 Apr 2005 15:41:09 -0000 1.57 --- Image.cc 23 Apr 2008 05:48:07 -0000 1.58 *************** *** 46,49 **** --- 46,51 ---- #include <stdlib.h> + #include <cstring> + // #define COLORTABLE_DEBUG // #define MITSHM_DEBUG Index: Resource.cc =================================================================== RCS file: /cvsroot/blackboxwm/blackbox/lib/Resource.cc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Resource.cc 6 Apr 2005 21:16:50 -0000 1.21 --- Resource.cc 23 Apr 2008 05:48:07 -0000 1.22 *************** *** 31,34 **** --- 31,36 ---- #include <stdio.h> + #include <cstring> + bt::Resource::Resource(void) Index: XDG.cc =================================================================== RCS file: /cvsroot/blackboxwm/blackbox/lib/XDG.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XDG.cc 6 Dec 2005 08:53:17 -0000 1.3 --- XDG.cc 23 Apr 2008 05:48:07 -0000 1.4 *************** *** 29,33 **** #include <stdlib.h> ! // make sure directory names end with a slash --- 29,33 ---- #include <stdlib.h> ! #include <algorithm> // make sure directory names end with a slash Index: libbt.pc.in =================================================================== RCS file: /cvsroot/blackboxwm/blackbox/lib/libbt.pc.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libbt.pc.in 14 Sep 2004 10:29:45 -0000 1.2 --- libbt.pc.in 23 Apr 2008 05:48:07 -0000 1.3 *************** *** 6,11 **** Name: Blackbox Toolbox Description: Utility class library for writing small applications - Requires: @XFT_PKGCONFIG@ Version: @VERSION@ Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@ Cflags: -I${includedir}/bt --- 6,11 ---- Name: Blackbox Toolbox Description: Utility class library for writing small applications Version: @VERSION@ + Requires.private: @XFT_PKGCONFIG@ Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@ Cflags: -I${includedir}/bt |