diff --git a/docs/Building_A_Relocatable_Python_Framework_on_MacOSX.txt b/docs/Building_A_Relocatable_Python_Framework_on_MacOSX.txt index 9cf2f7fa3b..212d05cea3 100644 --- a/docs/Building_A_Relocatable_Python_Framework_on_MacOSX.txt +++ b/docs/Building_A_Relocatable_Python_Framework_on_MacOSX.txt @@ -23,7 +23,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.9 # Pick a location where the relocatable Python framework will be installed -# stay away from /tmp locations since Mac OS X will auto deelete files older +# stay away from /tmp locations since Mac OS X will auto delete files older # than 3 days in /tmp right out from under you export MYDEST=/Users/${USER}/devtools/Frameworks diff --git a/docs/Building_Qt5_From_Source_with_QtWebkit_Added_Back_on_MacOSX.txt b/docs/Building_Qt5_From_Source_with_QtWebkit_Added_Back_on_MacOSX.txt index a2a56a4057..dcc65893d9 100644 --- a/docs/Building_Qt5_From_Source_with_QtWebkit_Added_Back_on_MacOSX.txt +++ b/docs/Building_Qt5_From_Source_with_QtWebkit_Added_Back_on_MacOSX.txt @@ -1,13 +1,13 @@ # Building_Qt5_From_Source_with_QtWebkit_Added_Back_on_MacOSX # IMPORTANT - Instead of building Qt from source as outlined here you can instead -# use stock Qt 5.4.2 or Qt 5.5.1 that you can download +# use stock Qt 5.4.2 or Qt 5.5.1 that you can download a binary installer for # and install from Qt directly. # But in order to use the very latest versions of Qt you will need to add QtWebkit back -# and build from source +# and build from source. This is what Linux distributions are doing too. -# FIRST: make sure you have XCode 6 installed and the Command Line Tools +# FIRST: make sure you have XCode 6 or XCode 7 installed and the Command Line Tools # As of Qt 5.6, QtWebkit was removed from the stock Qt releases. Sigil depends on this # module for both its BookView and Preview windows. We are following the examples of @@ -15,14 +15,16 @@ # Qt distribution. # Here are the steps to building Qt from source with QtWebkit added back -# cd to a location to store your src tree + +# cd to a location to store your src tree then do + export MYQTSRC=`pwd` # clone qtwebkit from git::/code.qt.io/qt/qtwebkit.git git clone git://code.qt.io/qt.qtwebkit.git # download qt-everywhere-opensource-src-5.6.1-1.tar.gz directly from Qt -# from http://download.qt.io/archive/qt/5.6/5.6.1-1/single/ +# From: http://download.qt.io/archive/qt/5.6/5.6.1-1/single/ # and then unpack it tar -zxvf qt-everywhere-opensource-src-5.6.1-1.tar.gz @@ -33,10 +35,10 @@ mkdir qtwebkit cp -R ../qtwebkit/ ./qtwebkit # next on Mac OS X there is a build fix needed for Qt-5.6.1-1 that needs to be added -# grab the patch file from the git Sigil-Ebook/Sifil/docs +# grab the patch file from the git Sigil-Ebook/Sigil/docs patch -p0 < qt_561_osx.patch -# set the correct module version inisde of the newly added qtwebkit directory +# set the correct module version inside of the newly added qtwebkit directory # edit qtwebkit/.qmake.conf and change this line # MODULE_VERSION = 5.7 # to diff --git a/docs/Building_Sigil_On_MacOSX.txt b/docs/Building_Sigil_On_MacOSX.txt index 54f4a764cb..f50206c0b0 100644 --- a/docs/Building_Sigil_On_MacOSX.txt +++ b/docs/Building_Sigil_On_MacOSX.txt @@ -43,7 +43,7 @@ git clone https://github.com/Sigil-Ebook/Sigil.git export PATH=${PATH}:${MYQTHOME}/bin # Make sure the newly created relocatable python framework is found first -# **before** and system version of Python3 +# **before** any system version of Python3 export PATH=${MYDEST}/Python.framework/Versions/3.5/bin:${PATH} @@ -81,7 +81,7 @@ cmake -DPKG_SYSTEM_PYTHON=1 \ make make addframeworks -# In ${MYSIGILREPO}/build/bin you will find a the newly built Sigil.app +# In ${MYSIGILREPO}/build/bin you will find the newly built Sigil.app # To test if the newly bundled python 3 version of Sigil is working properly ypou can do the following: