<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dc9d18ce037c8bb009471ed0eabcaa5a535eee96">https://github.com/macports/macports-ports/commit/dc9d18ce037c8bb009471ed0eabcaa5a535eee96</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dc9d18c sigil: Update to 0.9.8
</span>dc9d18c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dc9d18ce037c8bb009471ed0eabcaa5a535eee96
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Nov 19 13:04:18 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> sigil: Update to 0.9.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/48160
</span>---
editors/sigil/Portfile | 54 +++++++++------
editors/sigil/files/patch-newboost.diff | 116 --------------------------------
editors/sigil/files/pcre.patch | 35 ++++++++++
3 files changed, 67 insertions(+), 138 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/Portfile b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5552916..1628fb9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Sigil-Ebook Sigil 0.9.8
</span> name sigil
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts tidy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> platforms darwin
categories editors
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,36 +19,46 @@ description Sigil, the ePub editor
</span> long_description Sigil is a multi-platform WYSIWYG ebook editor. It is \
designed to edit books in ePub format
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://code.google.com/p/sigil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites googlecode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span> distname Sigil-${version}-Code
use_zip yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5c41cf2025c696c2cb77a4d266f749aa1856775d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 02b95d3d1d5ad8a186212c6c60ae76fa17a98da83a748965db9546ff51903308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ac7732c091c8385de8e5c3287344869e936415b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19807795
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hunspell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xercesc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 3.5 is the only version of Python Sigil's CMakeLists.txt is looking for.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. ""} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:hunspell \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:minizip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-chardet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-cssselect \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-cssutils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-html5lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-lxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-Pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-regex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-six \
</span> port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${build.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles pcre.patch
</span>
conflicts_build libzip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix build against new boost versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-newboost.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSYSTEM_LIBS_REQUIRED=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SYSTEM_LIBS=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target Sigil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin:$env(PATH)
</span>
destroot {
copy ${destroot.dir}/bin/Sigil.app ${destroot}${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/files/patch-newboost.diff b/editors/sigil/files/patch-newboost.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf783e7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/sigil/files/patch-newboost.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,116 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/BoostParts/boost/bind.hpp src/BoostParts/boost/bind.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e1eb386..3544ea3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/BoostParts/boost/bind.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/BoostParts/boost/bind.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // See http://www.boost.org/libs/bind/bind.html for documentation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // #ifndef BOOST_BIND_HPP_INCLUDED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/FlightCrew/stdafx.h src/FlightCrew/stdafx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a7c90a3..23c7efa 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/FlightCrew/stdafx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/FlightCrew/stdafx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <xercesc/util/PlatformUtils.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <xercesc/parsers/XercesDOMParser.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/tuple/tuple.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/lambda/lambda.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/thread.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/format.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/BookManipulation/Headings.cpp src/Sigil/BookManipulation/Headings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bf098a4..8fbe78b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/BookManipulation/Headings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/BookManipulation/Headings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/tuple/tuple.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtCore/QtCore>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/BookManipulation/XhtmlDoc.cpp src/Sigil/BookManipulation/XhtmlDoc.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 069b5c0..5b43f9a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/BookManipulation/XhtmlDoc.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/BookManipulation/XhtmlDoc.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/scoped_ptr.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/shared_ptr.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <xercesc/framework/MemBufInputSource.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/Importers/ImportHTML.cpp src/Sigil/Importers/ImportHTML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 73620c3..8890fe8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/Importers/ImportHTML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/Importers/ImportHTML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/tuple/tuple.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtCore/QtCore>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/Misc/SearchOperations.cpp src/Sigil/Misc/SearchOperations.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 363a519..1ecca9d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/Misc/SearchOperations.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/Misc/SearchOperations.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/tuple/tuple.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/SourceUpdates/AnchorUpdates.cpp src/Sigil/SourceUpdates/AnchorUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 818a996..8ab31c2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/SourceUpdates/AnchorUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/SourceUpdates/AnchorUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/shared_ptr.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/tuple/tuple.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/SourceUpdates/LinkUpdates.cpp src/Sigil/SourceUpdates/LinkUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6176725..b5d5c3d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/SourceUpdates/LinkUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/SourceUpdates/LinkUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtCore/QtCore>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtCore/QString>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/Sigil/SourceUpdates/UniversalUpdates.cpp src/Sigil/SourceUpdates/UniversalUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 367b0ac..8500806 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Sigil/SourceUpdates/UniversalUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Sigil/SourceUpdates/UniversalUpdates.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <boost/bind/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <boost/bind.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/shared_ptr.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/tuple/tuple.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/files/pcre.patch b/editors/sigil/files/pcre.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f8eb997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/sigil/files/pcre.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Why shouldn't Macs be allowed to use the "system" (MacPorts) copy of PCRE?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3rdparty/CMakeLists.txt.orig 2017-01-04 10:45:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 3rdparty/CMakeLists.txt 2017-11-19 12:29:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Using System Hunspell")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( NOT USE_SYSTEM_LIBS OR NOT PCRE_FOUND OR APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if( NOT USE_SYSTEM_LIBS OR NOT PCRE_FOUND )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Using Bundled PCRE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,8 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (SYSTEM_LIBS_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NOT ZLIB_FOUND OR NOT MINIZIP_FOUND OR NOT HUNSPELL_FOUND OR (NOT APPLE AND NOT PCRE_FOUND))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if (NOT ZLIB_FOUND OR NOT MINIZIP_FOUND OR (NOT APPLE AND NOT PCRE_FOUND))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (NOT ZLIB_FOUND OR NOT MINIZIP_FOUND OR NOT HUNSPELL_FOUND OR NOT PCRE_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(FATAL_ERROR "Could not find all required system libraries...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-03-21 14:01:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-11-19 12:36:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,9 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package( PkgConfig )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package( MiniZip )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules( HUNSPELL hunspell )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( NOT APPLE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg_check_modules( PCRE libpcre16 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_check_modules( PCRE libpcre16 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( WIN32 OR APPLE )
</span></pre><pre style='margin:0'>
</pre>