[47217] trunk/dports/x11/xorg-libXfont
jeremyhu at macports.org
jeremyhu at macports.org
Mon Feb 23 10:36:04 PST 2009
Revision: 47217
http://trac.macports.org/changeset/47217
Author: jeremyhu at macports.org
Date: 2009-02-23 10:36:03 -0800 (Mon, 23 Feb 2009)
Log Message:
-----------
xorg-libXfont: Restore some functionality that was removed from libXfont, since its removal made our old xorg-server fail to compile. See #18605.
Modified Paths:
--------------
trunk/dports/x11/xorg-libXfont/Portfile
Added Paths:
-----------
trunk/dports/x11/xorg-libXfont/files/e1927f80deabe0268dc18b4a9f3ceda1325171f5.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-libXfont/files/f2b116ce5205d0fb8247f76fddb072e9141c62b7.patch
Modified: trunk/dports/x11/xorg-libXfont/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXfont/Portfile 2009-02-23 18:29:45 UTC (rev 47216)
+++ trunk/dports/x11/xorg-libXfont/Portfile 2009-02-23 18:36:03 UTC (rev 47217)
@@ -4,6 +4,7 @@
name xorg-libXfont
version 1.4.0
+revision 1
categories x11 devel
maintainers jeremyhu openmaintainer
description X.org libXfont
@@ -21,6 +22,10 @@
use_parallel_build yes
depends_build \
+ port:libtool \
+ port:autoconf \
+ port:automake \
+ port:xorg-util-macros \
port:pkgconfig \
port:xorg-fontcacheproto \
port:xorg-fontsproto \
@@ -38,6 +43,12 @@
# Newer libtool add -Wl,-single_module if this isn't set... breaking us
configure.env LT_MULTI_MODULE=1
+patchfiles e1927f80deabe0268dc18b4a9f3ceda1325171f5.patch
+patch.args -R -p1
+
+use_autoreconf yes
+autoreconf.args -fvi
+
livecheck.check regex
livecheck.url [lindex ${master_sites} 0]?C=M&O=D
livecheck.regex libXfont-(\\d+(?:\\.\\d+)*)
Added: trunk/dports/x11/xorg-libXfont/files/e1927f80deabe0268dc18b4a9f3ceda1325171f5.patch
===================================================================
--- trunk/dports/x11/xorg-libXfont/files/e1927f80deabe0268dc18b4a9f3ceda1325171f5.patch (rev 0)
+++ trunk/dports/x11/xorg-libXfont/files/e1927f80deabe0268dc18b4a9f3ceda1325171f5.patch 2009-02-23 18:36:03 UTC (rev 47217)
@@ -0,0 +1,475 @@
+From e1927f80deabe0268dc18b4a9f3ceda1325171f5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 21 Jan 2009 03:57:35 +0000
+Subject: Remove printer font support.
+
+Xprint is just insidious, isn't it.
+---
+diff --git a/src/fc/fserve.c b/src/fc/fserve.c
+index 07ada34..3980fb0 100644
+--- a/src/fc/fserve.c
++++ b/src/fc/fserve.c
+@@ -3200,70 +3200,3 @@ fs_register_fpe_functions(void)
+ NULL,
+ NULL);
+ }
+-
+-static int
+-check_fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
+- char *name, int namelen,
+- fsBitmapFormat format, fsBitmapFormatMask fmask,
+- XID id, FontPtr *ppfont,
+- char **alias, FontPtr non_cachable_font)
+-{
+- if (XpClientIsBitmapClient(client))
+- return (fs_open_font(client, fpe, flags, name, namelen, format,
+- fmask, id, ppfont, alias, non_cachable_font) );
+- return BadFontName;
+-}
+-
+-static int
+-check_fs_list_fonts(pointer client, FontPathElementPtr fpe,
+- char *pattern, int patlen, int maxnames,
+- FontNamesPtr newnames)
+-{
+- if (XpClientIsBitmapClient(client))
+- return (fs_list_fonts(client, fpe, pattern, patlen, maxnames,
+- newnames));
+- return BadFontName;
+-}
+-
+-static int
+-check_fs_start_list_with_info(pointer client, FontPathElementPtr fpe,
+- char *pattern, int len, int maxnames,
+- pointer *pdata)
+-{
+- if (XpClientIsBitmapClient(client))
+- return (fs_start_list_with_info(client, fpe, pattern, len, maxnames,
+- pdata));
+- return BadFontName;
+-}
+-
+-static int
+-check_fs_next_list_with_info(pointer client, FontPathElementPtr fpe,
+- char **namep, int *namelenp,
+- FontInfoPtr *pFontInfo, int *numFonts,
+- pointer private)
+-{
+- if (XpClientIsBitmapClient(client))
+- return (fs_next_list_with_info(client, fpe, namep, namelenp, pFontInfo,
+- numFonts,private));
+- return BadFontName;
+-}
+-
+-void
+-check_fs_register_fpe_functions(void)
+-{
+- RegisterFPEFunctions(fs_name_check,
+- fs_init_fpe,
+- fs_free_fpe,
+- fs_reset_fpe,
+- check_fs_open_font,
+- fs_close_font,
+- check_fs_list_fonts,
+- check_fs_start_list_with_info,
+- check_fs_next_list_with_info,
+- fs_wakeup,
+- fs_client_died,
+- _fs_load_glyphs,
+- NULL,
+- NULL,
+- NULL);
+-}
+diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
+index 45d1dba..05aded2 100644
+--- a/src/fontfile/Makefile.am
++++ b/src/fontfile/Makefile.am
+@@ -18,7 +18,6 @@ libfontfile_la_SOURCES = \
+ decompress.c \
+ defaults.c \
+ dirfile.c \
+- ffcheck.c \
+ fileio.c \
+ filewr.c \
+ fontdir.c \
+@@ -26,7 +25,6 @@ libfontfile_la_SOURCES = \
+ fontfile.c \
+ fontscale.c \
+ gunzip.c \
+- printerfont.c \
+ register.c \
+ renderers.c \
+ catalogue.c
+diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
+deleted file mode 100644
+index e7f8b85..0000000
+--- a/src/fontfile/ffcheck.c
++++ b/dev/null
+@@ -1,143 +0,0 @@
+-/*
+-
+-Copyright 1991, 1998 The Open Group
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+-
+-*/
+-/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.15tsi Exp $ */
+-
+-/*
+- * Author: Keith Packard, MIT X Consortium
+- */
+-/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
+-
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-#include <X11/fonts/fntfilst.h>
+-#include <X11/fonts/bitmap.h>
+-
+-/*
+- * Map FPE functions to renderer functions
+- */
+-
+-
+-/* Here we must check the client to see if it has a context attached to
+- * it that allows us to access the printer fonts
+- */
+-
+-static int
+-FontFileCheckOpenFont (pointer client, FontPathElementPtr fpe, Mask flags,
+- char *name, int namelen,
+- fsBitmapFormat format, fsBitmapFormatMask fmask,
+- XID id, FontPtr *pFont, char **aliasName,
+- FontPtr non_cachable_font)
+-{
+- if (XpClientIsBitmapClient(client))
+- return (FontFileOpenFont (client, fpe, flags, name, namelen, format,
+- fmask, id, pFont, aliasName, non_cachable_font));
+- return BadFontName;
+-}
+-
+-static int
+-FontFileCheckListFonts (pointer client, FontPathElementPtr fpe,
+- char *pat, int len, int max, FontNamesPtr names)
+-{
+- if (XpClientIsBitmapClient(client))
+- return FontFileListFonts (client, fpe, pat, len, max, names);
+- return BadFontName;
+-}
+-
+-static int
+-FontFileCheckStartListFontsWithInfo(pointer client, FontPathElementPtr fpe,
+- char *pat, int len, int max,
+- pointer *privatep)
+-{
+- if (XpClientIsBitmapClient(client))
+- return FontFileStartListFontsWithInfo(client, fpe, pat, len,
+- max, privatep);
+- return BadFontName;
+-}
+-
+-static int
+-FontFileCheckListNextFontWithInfo(pointer client, FontPathElementPtr fpe,
+- char **namep, int *namelenp,
+- FontInfoPtr *pFontInfo,
+- int *numFonts, pointer private)
+-{
+- if (XpClientIsBitmapClient(client))
+- return FontFileListNextFontWithInfo(client, fpe, namep, namelenp,
+- pFontInfo, numFonts, private);
+- return BadFontName;
+-}
+-
+-static int
+-FontFileCheckStartListFontsAndAliases(pointer client, FontPathElementPtr fpe,
+- char *pat, int len, int max,
+- pointer *privatep)
+-{
+- if (XpClientIsBitmapClient(client))
+- return FontFileStartListFontsAndAliases(client, fpe, pat, len,
+- max, privatep);
+- return BadFontName;
+-}
+-
+-static int
+-FontFileCheckListNextFontOrAlias(pointer client, FontPathElementPtr fpe,
+- char **namep, int *namelenp,
+- char **resolvedp, int *resolvedlenp,
+- pointer private)
+-{
+- if (XpClientIsBitmapClient(client))
+- return FontFileListNextFontOrAlias(client, fpe, namep, namelenp,
+- resolvedp, resolvedlenp, private);
+- return BadFontName;
+-}
+-
+-void
+-FontFileCheckRegisterFpeFunctions (void)
+-{
+-#ifdef XFONT_BITMAP
+- /* bitmap is always builtin to libXfont now */
+- BitmapRegisterFontFileFunctions ();
+-#endif
+-
+-#ifdef XFONT_FREETYPE
+- FreeTypeRegisterFontFileFunctions();
+-#endif
+-
+- RegisterFPEFunctions(FontFileNameCheck,
+- FontFileInitFPE,
+- FontFileFreeFPE,
+- FontFileResetFPE,
+- FontFileCheckOpenFont,
+- FontFileCloseFont,
+- FontFileCheckListFonts,
+- FontFileCheckStartListFontsWithInfo,
+- FontFileCheckListNextFontWithInfo,
+- NULL,
+- NULL,
+- NULL,
+- FontFileCheckStartListFontsAndAliases,
+- FontFileCheckListNextFontOrAlias,
+- FontFileEmptyBitmapSource);
+-}
+diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c
+deleted file mode 100644
+index 0b6c19c..0000000
+--- a/src/fontfile/printerfont.c
++++ b/dev/null
+@@ -1,178 +0,0 @@
+-/* $Xorg: printerfont.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
+-
+-/*
+-
+-Copyright 1991, 1998 The Open Group
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+-
+-*/
+-/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.5tsi Exp $ */
+-
+-/*
+- * Author: Keith Packard, MIT X Consortium
+- */
+-/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
+-
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-#include <X11/fonts/fntfilst.h>
+-
+-/*
+- * Map FPE functions to renderer functions
+- */
+-
+-#define PRINTERPATHPREFIX "PRINTER:"
+-
+-/* STUB
+-int XpClientIsPrintClient(client,fpe)
+-pointer client;
+-FontPathElementPtr fpe;
+-{ return 1; }
+- */
+-
+-static int
+-PrinterFontNameCheck (char *name)
+-{
+- if (strncmp(name,PRINTERPATHPREFIX,strlen(PRINTERPATHPREFIX)) != 0)
+- return 0;
+- name += strlen(PRINTERPATHPREFIX);
+-#ifndef NCD
+- return *name == '/';
+-#else
+- return ((strcmp(name, "built-ins") == 0) || (*name == '/'));
+-#endif
+-}
+-
+-static int
+-PrinterFontInitFPE (FontPathElementPtr fpe)
+-{
+- int status;
+- FontDirectoryPtr dir;
+- char * name;
+-
+- name = fpe->name + strlen(PRINTERPATHPREFIX);
+- status = FontFileReadDirectory (name, &dir);
+- if (status == Successful)
+- {
+- if (dir->nonScalable.used > 0)
+- if (!FontFileRegisterBitmapSource (fpe))
+- {
+- FontFileFreeFPE (fpe);
+- return AllocError;
+- }
+- fpe->private = (pointer) dir;
+- }
+- return status;
+-}
+-
+-/* Here we must check the client to see if it has a context attached to
+- * it that allows us to access the printer fonts
+- */
+-
+-static int
+-PrinterFontOpenFont (pointer client, FontPathElementPtr fpe, Mask flags,
+- char *name, int namelen,
+- fsBitmapFormat format, fsBitmapFormatMask fmask,
+- XID id, FontPtr *pFont, char **aliasName,
+- FontPtr non_cachable_font)
+-{
+- if (XpClientIsPrintClient(client,fpe))
+- return (FontFileOpenFont (client, fpe, flags, name, namelen, format,
+- fmask, id, pFont, aliasName, non_cachable_font));
+- return BadFontName;
+-}
+-
+-static int
+-PrinterFontListFonts (pointer client, FontPathElementPtr fpe, char *pat,
+- int len, int max, FontNamesPtr names)
+-{
+- if (XpClientIsPrintClient(client,fpe))
+- return FontFileListFonts (client, fpe, pat, len, max, names);
+- return BadFontName;
+-}
+-
+-static int
+-PrinterFontStartListFontsWithInfo(pointer client, FontPathElementPtr fpe,
+- char *pat, int len, int max,
+- pointer *privatep)
+-{
+- if (XpClientIsPrintClient(client,fpe))
+- return FontFileStartListFontsWithInfo(client, fpe, pat, len,
+- max, privatep);
+- return BadFontName;
+-}
+-
+-static int
+-PrinterFontListNextFontWithInfo(pointer client, FontPathElementPtr fpe,
+- char **namep, int *namelenp,
+- FontInfoPtr *pFontInfo,
+- int *numFonts, pointer private)
+-{
+- if (XpClientIsPrintClient(client,fpe))
+- return FontFileListNextFontWithInfo(client, fpe, namep, namelenp,
+- pFontInfo, numFonts, private);
+- return BadFontName;
+-}
+-
+-static int
+-PrinterFontStartListFontsAndAliases(pointer client, FontPathElementPtr fpe,
+- char *pat, int len, int max,
+- pointer *privatep)
+-{
+- if (XpClientIsPrintClient(client,fpe))
+- return FontFileStartListFontsAndAliases(client, fpe, pat, len,
+- max, privatep);
+- return BadFontName;
+-}
+-
+-static int
+-PrinterFontListNextFontOrAlias(pointer client, FontPathElementPtr fpe,
+- char **namep, int *namelenp,
+- char **resolvedp, int *resolvedlenp,
+- pointer private)
+-{
+- if (XpClientIsPrintClient(client,fpe))
+- return FontFileListNextFontOrAlias(client, fpe, namep, namelenp,
+- resolvedp, resolvedlenp, private);
+- return BadFontName;
+-}
+-
+-void
+-PrinterFontRegisterFpeFunctions (void)
+-{
+- RegisterFPEFunctions(PrinterFontNameCheck,
+- PrinterFontInitFPE,
+- FontFileFreeFPE,
+- FontFileResetFPE,
+- PrinterFontOpenFont,
+- FontFileCloseFont,
+- PrinterFontListFonts,
+- PrinterFontStartListFontsWithInfo,
+- PrinterFontListNextFontWithInfo,
+- NULL,
+- NULL,
+- NULL,
+- PrinterFontStartListFontsAndAliases,
+- PrinterFontListNextFontOrAlias,
+- FontFileEmptyBitmapSource);
+-}
+diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am
+index cb3bb35..4d60c2a 100644
+--- a/src/stubs/Makefile.am
++++ b/src/stubs/Makefile.am
+@@ -22,5 +22,4 @@ libstubs_la_SOURCES = \
+ servclient.c \
+ setfntauth.c \
+ stfntcfnt.c \
+- stubs.h \
+- xpstubs.c
++ stubs.h
+diff --git a/src/stubs/xpstubs.c b/src/stubs/xpstubs.c
+deleted file mode 100644
+index 939b34f..0000000
+--- a/src/stubs/xpstubs.c
++++ b/dev/null
+@@ -1,21 +0,0 @@
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-#include "stubs.h"
+-
+-#ifdef __SUNPRO_C
+-#pragma weak XpClientIsBitmapClient
+-#pragma weak XpClientIsPrintClient
+-#endif
+-
+-weak Bool
+-XpClientIsBitmapClient(ClientPtr client)
+-{
+- return True;
+-}
+-
+-weak Bool
+-XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe)
+-{
+- return False;
+-}
+--
+cgit v0.8.2
Deleted: trunk/dports/x11/xorg-libXfont/files/f2b116ce5205d0fb8247f76fddb072e9141c62b7.patch
===================================================================
--- trunk/dports/x11/xorg-libXfont/files/f2b116ce5205d0fb8247f76fddb072e9141c62b7.patch 2009-02-23 18:29:45 UTC (rev 47216)
+++ trunk/dports/x11/xorg-libXfont/files/f2b116ce5205d0fb8247f76fddb072e9141c62b7.patch 2009-02-23 18:36:03 UTC (rev 47217)
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3e0cbfa..99087c4 100644
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -21,6 +21,8 @@
-
- lib_LTLIBRARIES = libXfont.la
-
-+AM_CFLAGS = $(OS_CFLAGS)
-+
- if XFONT_FONTFILE
- FONTFILE_DIR = fontfile
- FONTFILE_LIB = fontfile/libfontfile.la
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090223/f9ef8b21/attachment.html>
More information about the macports-changes
mailing list