From f6c848659e70e7d31289bd7d3b927fe037655162 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 12 Aug 2003 18:35:37 +0000 Subject: [1] Fix xdmcp queries in the X servers (bug 277) [2] Fix underlining in the freetype backend (bug 330) PR: [1] ports/52387 [2] ports/55134 Submitted by: [1] Joel Ray Holveck [2] Ariff Abdullah --- x11-servers/XFree86-4-NestServer/Makefile | 2 +- x11-servers/XFree86-4-Server/Makefile | 4 ++-- x11-servers/XFree86-4-Server/files/patch-ftfuncs.c | 16 ++++++++++++++++ x11-servers/XFree86-4-VirtualFramebufferServer/Makefile | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 x11-servers/XFree86-4-Server/files/patch-ftfuncs.c (limited to 'x11-servers') diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 0f091c248606..7128611c7a82 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= NestServer PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 63f9b1ce71d5..c156a2963c0d 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.3.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -35,7 +35,7 @@ COMMENT= XFree86-4 X server and related programs patch-compiler.h patch-os-support_Imakefile patch-bsd_Imakefile \ patch-freebsdPci.c patch-bus_Imakefile patch-xf86Sbus.h patch-loader.c \ patch-Sbus.c patch-elfloader.c patch-xfree86.cf patch-FreeBSD.cf \ - patch-sunffb_Imakefile patch-xf86sym.c patch-xf86Events.c + patch-sunffb_Imakefile patch-xf86sym.c patch-xf86Events.c patch-ftfuncs.c EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor SCRIPTS_ENV= OSVERSION=${OSVERSION} \ diff --git a/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c b/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c new file mode 100644 index 000000000000..91fa2471a90f --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c @@ -0,0 +1,16 @@ +--- lib/font/FreeType/ftfuncs.c~ 2003-02-13 06:01:45.000000000 +0300 ++++ lib/font/FreeType/ftfuncs.c 2003-03-04 20:27:16.000000000 +0300 +@@ -959,11 +959,11 @@ + int underlinePosition, underlineThickness; + + if(post) { +- underlinePosition = TRANSFORM_FUNITS_Y(post->underlinePosition); ++ underlinePosition = TRANSFORM_FUNITS_Y(-post->underlinePosition); + underlineThickness = TRANSFORM_FUNITS_Y(post->underlineThickness); + } else { + underlinePosition = +- TRANSFORM_FUNITS_Y(t1info->underline_position); ++ TRANSFORM_FUNITS_Y(-t1info->underline_position); + underlineThickness = + TRANSFORM_FUNITS_Y(t1info->underline_thickness); + } \ No newline at end of file diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index 0810fe46ed18..d0f8988314e9 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= VirtualFramebufferServer PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} -- cgit v1.2.3