diff options
| author | anholt <anholt@FreeBSD.org> | 2003-02-19 16:06:54 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-02-19 16:06:54 +0800 |
| commit | 8c8383d6bc7c0ce43834fc334e2837b5158adfda (patch) | |
| tree | c0e9b3e127859d663d24d9db4b52bfa9f795f1c8 /x11/XFree86-4-libraries | |
| parent | a5793c301fe1fdd082c66f65b4fe0bfcfee6f3d7 (diff) | |
| download | freebsd-ports-gnome-8c8383d6bc7c0ce43834fc334e2837b5158adfda.tar.gz freebsd-ports-gnome-8c8383d6bc7c0ce43834fc334e2837b5158adfda.tar.zst freebsd-ports-gnome-8c8383d6bc7c0ce43834fc334e2837b5158adfda.zip | |
Fix XFree86-4-libraries after Xft renaming removal:
Add `pkg-config xft --cflags` and --libs to Imakefiles of programs that use Xft
and remove a bit of code not needed for Xft2, remove xftcache program.
Reported by: many
Diffstat (limited to 'x11/XFree86-4-libraries')
5 files changed, 61 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-do_text.c b/x11/XFree86-4-libraries/files/patch-do_text.c new file mode 100644 index 000000000000..adfd02fb0db4 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-do_text.c @@ -0,0 +1,17 @@ +--- programs/x11perf/do_text.c.orig Wed Feb 19 07:39:37 2003 ++++ programs/x11perf/do_text.c Wed Feb 19 07:39:39 2003 +@@ -421,14 +421,6 @@ + p->font); + return 0; + } +- +- if (aafont->core) +- { +- printf ("FreeType font '%s' not available, benchmark omitted\n", +- p->font); +- XftFontClose (xp->d, aafont); +- return 0; +- } + + aadraw = XftDrawCreate (xp->d, xp->w, + DefaultVisual (xp->d, DefaultScreen (xp->d)), diff --git a/x11/XFree86-4-libraries/files/patch-programs-Imakefile b/x11/XFree86-4-libraries/files/patch-programs-Imakefile new file mode 100644 index 000000000000..3647855ffe53 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-programs-Imakefile @@ -0,0 +1,11 @@ +--- programs/Imakefile.orig Tue Feb 18 23:53:09 2003 ++++ programs/Imakefile Tue Feb 18 23:54:11 2003 +@@ -127,7 +127,7 @@ + $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ + $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ + $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \ +- $(GLXCLIENTDIRS) $(XFTCACHEDIR) $(XRANDRDIR) ++ $(GLXCLIENTDIRS) $(XRANDRDIR) + #endif + + MakeSubdirs($(SUBDIRS)) diff --git a/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile b/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile new file mode 100644 index 000000000000..f39a57cc03e5 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile @@ -0,0 +1,11 @@ +--- programs/x11perf/Imakefile.orig Tue Feb 18 23:05:33 2003 ++++ programs/x11perf/Imakefile Tue Feb 18 23:06:18 2003 +@@ -17,6 +17,8 @@ + XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB) + XFTLIBS = XftClientLibs $(XRENDERLIB) + #endif ++ XFTDEFS = -DXFT `pkg-config xft --cflags` ++ XFTLIBS = `pkg-config xft --libs` + DEFINES = $(SIGNAL_DEFINES) $(SHMDEFS) $(XFTDEFS) + PERFLIB = X11perfcompLib + HEADERS = x11perf.h bitmaps.h diff --git a/x11/XFree86-4-libraries/files/patch-xditview-Imakefile b/x11/XFree86-4-libraries/files/patch-xditview-Imakefile new file mode 100644 index 000000000000..74fc94cabb96 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-xditview-Imakefile @@ -0,0 +1,11 @@ +--- programs/xditview/Imakefile.orig Tue Feb 18 23:44:48 2003 ++++ programs/xditview/Imakefile Tue Feb 18 23:45:10 2003 +@@ -12,6 +12,8 @@ + FONTLIBS = XftClientLibs + FONTDEFS = -DUSE_XFT + #endif ++ FONTLIBS = `pkg-config xft --libs` ++ FONTDEFS = -DUSE_XFT `pkg-config xft --cflags` + #if HasMkstemp + TEMPDEFS = -DHAS_MKSTEMP + #endif diff --git a/x11/XFree86-4-libraries/files/patch-xterm-Imakefile b/x11/XFree86-4-libraries/files/patch-xterm-Imakefile new file mode 100644 index 000000000000..d8a85f8e929d --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-xterm-Imakefile @@ -0,0 +1,11 @@ +--- programs/xterm/Imakefile.orig Tue Feb 18 23:49:54 2003 ++++ programs/xterm/Imakefile Tue Feb 18 23:50:10 2003 +@@ -103,6 +103,8 @@ + XRFLIBS = XftClientLibs $(XRENDERLIB) + XRFDEPLIBS = XftClientDepLibs $(DEPXRENDERLIB) + #endif ++ XRFDEF = -DXRENDERFONT `pkg-config xft --cflags` ++ XRFLIBS = `pkg-config xft --libs` + + MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) $(NOPOSIXTERMIOS) \ + -DOSMAJORVERSION=$(OSMAJORVERSION) \ |