<!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>[151837] users/mojca/ports/tex/miktex</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/151837">151837</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-23 03:34:38 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/miktex: further changes, not yet fully functional</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcaportstexmiktexPortfile">users/mojca/ports/tex/miktex/Portfile</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibrariesMiKTeXCoreSessionSessionImplhdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Session-SessionImpl.h.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibrariesMiKTeXCoreUtilsAutoTraceTimehdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Utils-AutoTraceTime.h.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersmojcaportstexmiktexfilesfixlibrariesfirstsh">users/mojca/ports/tex/miktex/files/fix-libraries-first.sh</a></li>
<li><a href="#usersmojcaportstexmiktexfilesfixlibrariessh">users/mojca/ports/tex/miktex/files/fix-libraries.sh</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibraries3rdgsoapsourcegsoapstdsoap2cppdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-3rd-gsoap-source-gsoap-stdsoap2.cpp.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibrariesMiKTeXAppCMakeListstxtdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-App-CMakeLists.txt.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibrariesMiKTeXKPathSeaEmulationStdAfxhdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-StdAfx.h.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibrariesMiKTeXKPathSeaEmulationkpsemucppdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-kpsemu.cpp.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchLibrariesMiKTeXWeb2CEmulationStdAfxhdiff">users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Web2CEmulation-StdAfx.h.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchProgramsConverterstex4htsourcetex4htcdiff">users/mojca/ports/tex/miktex/files/patch-Programs-Converters-tex4ht-source-tex4ht.c.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchProgramsMiKTeXSetupmiktexsetupmiktexsetupcppdiff">users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-Setup-miktexsetup-miktexsetup.cpp.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchProgramsMiKTeXinitexmfinitexmfcppdiff">users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-initexmf-initexmf.cpp.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchProgramsMiKTeXmakexinternalhdiff">users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-makex-internal.h.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchProgramsTeXAndFriendsxetexxetexccdiff">users/mojca/ports/tex/miktex/files/patch-Programs-TeXAndFriends-xetex-xetex.cc.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersmojcaportstexmiktexfilespatchBuildUtilitiesc4pgramydiff">users/mojca/ports/tex/miktex/files/patch-BuildUtilities-c4p-gram.y.diff</a></li>
<li><a href="#usersmojcaportstexmiktexfilespatchCMakeListstxtdiff">users/mojca/ports/tex/miktex/files/patch-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcaportstexmiktexPortfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/tex/miktex/Portfile (151836 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/Portfile 2016-08-23 09:57:55 UTC (rev 151836)
+++ users/mojca/ports/tex/miktex/Portfile 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -4,9 +4,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><ins>+# java
</ins><span class="cx">
</span><span class="cx"> name miktex
</span><del>-version 2.9-2016-05-18
</del><ins>+version 2.9-2016-06-27
</ins><span class="cx"> categories tex
</span><span class="cx"> platforms darwin
</span><span class="cx"> license unknown
</span><span class="lines">@@ -20,8 +21,8 @@
</span><span class="cx"> master_sites http://mirrors.ctan.org/systems/win32/miktex/source/
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e14030b6d16c8032a80ecc86c12eb7eaf6573c7f \
- sha256 9b91e8c2abf6a1e8288d9ec71572855c6aaf1970eca1fafb9416368a1c943c12
</del><ins>+checksums rmd160 a95e1244b4e658889046aede32ad1833681c5ed0 \
+ sha256 c3b1e2b35113d5f7d9d78c827a1d9ff07253e0b4725263e5664e1dc66f00b0b0
</ins><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="lines">@@ -33,11 +34,12 @@
</span><span class="cx"> port:bison \
</span><span class="cx"> port:dos2unix \
</span><span class="cx"> port:flex \
</span><ins>+ port:fop \
</ins><span class="cx"> port:ImageMagick \
</span><del>- port:pandoc \
</del><span class="cx"> port:pkgconfig \
</span><span class="cx"> port:python27 \
</span><del>- port:xsltproc
</del><ins>+ port:libxslt
+ #port:pandoc
</ins><span class="cx"> depends_lib-append port:apr \
</span><span class="cx"> port:apr-util \
</span><span class="cx"> port:botan \
</span><span class="lines">@@ -70,11 +72,11 @@
</span><span class="cx">
</span><span class="cx"> # port:mspack
</span><span class="cx">
</span><del>-patchfiles patch-CMakeLists.txt.diff \
- patch-BuildUtilities-c4p-gram.y.diff \
- patch-Libraries-MiKTeX-Core-Utils-AutoTraceTime.h.diff \
- patch-Libraries-MiKTeX-Core-Session-SessionImpl.h.diff
</del><ins>+#patchfiles \
+# patch-Libraries-MiKTeX-Core-Session-SessionImpl.h.diff
</ins><span class="cx">
</span><ins>+# patch-Libraries-MiKTeX-App-CMakeLists.txt.diff
+
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -DWITH_UI_QT=OFF \
</span><span class="cx"> -DHUNSPELL_LIBRARY=${prefix}/lib/libhunspell-1.3.0.dylib \
</span><span class="lines">@@ -93,3 +95,14 @@
</span><span class="cx"> depends_lib-append port:libcxx
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+# https://sourceforge.net/p/miktex/bugs/2484/
+
+# https://sourceforge.net/p/miktex/bugs/2487/
+
+# https://sourceforge.net/p/miktex/bugs/2491/
+
+# https://sourceforge.net/p/miktex/bugs/2492/
+# - move man to ${prefix/share/
+# - move texmfs to ${prefix}/share/texmfs (but this might be hardcoded somewhere, so not sure if it can be moved easily)
+
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilesfixlibrariesfirstsh"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/fix-libraries-first.sh (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/fix-libraries-first.sh (rev 0)
+++ users/mojca/ports/tex/miktex/files/fix-libraries-first.sh 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+#!/bin/bash
+
+list="app core extractor kpathsea lua52 md5 mspack packagemanager tangle teckit texmf trace util web2c findtexmf"
+
+for la in $list; do
+ for lb in $list; do
+ cmd="install_name_tool -change /opt/local/lib/libMiKTeX209-${la}.1.dylib @executable_path/libMiKTeX209-${la}.1.dylib libMiKTeX209-${lb}.2.9.dylib"
+ echo $cmd
+ $cmd
+ done
+ cmd="install_name_tool -change /opt/local/lib/libMiKTeX209-${la}.1.dylib @executable_path/libMiKTeX209-${la}.1.dylib libMiKTeX209-findtexmf.dylib"
+ echo $cmd
+ $cmd
+done
+for la in $list; do
+ #for lb in initctangle ctangle findtexmf initexmf; do
+ for lb in initexmf; do
+ cmd="install_name_tool -change /opt/local/lib/libMiKTeX209-${la}.1.dylib @executable_path/libMiKTeX209-${la}.1.dylib ./${lb}"
+ #cmd="install_name_tool -change /opt/local/lib/libMiKTeX209-${la}.dylib @executable_path/libMiKTeX209-${la}.dylib ./${lb}"
+ echo $cmd
+ $cmd
+ done
+done
+
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilesfixlibrariessh"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/fix-libraries.sh (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/fix-libraries.sh (rev 0)
+++ users/mojca/ports/tex/miktex/files/fix-libraries.sh 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+#!/bin/bash
+
+list="app core extractor kpathsea lua52 md5 mspack packagemanager tangle teckit texmf trace util web2c"
+
+list_bins="ctangle findtexmf-2.9 initexmf miktex-tangle"
+
+prefix="/opt/local"
+olddir=$PWD
+cd "./$prefix/lib"
+# run this in destroot/opt/local/lib
+for la in $list; do
+ for lb in $list; do
+ cmd="install_name_tool -change @executable_path/libMiKTeX209-${la}.1.dylib ${prefix}/lib/libMiKTeX209-${la}.1.dylib libMiKTeX209-${lb}.2.9.dylib"
+ echo $cmd
+ $cmd
+ done
+done
+for la in $list; do
+ for lb in findtexmf; do
+ cmd="install_name_tool -change @executable_path/libMiKTeX209-${la}.1.dylib ${prefix}/lib/libMiKTeX209-${la}.1.dylib libMiKTeX209-${lb}.dylib"
+ echo $cmd
+ $cmd
+ done
+done
+
+cd $olddir
+cd "./$prefix/bin"
+for la in $list; do
+ for lb in $list_bins; do
+ cmd="install_name_tool -change @executable_path/libMiKTeX209-${la}.1.dylib ${prefix}/lib/libMiKTeX209-${la}.1.dylib ${lb}"
+ echo $cmd
+ $cmd
+ done
+done
+for la in findtexmf; do
+ for lb in $list_bins; do
+ cmd="install_name_tool -change @executable_path/libMiKTeX209-${la}.dylib ${prefix}/lib/libMiKTeX209-${la}.dylib ${lb}"
+ echo $cmd
+ $cmd
+ done
+done
+
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchBuildUtilitiesc4pgramydiff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/tex/miktex/files/patch-BuildUtilities-c4p-gram.y.diff (151836 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-BuildUtilities-c4p-gram.y.diff 2016-08-23 09:57:55 UTC (rev 151836)
+++ users/mojca/ports/tex/miktex/files/patch-BuildUtilities-c4p-gram.y.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- BuildUtilities/c4p/gram.y.orig
-+++ BuildUtilities/c4p/gram.y
-@@ -23,7 +23,7 @@
- #include <cstring>
- #include <cstdlib>
- #include <cctype>
--#include <malloc.h>
-+#include <malloc/malloc.h>
-
- #include "common.h"
-
</del></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/tex/miktex/files/patch-CMakeLists.txt.diff (151836 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-CMakeLists.txt.diff 2016-08-23 09:57:55 UTC (rev 151836)
+++ users/mojca/ports/tex/miktex/files/patch-CMakeLists.txt.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -49,7 +49,7 @@ set(MIKTEX_PRODUCT_NAME "MiKTeX")
-
- if(NOT MSVC)
- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
- endif()
-
- ###############################################################################
-@@ -507,7 +507,6 @@ endif()
- set(required_programs
- cat
- dos2unix
-- pandoc
- sed
- xsltproc
- )
</del></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibraries3rdgsoapsourcegsoapstdsoap2cppdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Libraries-3rd-gsoap-source-gsoap-stdsoap2.cpp.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-3rd-gsoap-source-gsoap-stdsoap2.cpp.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-3rd-gsoap-source-gsoap-stdsoap2.cpp.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2483/
+
+--- Libraries/3rd/gsoap/source/gsoap/stdsoap2.cpp.orig
++++ Libraries/3rd/gsoap/source/gsoap/stdsoap2.cpp
+@@ -5351,7 +5351,7 @@ soap_bind(struct soap *soap, const char *host, int port, int backlog)
+ }
+ #endif
+ #ifdef TCP_FASTOPEN
+- if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, SOL_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int)))
++ if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int)))
+ { /* silently ignore */
+ DBGLOG(TEST, SOAP_MESSAGE(fdebug, "setsockopt TCP_FASTOPEN failed in soap_bind()\n"));
+ }
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibrariesMiKTeXAppCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-App-CMakeLists.txt.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-App-CMakeLists.txt.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-App-CMakeLists.txt.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2484/
+# doesn't work
+
+--- Libraries/MiKTeX/App/CMakeLists.txt.orig
++++ Libraries/MiKTeX/App/CMakeLists.txt
+@@ -22,6 +22,7 @@ set(MIKTEX_CURRENT_FOLDER "${MIKTEX_IDE_MIKTEX_LIBRARIES_FOLDER}/app")
+ include_directories(BEFORE
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++ ${CMAKE_CURRENT_SOURCE_DIR}/../UI/include
+ )
+
+ set(public_include_directories
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibrariesMiKTeXCoreSessionSessionImplhdiff"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Session-SessionImpl.h.diff (151836 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Session-SessionImpl.h.diff 2016-08-23 09:57:55 UTC (rev 151836)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Session-SessionImpl.h.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>---- Libraries/MiKTeX/Core/Session/SessionImpl.h.diff
</del><ins>+--- Libraries/MiKTeX/Core/Session/SessionImpl.h.orig
</ins><span class="cx"> +++ Libraries/MiKTeX/Core/Session/SessionImpl.h
</span><del>-@@ -91,6 +91,17 @@ public:
</del><ins>+@@ -89,6 +89,17 @@ inline bool operator< (const LanguageInfo_ & lhs, const LanguageInfo_ & rhs)
</ins><span class="cx"> }
</span><del>-
- };
</del><ins>+ return lhs.key < rhs.key;
+ }
</ins><span class="cx"> +static bool operator< (const LanguageInfo_ & lhs, const LanguageInfo_ & rhs) {
</span><span class="cx"> + if (lhs.key == "english")
</span><span class="cx"> + {
</span></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibrariesMiKTeXCoreUtilsAutoTraceTimehdiff"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Utils-AutoTraceTime.h.diff (151836 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Utils-AutoTraceTime.h.diff 2016-08-23 09:57:55 UTC (rev 151836)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Core-Utils-AutoTraceTime.h.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2481/
+
</ins><span class="cx"> --- Libraries/MiKTeX/Core/Utils/AutoTraceTime.h.orig
</span><span class="cx"> +++ Libraries/MiKTeX/Core/Utils/AutoTraceTime.h
</span><span class="cx"> @@ -43,7 +43,7 @@ public:
</span></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibrariesMiKTeXKPathSeaEmulationStdAfxhdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-StdAfx.h.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-StdAfx.h.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-StdAfx.h.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2480/
+
+--- Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h.orig
++++ Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
+@@ -23,7 +23,7 @@
+
+ #include <cstdarg>
+ #include <cstdlib>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #if defined(MIKTEX_UNIX)
+ #include <sys/time.h>
+ #endif
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibrariesMiKTeXKPathSeaEmulationkpsemucppdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-kpsemu.cpp.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-kpsemu.cpp.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-KPathSeaEmulation-kpsemu.cpp.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+https://sourceforge.net/p/miktex/patches/10/
+
+--- Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp.orig
++++ Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
+@@ -463,6 +463,12 @@ MIKTEXKPSCEEAPI(int) miktex_xfseeko64(FILE * pfile, MIKTEX_INT64 offset, int whe
+ MIKTEX_FATAL_CRT_ERROR_2("fseeko64", "fileName", lpszFileName);
+ }
+ return 0;
++#elif defined(__APPLE__)
++ if (fseeko(pfile, offset, where) != 0)
++ {
++ MIKTEX_FATAL_CRT_ERROR_2("fseeko", "fileName", lpszFileName);
++ }
++ return 0;
+ #else
+ # error Unimplemented: miktex_xfseeko64()
+ #endif
+@@ -505,6 +511,13 @@ MIKTEXKPSCEEAPI(MIKTEX_INT64) miktex_xftello64(FILE * pfile, const char * lpszFi
+ }
+ return pos;
+
++#elif defined(__APPLE__)
++ MIKTEX_INT64 pos = ftello(pfile);
++ if (pos < 0)
++ {
++ MIKTEX_FATAL_CRT_ERROR_2("ftello", "fileName", lpszFileName);
++ }
++ return pos;
+ #else
+ # error Unimplemented: miktex_xftello64
+ #endif
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchLibrariesMiKTeXWeb2CEmulationStdAfxhdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Web2CEmulation-StdAfx.h.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Web2CEmulation-StdAfx.h.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Libraries-MiKTeX-Web2CEmulation-StdAfx.h.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2480/
+
+--- Libraries/MiKTeX/Web2CEmulation/StdAfx.h.orig
++++ Libraries/MiKTeX/Web2CEmulation/StdAfx.h
+@@ -22,7 +22,7 @@
+ #pragma once
+
+ #include <cstdlib>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #if defined(MIKTEX_UNIX)
+ #include <sys/time.h>
+ #endif
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchProgramsConverterstex4htsourcetex4htcdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Programs-Converters-tex4ht-source-tex4ht.c.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Programs-Converters-tex4ht-source-tex4ht.c.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Programs-Converters-tex4ht-source-tex4ht.c.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2488/
+
+--- Programs/Converters/tex4ht/source/tex4ht.c.orig
++++ Programs/Converters/tex4ht/source/tex4ht.c
+@@ -3996,8 +3996,8 @@ if( (file = f_open(str, flags)) != NULL ){
+
+
+ str[i] = '\0';
+- return subs? search_file_ext( name, str, flags):
+- FALSE;
++ return (subs ? search_file_ext( name, str, flags):
++ NULL);
+ }
+
+
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchProgramsMiKTeXSetupmiktexsetupmiktexsetupcppdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-Setup-miktexsetup-miktexsetup.cpp.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-Setup-miktexsetup-miktexsetup.cpp.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-Setup-miktexsetup-miktexsetup.cpp.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+://sourceforge.net/p/miktex/bugs/2481/
+
+--- Programs/MiKTeX/Setup/miktexsetup/miktexsetup.cpp.orig
++++ Programs/MiKTeX/Setup/miktexsetup/miktexsetup.cpp
+@@ -670,7 +670,7 @@ void Application::Main(int argc, const char ** argv)
+ }
+ else
+ {
+- Error(T_("Unknown/unsupported setup task: %s"), leftovers[0]);
++ Error(T_("Unknown/unsupported setup task: %s"), leftovers[0].c_str());
+ }
+
+ if (optShared)
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchProgramsMiKTeXinitexmfinitexmfcppdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-initexmf-initexmf.cpp.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-initexmf-initexmf.cpp.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-initexmf-initexmf.cpp.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2481/
+
+--- Programs/MiKTeX/initexmf/initexmf.cpp.orig
++++ Programs/MiKTeX/initexmf/initexmf.cpp
+@@ -2739,7 +2739,7 @@ void IniTeXMFApp::MakeMaps(bool force)
+ }
+ if (printOnly)
+ {
+- PrintOnly("mkfntmap %s", arguments.ToString());
++ PrintOnly("mkfntmap %s", arguments.ToString().c_str());
+ }
+ else
+ {
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchProgramsMiKTeXmakexinternalhdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-makex-internal.h.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-makex-internal.h.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Programs-MiKTeX-makex-internal.h.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2480/
+
+--- Programs/MiKTeX/makex/internal.h.orig
++++ Programs/MiKTeX/makex/internal.h
+@@ -40,7 +40,7 @@
+ #include <cstdlib>
+ #include <string>
+
+-#include <malloc.h>
++#include <malloc/malloc.h>
+
+ #include <getopt.h>
+
</ins></span></pre></div>
<a id="usersmojcaportstexmiktexfilespatchProgramsTeXAndFriendsxetexxetexccdiff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/tex/miktex/files/patch-Programs-TeXAndFriends-xetex-xetex.cc.diff (0 => 151837)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/tex/miktex/files/patch-Programs-TeXAndFriends-xetex-xetex.cc.diff (rev 0)
+++ users/mojca/ports/tex/miktex/files/patch-Programs-TeXAndFriends-xetex-xetex.cc.diff 2016-08-23 10:34:38 UTC (rev 151837)
</span><span class="lines">@@ -0,0 +1,141 @@
</span><ins>+https://sourceforge.net/p/miktex/bugs/2490/
+
+This patch belongs to the build tree
+
+--- Programs/TeXAndFriends/xetex/xetex.cc.orig
++++ Programs/TeXAndFriends/xetex/xetex.cc
+@@ -3704,7 +3704,7 @@ copynativeglyphinfo (halfword src, halfword dest)
+ {
+ C4P_integer glyphcount;
+ C4P_PROC_ENTRY (69);
+- if (g_mem[ src + (C4P_integer) 5l ].c4p_P2.ptr != (C4P_integer) nullptr ())
++ if (g_mem[ src + (C4P_integer) 5l ].c4p_P2.ptr != nullptr ())
+ {
+ glyphcount = g_mem[ src + (C4P_integer) 4l ].c4p_P2.qqqq.b3;
+ g_mem[ dest + (C4P_integer) 5l ].c4p_P2.ptr = xmallocchararray (glyphcount * (C4P_integer) 10l);
+@@ -5426,7 +5426,7 @@ flushnodelist (halfword p)
+ case 41l:
+ {
+ {
+- if (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != (C4P_integer) nullptr ())
++ if (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != nullptr ())
+ {
+ libcfree (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr);
+ g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr = nullptr ();
+@@ -13673,7 +13673,7 @@ effectivechar (C4P_boolean errp, internalfontnumber f, quarterword c)
+ C4P_integer c4p_result;
+
+ C4P_PROC_ENTRY (185);
+- if ( (! g_xtxligaturepresent) && (g_fontmapping[ f ] != (C4P_integer) nullptr ()) )
++ if ( (! g_xtxligaturepresent) && (g_fontmapping[ f ] != nullptr ()) )
+ c = applytfmfontmapping (g_fontmapping[ f ], c);
+ g_xtxligaturepresent = false;
+ result = c;
+@@ -19457,7 +19457,7 @@ effectivecharinfo (internalfontnumber f, quarterword c)
+ fourquarters c4p_result;
+
+ C4P_PROC_ENTRY (228);
+- if ( (! g_xtxligaturepresent) && (g_fontmapping[ f ] != (C4P_integer) nullptr ()) )
++ if ( (! g_xtxligaturepresent) && (g_fontmapping[ f ] != nullptr ()) )
+ c = applytfmfontmapping (g_fontmapping[ f ], c);
+ g_xtxligaturepresent = false;
+ if (! g_mltexenabledp)
+@@ -19612,7 +19612,7 @@ newnativecharacter (internalfontnumber f, unicodescalar c)
+ halfword c4p_result;
+
+ C4P_PROC_ENTRY (231);
+- if (g_fontmapping[ f ] != (C4P_integer) 0l)
++ if (g_fontmapping[ f ] != 0l)
+ {
+ if (c > (C4P_integer) 65535l)
+ {
+@@ -19882,7 +19882,7 @@ loadnativefont (halfword u, strnumber nom, strnumber aire, scaled s)
+ C4P_PROC_ENTRY (235);
+ c4p_result = 0l;
+ fontengine = findnativefont (g_nameoffile, s);
+- if (fontengine == (C4P_integer) 0l)
++ if (fontengine == 0l)
+ goto c4p_L30;
+ if (s >= (C4P_integer) 0l)
+ actualsize = s;
+@@ -20177,7 +20177,7 @@ getinputnormalizationstate (void)
+ C4P_integer c4p_result;
+
+ C4P_PROC_ENTRY (238);
+- if (g_eqtb == (C4P_integer) nullptr ())
++ if (g_eqtb == nullptr ())
+ c4p_result = 0l;
+ else
+ c4p_result = g_eqtb[ 8938816l ].c4p_P2.c4p_int;
+@@ -22696,7 +22696,7 @@ hlistout (void)
+ do {
+ g_f = g_mem[ p ].c4p_P2.hh.c4p_P1.c4p_P0.b0;
+ g_c = g_mem[ p ].c4p_P2.hh.c4p_P1.c4p_P0.b1;
+- if ( (p != (C4P_integer) g_memtop - (C4P_integer) 12l) && (g_fontmapping[ g_f ] != (C4P_integer) nullptr ()) )
++ if ( (p != (C4P_integer) g_memtop - (C4P_integer) 12l) && (g_fontmapping[ g_f ] != nullptr ()) )
+ g_c = applytfmfontmapping (g_fontmapping[ g_f ], g_c);
+ if (g_f != (C4P_integer) g_dvif)
+ {
+@@ -23111,7 +23111,7 @@ hlistout (void)
+ {
+ if (g_mem[ p ].c4p_P2.hh.c4p_P1.c4p_P0.b1 == (C4P_integer) 41l)
+ {
+- if ( (g_mem[ p + (C4P_integer) 4l ].c4p_P2.qqqq.b2 > (C4P_integer) 0l) || (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != (C4P_integer) nullptr ()) )
++ if ( (g_mem[ p + (C4P_integer) 4l ].c4p_P2.qqqq.b2 > (C4P_integer) 0l) || (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != nullptr ()) )
+ {
+ {
+ g_dvibuf[ g_dviptr ] = 254l;
+@@ -23143,7 +23143,7 @@ hlistout (void)
+ }
+ else
+ {
+- if (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != (C4P_integer) nullptr ())
++ if (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != nullptr ())
+ {
+ {
+ g_dvibuf[ g_dviptr ] = 253l;
+@@ -24390,7 +24390,7 @@ charpw (halfword p, smallnumber side)
+ goto c4p_L10;
+ if ( ( ( (p) != (C4P_integer) - (C4P_integer) 268435455l && (! (p >= (C4P_integer) g_himemmin) ) && (g_mem[ p ].c4p_P2.hh.c4p_P1.c4p_P0.b0 == (C4P_integer) 8l) && ( (g_mem[ p ].c4p_P2.hh.c4p_P1.c4p_P0.b1 == (C4P_integer) 40l) || (g_mem[ p ].c4p_P2.hh.c4p_P1.c4p_P0.b1 == (C4P_integer) 41l) ) ) ) )
+ {
+- if (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != (C4P_integer) nullptr ())
++ if (g_mem[ p + (C4P_integer) 5l ].c4p_P2.ptr != nullptr ())
+ {
+ f = g_mem[ p + (C4P_integer) 4l ].c4p_P2.qqqq.b1;
+ c4p_result = roundxnoverd (g_fontinfo[ 6l + (C4P_integer) g_parambase[ f ] ].c4p_P2.c4p_int, getnativewordcp (p, side), 1000l);
+@@ -27615,7 +27615,7 @@ makemathaccent (halfword q)
+ if ( (w2 < (C4P_integer) 0l) )
+ {
+ otassemblyptr = getotassemblyptr (f, c, 1l);
+- if (otassemblyptr != (C4P_integer) nullptr ())
++ if (otassemblyptr != nullptr ())
+ {
+ freenode (p, 5l);
+ p = buildopentypeassembly (f, otassemblyptr, w, 1l);
+@@ -27913,7 +27913,7 @@ makeop (halfword q)
+ if ( (h2 < (C4P_integer) 0l) )
+ {
+ otassemblyptr = getotassemblyptr (g_curf, c, 0l);
+- if (otassemblyptr != (C4P_integer) nullptr ())
++ if (otassemblyptr != nullptr ())
+ {
+ freenode (p, 5l);
+ p = buildopentypeassembly (g_curf, otassemblyptr, h1, 0l);
+@@ -43101,7 +43101,7 @@ storefmtfile (void)
+ printnl (66673l);
+ printesc (g_hash[ 2243238l + (C4P_integer) k ].rh);
+ printchar (61l);
+- if ( ( (g_fontarea[ k ] == (C4P_integer) 65535l) || (g_fontarea[ k ] == (C4P_integer) 65534l) ) || (g_fontmapping[ k ] != (C4P_integer) 0l) )
++ if ( ( (g_fontarea[ k ] == (C4P_integer) 65535l) || (g_fontarea[ k ] == (C4P_integer) 65534l) ) || (g_fontmapping[ k ] != 0l) )
+ {
+ printfilename (g_fontname[ k ], 65622l, 65622l);
+ {
+@@ -45394,7 +45394,7 @@ maincontrol (void)
+ }
+
+ c4p_L72:
+- if ( (g_fontmapping[ g_mainf ] != (C4P_integer) 0l) )
++ if ( (g_fontmapping[ g_mainf ] != 0l) )
+ {
+ g_maink = applymapping (g_fontmapping[ g_mainf ], g_nativetext, g_nativelen);
+ g_nativelen = 0l;
</ins></span></pre>
</div>
</div>
</body>
</html>