LyXConfigureOptions="${LyXConfigureOptions} --disable-stdlib-debug"
AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
-Qt4ConfigureOptions="${Qt4ConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
+Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
case "${Qt4Version}:${Qt4API}" in
4.6*:-carbon)
;;
+5.0*)
+ Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip"
+ Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-javascript-jit -no-pkg-config"
+ Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
+ ;;
*)
Qt4ConfigureOptions="${Qt4ConfigureOptions} ${Qt4API}"
;;
aspell_dictionaries="no"
hunspell_dictionaries="yes"
-gettext_deployment="yes"
+gettext_deployment="no"
aspell_deployment="yes"
hunspell_deployment="yes"
thesaurus_deployment="yes"
exit 0
}
+NCPU=$(sysctl -n hw.ncpu)
+NCPU=$((NCPU / 2))
+if [ $NCPU -gt 1 ]; then
+ MAKEJOBS=-j${NCPU}
+fi
+
while [ $# -gt 0 ]; do
case "${1}" in
--with-qt4-frameworks=*)
if [ "${configure_qt4_frameworks}" != "yes" ]; then
QtInstallDir=${QTDIR:-"/opt/qt4"}
fi
-QtFrameworkVersion="4"
ARCH_LIST=${ARCH_LIST:-"ppc i386"}
# ---------------------------------
# don't change order here...
-QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+case "${Qt4Version}" in
+5*)
+ QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+ QtFrameworkVersion="5"
+ ;;
+*)
+ QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+ QtFrameworkVersion="4"
+ ;;
+esac
DMGNAME="${LyxBase}"
DMGSIZE="550m"
esac
MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+# pkg-config is not usable with this script
+export PKG_CONFIG=""
+
# These variables define the identifiers of the
# system (both Intel and PowerPC) to compile for.
# (Note: darwin8 is 10.4; darwin9 is 10.5.)
echo configure options:
echo ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
echo yes | "${Qt4SourceDir}"/configure ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
- make && make install
+ make ${MAKEJOBS} && make install
)
cd "${QtInstallDir}" && (
mkdir -p include
export QT4_CORE_LIBS="-framework QtCore"
export QT4_FRONTEND_CFLAGS="-FQtGui"
export QT4_FRONTEND_LIBS="-framework QtGui"
- export PKG_CONFIG=""
CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtCore.framework/Headers"
CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtGui.framework/Headers"
fi
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
${LyXConfigureOptions}\
--enable-build-type=rel && \
- make -j2 && make install${strip}
+ make ${MAKEJOBS} && make install${strip}
for file in ${LYX_FILE_LIST} ; do
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
mv "${LYX_BUNDLE_PATH}/${file}"\
LYX_Y_POSITION=$Y_POSITION
APP_X_POSITION=$((3 * X_BOUNDS / 4))
APP_Y_POSITION=$Y_POSITION
+ WITH_DOCUMENTS=$(test -d "${1}/Documents" && echo true || echo false)
osascript <<-EOF
tell application "Finder"
set f to POSIX file ("${1}" as string) as alias
delay 1 -- sync
set icon size of the icon view options of container window to 64
set arrangement of the icon view options of container window to not arranged
- set position of item "Documents" to {$LYX_X_POSITION,0}
+ if ${WITH_DOCUMENTS} then
+ set position of item "Documents" to {$LYX_X_POSITION,0}
+ end if
set position of item "${LyxName}.app" to {$LYX_X_POSITION,$LYX_Y_POSITION}
set position of item "Applications" to {$APP_X_POSITION,$APP_Y_POSITION}
set background picture of the icon view options\
- of container window to file "background.png" of folder "Pictures"
+ of container window to file "background.png" of folder "Pictures"
set the bounds of the container window to {0, 0, $X_BOUNDS, $Y_BOUNDS}
update without registering applications
delay 5 -- sync