Date: Mon, 17 Mar 2003 19:37:05 +0300 (MSK) From: Seva Gluschenko <gvs@rinet.ru> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/50009: Message-ID: <20030317192725.N61553@road.demos.su> In-Reply-To: <200303141750.h2EHo5td070613@freefall.freebsd.org> References: <200303141750.h2EHo5td070613@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Well, actually I was incomplete in my research regarding XFree86,
because a problem is a bit bigger than it might seem. XFree86 4.3.0
has bundled expat, Xft, fontconfig, freetype, they all are outdated,
they all are in dependencies chains. So, the correct patch should be
--- scripts/configure.orig Fri Mar 14 20:40:36 2003
+++ scripts/configure Mon Mar 17 19:31:28 2003
@@ -55,6 +55,15 @@
echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF
echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+echo '#define HasExpat YES
+#define HasFreetype2 YES
+#define Freetype2Dir /usr/local
+#define BuildXft1Library NO
+#define HasXft YES
+#define HasFontconfig YES
+#define FontconfigDir /usr/X11R6
+#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libXft.so.? libXrender.so.? libfontconfig.so.?)`' >> $LOCALDEF
+
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
The xc/config/cf/X11.tmpl should be extra patched, too. I hope, the
patch below instead of attached file won't cause too much trouble:
--- config/cf/X11.tmpl.orig Tue Mar 4 18:21:10 2003
+++ config/cf/X11.tmpl Mon Mar 17 15:16:49 2003
@@ -569,19 +569,19 @@
#define BuildRenderLibrary !BuildServersOnly
#endif
#ifndef BuildXftLibrary
-#define BuildXftLibrary BuildRenderLibrary
+#define BuildXftLibrary BuildRenderLibrary && !HasXft
#endif
#ifndef BuildXft1Library
#define BuildXft1Library BuildRenderLibrary
#endif
#ifndef UseFontconfig
-#define UseFontconfig BuildXftLibrary
+#define UseFontconfig (BuildXftLibrary || BuildXft1Library || HasXft)
#endif
#ifndef BuildFontconfigLibrary
#define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
#endif
#ifndef UseFreetype2
-#define UseFreetype2 (BuildXftLibrary || BuildXft1Library)
+#define UseFreetype2 (BuildXftLibrary || BuildXft1Library || HasXft)
#endif
#ifndef HasExpat
#define HasExpat NO
@@ -3189,7 +3199,7 @@
#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
#endif
-XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(INCROOT)
#if UseFontconfig
There's also a diff for programs/x11perf/Imakefile which depends on
Xft, I include it here not to open the separate PR on the related
issue:
--- programs/x11perf/Imakefile.orig Mon Mar 17 15:12:52 2003
+++ programs/x11perf/Imakefile Mon Mar 17 15:13:41 2003
@@ -18,7 +18,7 @@
XRENDERLIBS = $(XRENDERLIB)
XRENDERINCS = $(XRENDERINCLUDES)
#endif
-#if BuildXftLibrary
+#if BuildXftLibrary || HasXft
XFTDEFS = -DXFT
XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
XFTLIBS = XftClientLibs $(XRENDERLIB)
Well. Actually, that's all. And all that stuff doesn't help with Qt
and "fonts all look the same" problem %(
SY, Seva Gluschenko | GVS-RIPE | GVS3-RIPN
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030317192725.N61553>