diff options
-rw-r--r-- | x11/fbdesk/Makefile | 6 | ||||
-rw-r--r-- | x11/fbdesk/distinfo | 12 | ||||
-rw-r--r-- | x11/fbdesk/patches/patch-aa | 14 | ||||
-rw-r--r-- | x11/fbdesk/patches/patch-ab | 7 |
4 files changed, 19 insertions, 20 deletions
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile index 06cbb195b9e..81f15019e8c 100644 --- a/x11/fbdesk/Makefile +++ b/x11/fbdesk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:42 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2008/05/10 16:19:16 obache Exp $ # -DISTNAME= fbdesk-1.2.1 -PKGREVISION= 4 +DISTNAME= fbdesk-1.4.1 CATEGORIES= x11 wm MASTER_SITES= http://fluxbox.sourceforge.net/download/ @@ -23,6 +22,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fbdesk/distinfo b/x11/fbdesk/distinfo index d6cf23ad402..ffa20017cbd 100644 --- a/x11/fbdesk/distinfo +++ b/x11/fbdesk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:36:10 wiz Exp $ +$NetBSD: distinfo,v 1.6 2008/05/10 16:19:16 obache Exp $ -SHA1 (fbdesk-1.2.1.tar.gz) = d3095dc51f91aa919371b582a546fa3e018533e3 -RMD160 (fbdesk-1.2.1.tar.gz) = a3ae892c5c733351b1525e874875c09078ac5aa7 -Size (fbdesk-1.2.1.tar.gz) = 388679 bytes -SHA1 (patch-aa) = b0ccdbfa83d7fe2a2f1f6f3c22b15508d0165602 -SHA1 (patch-ab) = 765d275b51250463f924accec763a1df40aad6e8 +SHA1 (fbdesk-1.4.1.tar.gz) = b5a2f446fa27406d9adb9a9608f1dc3c638d37ff +RMD160 (fbdesk-1.4.1.tar.gz) = ce22936b73acd8273e9816f4c2a5458cc98cf45a +Size (fbdesk-1.4.1.tar.gz) = 426550 bytes +SHA1 (patch-aa) = 4412dfd20e31814ee674213ca798864dab25399f +SHA1 (patch-ab) = 4245733d9ec038f0c2bc3bd53e9a026e97e43d1e diff --git a/x11/fbdesk/patches/patch-aa b/x11/fbdesk/patches/patch-aa index ada63700d18..14ba2ea8a5f 100644 --- a/x11/fbdesk/patches/patch-aa +++ b/x11/fbdesk/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.1 2004/09/24 19:06:39 reed Exp $ +$NetBSD: patch-aa,v 1.2 2008/05/10 16:19:16 obache Exp $ ---- ./src/FbTk/Font.cc.orig Mon Sep 20 03:45:01 2004 -+++ ./src/FbTk/Font.cc -@@ -230,7 +230,9 @@ bool Font::m_utf8mode = false; +--- src/FbTk/Font.cc.orig 2006-03-25 11:51:33.000000000 +0000 ++++ src/FbTk/Font.cc +@@ -180,7 +180,9 @@ bool Font::s_utf8mode = false; - // some initialisation for using fonts - void fontInit() { + void Font::init() { + // must be set before the first XFontSet is created +#ifdef HAVE_SETLOCALE setlocale(LC_CTYPE, ""); +#endif //HAVE_SETLOCALE } - Font::Font(const char *name, bool antialias): + void Font::shutdown() { diff --git a/x11/fbdesk/patches/patch-ab b/x11/fbdesk/patches/patch-ab index 72e04b6e86b..3a8e4df5a2c 100644 --- a/x11/fbdesk/patches/patch-ab +++ b/x11/fbdesk/patches/patch-ab @@ -1,10 +1,9 @@ -$NetBSD: patch-ab,v 1.1 2004/09/24 19:06:39 reed Exp $ +$NetBSD: patch-ab,v 1.2 2008/05/10 16:19:16 obache Exp $ ---- src/FbTk/FbPixmap.cc.orig Mon Sep 20 03:26:19 2004 +--- src/FbTk/FbPixmap.cc.orig 2006-03-25 11:47:10.000000000 +0000 +++ src/FbTk/FbPixmap.cc @@ -23,2 +23,4 @@ - + +#include <stdio.h> + #include "FbPixmap.hh" - |