From 241bf7d58bab1d6c388f45dcf3651a737ce8e9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 11 Nov 2017 18:34:25 +0100 Subject: [PATCH] Win installer: update to Qt 5.9 - also remove Qt5XML in the installer as it appears not to be used by LyX - update to latest MikTeX installer which resolves some problems - add a note that pdfview is not yet ready for full Unicode support --- development/Win32/packaging/installer/ChangeLog.txt | 10 ++++------ .../Win32/packaging/installer/include/filelist.nsh | 2 -- development/Win32/packaging/installer/settings.nsh | 6 +++--- development/Win32/pdfview/pdfview.nsi | 6 +++++- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 224198bc8d..3e8d9b5c70 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,12 +1,10 @@ -Changelog for LyX-230-RC2: -- correct display of installer text for many languages - - -Changelog for LyX-230-RC1: +Changelog for LyX-230-RC1: - installs LyX 2.3.0 RC1 +- correct display of installer text for many languages - fix bug that the BibTeX editor Jabref and the image editor Krita were not detected as 64bit application -- updated to Qt 5.6.3 +- updated to Qt 5.9.2 +- updated to MiKTeX 2.9 build 6520 - updated to ImageMagick 7.0.7-8 - updated to Ghostscript 9.22 - updated thesaurus for Ukrainian diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index 7d5dfd6a97..aede99d763 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -22,7 +22,6 @@ Lists of files to include in the installer ${FILE}Qt5Svg.dll" ${FILE}Qt5Widgets.dll" ${FILE}Qt5WinExtras.dll" - ${FILE}Qt5Xml.dll" !macroend @@ -49,7 +48,6 @@ Lists of files to include in the installer !macro FileListQtPlatforms COMMAND DIRECTORY ${FILE}qminimal.dll" - ${FILE}qoffscreen.dll" ${FILE}qwindows.dll" !macroend diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 8be5129e31..5f36bdcfc1 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,7 +14,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 0 !define APP_VERSION_EMERGENCY "RC-1" # use "1" for an emergency release of LyX otherwise "" !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise "" -!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display @@ -38,7 +38,7 @@ These typically need to be modified for each LyX release !define FILES_LYX "D:\LyXPackage2.3\LyX" !define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015" -!define FILES_QT "C:\Qt\Qt5.6.3\5.6.3\msvc2015" +!define FILES_QT "C:\Qt\Qt5.9.2\5.9.2\msvc2015" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" @@ -52,6 +52,6 @@ These typically need to be modified for each LyX release # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6361.exe" + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe" !endif diff --git a/development/Win32/pdfview/pdfview.nsi b/development/Win32/pdfview/pdfview.nsi index be43eabe2b..b8c5b1a0fa 100644 --- a/development/Win32/pdfview/pdfview.nsi +++ b/development/Win32/pdfview/pdfview.nsi @@ -1,4 +1,4 @@ -/* +/* Windows PDF view helper Author: Uwe Stöhr and Joost Verburg @@ -10,6 +10,10 @@ but works around the file locking problems of Adobe Reader and Acrobat. */ +# FIXME +#Unicode true +#doesn't work with the Uniode system.dll of NSIS 3.0.2 + !include LogicLib.nsh !include FileFunc.nsh