From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 11 Nov 2017 17:37:16 +0000 (+0100)
Subject: Win installer: update MiKTeX
X-Git-Tag: 2.3.0rc2~268
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d5f15f4a6d58833db570ba332b06c022065d93ad;p=features.git

Win installer: update MiKTeX

- also remove Qt5XML in the installer as it appears not to be used by LyX
- add a note that pdfview is not yet ready for full Unicode support
---

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 224198bc8d..b7b65bc700 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 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..1048bfa0d5 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
 
@@ -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