<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141582] trunk/dports/x11/xorg-libXfont</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141582">141582</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-21 21:44:45 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-libXfont: Don't build with -flat_namespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorglibXfontPortfile">trunk/dports/x11/xorg-libXfont/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/x11/xorg-libXfont/files/</li>
<li><a href="#trunkdportsx11xorglibXfontfiles0001stubsAddmissingexternsfordeclarationsintheNOpatch">trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch</a></li>
<li><a href="#trunkdportsx11xorglibXfontfiles0002UseNO_WEAK_SYMBOLSinsteadofflat_namespacepatch">trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorglibXfontPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-libXfont/Portfile (141581 => 141582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libXfont/Portfile 2015-10-21 23:10:16 UTC (rev 141581)
+++ trunk/dports/x11/xorg-libXfont/Portfile 2015-10-22 04:44:45 UTC (rev 141582)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name xorg-libXfont
</span><span class="cx"> version 1.5.1
</span><ins>+revision 1
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11 BSD
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -23,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> depends_build \
</span><span class="cx"> port:pkgconfig \
</span><ins>+ port:xorg-util-macros \
</ins><span class="cx"> port:xorg-xtrans
</span><span class="cx">
</span><span class="cx"> depends_lib \
</span><span class="lines">@@ -33,9 +35,15 @@
</span><span class="cx"> port:xorg-xproto \
</span><span class="cx"> port:xorg-fontsproto
</span><span class="cx">
</span><del>-# Newer libtool add -Wl,-single_module if this isn't set... breaking us
-configure.env LT_MULTI_MODULE=1
</del><ins>+patchfiles \
+ 0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch \
+ 0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch
</ins><span class="cx">
</span><ins>+patch.pre_args -p1
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args \
</span><span class="cx"> --with-bzip2 \
</span><span class="cx"> --without-xmlto \
</span></span></pre></div>
<a id="trunkdportsx11xorglibXfontfiles0001stubsAddmissingexternsfordeclarationsintheNOpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch (0 => 141582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch (rev 0)
+++ trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch 2015-10-22 04:44:45 UTC (rev 141582)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+From 2788c6984bc54bfba61b2dbdb5353978199d8a37 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 21 Oct 2015 21:27:26 -0700
+Subject: [PATCH 1/2] stubs: Add missing externs for declarations in the
+ NO_WEAK_SYMBOLS && PIC stubs resolution
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ src/stubs/stubs.h | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
+index 7d499d5..c09c675 100644
+--- a/src/stubs/stubs.h
++++ b/src/stubs/stubs.h
+@@ -38,29 +38,29 @@ extern int _font_init_stubs(void);
+ (*__##sym)(f, _args); \
+ va_end(_args)
+
+-int (*__client_auth_generation)(ClientPtr);
+-Bool (*__ClientSignal)(ClientPtr);
+-void (*__DeleteFontClientID)(Font);
+-void (*__VErrorF)(const char *, va_list);
+-FontPtr (*__find_old_font)(FSID);
+-FontResolutionPtr (*__GetClientResolutions)(int *);
+-int (*__GetDefaultPointSize)(void);
+-Font (*__GetNewFontClientID)(void);
+-unsigned long (*__GetTimeInMillis)(void);
+-int (*__init_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr);
+-int (*__RegisterFPEFunctions)(NameCheckFunc, InitFpeFunc, FreeFpeFunc,
+- ResetFpeFunc, OpenFontFunc, CloseFontFunc, ListFontsFunc,
+- StartLfwiFunc, NextLfwiFunc, WakeupFpeFunc, ClientDiedFunc,
+- LoadGlyphsFunc, StartLaFunc, NextLaFunc, SetPathFunc);
+-void (*__remove_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr, Bool);
+-void **__ptr_serverClient;
+-int (*__set_font_authorizations)(char **, int *, ClientPtr);
+-int (*__StoreFontClientFont)(FontPtr, Font);
+-Atom (*__MakeAtom)(const char *, unsigned, int);
+-int (*__ValidAtom)(Atom);
+-char *(*__NameForAtom)(Atom);
+-unsigned long *__ptr_serverGeneration;
+-void (*__register_fpe_functions)(void);
++extern int (*__client_auth_generation)(ClientPtr);
++extern Bool (*__ClientSignal)(ClientPtr);
++extern void (*__DeleteFontClientID)(Font);
++extern void (*__VErrorF)(const char *, va_list);
++extern FontPtr (*__find_old_font)(FSID);
++extern FontResolutionPtr (*__GetClientResolutions)(int *);
++extern int (*__GetDefaultPointSize)(void);
++extern Font (*__GetNewFontClientID)(void);
++extern unsigned long (*__GetTimeInMillis)(void);
++extern int (*__init_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr);
++extern int (*__RegisterFPEFunctions)(NameCheckFunc, InitFpeFunc, FreeFpeFunc,
++ ResetFpeFunc, OpenFontFunc, CloseFontFunc, ListFontsFunc,
++ StartLfwiFunc, NextLfwiFunc, WakeupFpeFunc, ClientDiedFunc,
++ LoadGlyphsFunc, StartLaFunc, NextLaFunc, SetPathFunc);
++extern void (*__remove_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr, Bool);
++extern void **__ptr_serverClient;
++extern int (*__set_font_authorizations)(char **, int *, ClientPtr);
++extern int (*__StoreFontClientFont)(FontPtr, Font);
++extern Atom (*__MakeAtom)(const char *, unsigned, int);
++extern int (*__ValidAtom)(Atom);
++extern char *(*__NameForAtom)(Atom);
++extern unsigned long *__ptr_serverGeneration;
++extern void (*__register_fpe_functions)(void);
+ #else /* NO_WEAK_SYMBOLS && PIC */
+ #define OVERRIDE_DATA(sym)
+ #define OVERRIDE_SYMBOL(sym,...)
+--
+2.6.2
+
</ins></span></pre></div>
<a id="trunkdportsx11xorglibXfontfiles0002UseNO_WEAK_SYMBOLSinsteadofflat_namespacepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch (0 => 141582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch (rev 0)
+++ trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch 2015-10-22 04:44:45 UTC (rev 141582)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+From d6877a7c1c35985f6a75b6cd4e814595e781adc4 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 21 Oct 2015 21:03:00 -0700
+Subject: [PATCH 2/2] Use NO_WEAK_SYMBOLS instead of -flat_namespace
+
+Lesser of two evil hacks, I suppose...
+
+This reverts commit 0386fa77367a305deea3cc27f8a3865cc3c467c0.
+---
+ configure.ac | 3 ---
+ src/stubs/stubs.h | 11 +----------
+ 2 files changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7cb6bdf..640cc92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -213,9 +213,6 @@ case $host_os in
+ linux*)
+ OS_CFLAGS="-D_XOPEN_SOURCE"
+ ;;
+- darwin*)
+- OS_CFLAGS="-Wl,-flat_namespace"
+- ;
+ *)
+ OS_CFLAGS=
+ ;;
+diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
+index c09c675..9e71806 100644
+--- a/src/stubs/stubs.h
++++ b/src/stubs/stubs.h
+@@ -10,7 +10,7 @@
+ #endif
+
+ /* this probably works for Mach-O too, but probably not for PE */
+-#if (defined(__APPLE__) || defined(__ELF__)) && defined(__GNUC__) && (__GNUC__ >= 3)
++#if defined(__ELF__) && defined(__GNUC__) && (__GNUC__ >= 3)
+ #define weak __attribute__((weak))
+ #else
+ #define weak
+@@ -67,15 +67,6 @@ extern void (*__register_fpe_functions)(void);
+ #define OVERRIDE_VA_SYMBOL(sym,f)
+ #endif
+
+-/* This is really just a hack for now... __APPLE__ really should be using
+- * the weak symbols route above, but it's causing an as-yet unresolved issue,
+- * so we're instead building with flat_namespace.
+- */
+-#ifdef __APPLE__
+-#undef weak
+-#define weak
+-#endif
+-
+ extern FontPtr find_old_font ( FSID id );
+ extern int set_font_authorizations ( char **authorizations,
+ int *authlen,
+--
+2.6.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>