<!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>[144391] trunk/dports/x11/xorg-libXaw</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/144391">144391</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-06 23:33:32 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-libXaw: Additional fixes for libXt symbol-fu</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorglibXawPortfile">trunk/dports/x11/xorg-libXaw/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorglibXawfiles0001darwinRemoveincorrectexportofvendorShellClassRepatch">trunk/dports/x11/xorg-libXaw/files/0001-darwin-Remove-incorrect-export-of-vendorShellClassRe.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorglibXawfiles0001darwinFixupvendorShellWidgetClasspatch">trunk/dports/x11/xorg-libXaw/files/0001-darwin-Fixup-vendorShellWidgetClass.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorglibXawPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-libXaw/Portfile (144390 => 144391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libXaw/Portfile 2016-01-07 07:33:19 UTC (rev 144390)
+++ trunk/dports/x11/xorg-libXaw/Portfile 2016-01-07 07:33:32 UTC (rev 144391)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name xorg-libXaw
</span><span class="cx"> version 1.0.13
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles \
</span><del>- 0001-darwin-Fixup-vendorShellWidgetClass.patch
</del><ins>+ 0001-darwin-Remove-incorrect-export-of-vendorShellClassRe.patch
</ins><span class="cx">
</span><span class="cx"> configure.args \
</span><span class="cx"> --disable-specs \
</span></span></pre></div>
<a id="trunkdportsx11xorglibXawfiles0001darwinFixupvendorShellWidgetClasspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-libXaw/files/0001-darwin-Fixup-vendorShellWidgetClass.patch (144390 => 144391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libXaw/files/0001-darwin-Fixup-vendorShellWidgetClass.patch 2016-01-07 07:33:19 UTC (rev 144390)
+++ trunk/dports/x11/xorg-libXaw/files/0001-darwin-Fixup-vendorShellWidgetClass.patch 2016-01-07 07:33:32 UTC (rev 144391)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-From 9e1b9c93a7d3b7658c629946c7b7e5d1803bbc53 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Wed, 6 Jan 2016 22:21:01 -0800
-Subject: [PATCH] darwin: Fixup vendorShellWidgetClass
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- src/Vendor.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/Vendor.c b/src/Vendor.c
-index b8797f5..be8b899 100644
---- a/src/Vendor.c
-+++ b/src/Vendor.c
-@@ -111,12 +111,20 @@ static XtResource resources[] = {
- *
- ***************************************************************************/
-
--#if defined(__CYGWIN__) || defined(__MINGW32__)
-+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
- /* to fix the EditRes problem because of wrong linker semantics */
- extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */
- extern VendorShellClassRec _XawVendorShellClassRec;
- extern void _XawFixupVendorShell();
-
-+#if defined(__APPLE__)
-+__attribute__((constructor))
-+static void __VendorShellHack(void)
-+{
-+ vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec);
-+ _XawFixupVendorShell();
-+}
-+#else
- int __stdcall
- DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
- {
-@@ -131,6 +139,7 @@ DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
- }
- return 1;
- }
-+#endif
-
- #define vendorShellClassRec _XawVendorShellClassRec
-
-@@ -339,7 +348,7 @@ XawVendorShellClassPartInit(WidgetClass cclass)
- }
- }
-
--#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__)
-+#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
- /* stupid OSF/1 shared libraries have the wrong semantics */
- /* symbols do not get resolved external to the shared library */
- void _XawFixupVendorShell()
---
-2.6.4
-
</del></span></pre></div>
<a id="trunkdportsx11xorglibXawfiles0001darwinRemoveincorrectexportofvendorShellClassRepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-libXaw/files/0001-darwin-Remove-incorrect-export-of-vendorShellClassRe.patch (0 => 144391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-libXaw/files/0001-darwin-Remove-incorrect-export-of-vendorShellClassRe.patch (rev 0)
+++ trunk/dports/x11/xorg-libXaw/files/0001-darwin-Remove-incorrect-export-of-vendorShellClassRe.patch 2016-01-07 07:33:32 UTC (rev 144391)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+From 801fda056d60713488457a77dcffffee8a63fd61 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 6 Jan 2016 22:21:01 -0800
+Subject: [PATCH] darwin: Remove incorrect export of vendorShellClassRec and
+ vendorShellWidgetClass
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ src/Vendor.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/Vendor.c b/src/Vendor.c
+index b8797f5..d14b796 100644
+--- a/src/Vendor.c
++++ b/src/Vendor.c
+@@ -111,12 +111,20 @@ static XtResource resources[] = {
+ *
+ ***************************************************************************/
+
+-#if defined(__CYGWIN__) || defined(__MINGW32__)
++#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
+ /* to fix the EditRes problem because of wrong linker semantics */
+ extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */
+ extern VendorShellClassRec _XawVendorShellClassRec;
+ extern void _XawFixupVendorShell();
+
++#if defined(__APPLE__)
++__attribute__((constructor))
++static void __VendorShellHack(void)
++{
++ vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec);
++ _XawFixupVendorShell();
++}
++#else
+ int __stdcall
+ DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
+ {
+@@ -131,6 +139,7 @@ DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
+ }
+ return 1;
+ }
++#endif
+
+ #define vendorShellClassRec _XawVendorShellClassRec
+
+@@ -195,7 +204,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
+ }
+ };
+
+-#ifndef __UNIXOS2__
++#if !defined(__UNIXOS2__) && !defined(__APPLE__)
+ externaldef(vendorshellwidgetclass) WidgetClass vendorShellWidgetClass =
+ (WidgetClass) (&vendorShellClassRec);
+ #endif
+@@ -339,7 +348,7 @@ XawVendorShellClassPartInit(WidgetClass cclass)
+ }
+ }
+
+-#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__)
++#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
+ /* stupid OSF/1 shared libraries have the wrong semantics */
+ /* symbols do not get resolved external to the shared library */
+ void _XawFixupVendorShell()
+--
+2.6.4
+
</ins></span></pre>
</div>
</div>
</body>
</html>