From 7879fadfc07430a6c5fcd7f7b6d5a4f28759d39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Sun, 18 Feb 2018 06:13:16 +0100
Subject: [PATCH] Win installer: MiKTeX has a new maintenance program

- therefore the command line parameters changed
- all babel packages must be required
- use another default mirror that is hopefully not down 2 hours every day
---
 development/Win32/packaging/installer/ChangeLog.txt       | 6 ++++++
 development/Win32/packaging/installer/Packages.txt        | 6 ++++++
 development/Win32/packaging/installer/settings.nsh        | 4 ++--
 development/Win32/packaging/installer/setup/configure.nsh | 6 +++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 096b2dcb80..6c5243819a 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -2,9 +2,15 @@
 - installs LyX 2.2.4
 - new Russian translation of the installer messages
 - fix installation of Arabic spell checker
+- LyX will work under Windows Vista but is no longer supported
+- updated to MiKTeX 2.9 build 6615
+- updated to ImageMagick 7.0.7-22
+- updated to Qt 5.9.4
 - new thesaurus for Arabic
 - updated thesaurus for Ukrainian
 - updated spell checker dictionaries for Arabic, Breton and Ukrainian
+  (To benefit from them you must uninstall an already installed LyX 2.2.x and
+   then use this installer.)
 
 
 Changelog for LyX-223-2:
diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt
index 552a2d857e..3ba3f1e71b 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
 l3experimental
 ctablestack
 babel-albanian
+babel-azerbaijani
 babel-basque
 babel-belarusian
 babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
 babel-czech
 babel-danish
 babel-dutch
+babel-english
 babel-esperanto
 babel-estonian
 babel-finnish
+babel-french
 babel-friulan
 babel-galician
 babel-georgian
+babel-german
 babel-greek
 babel-hebrew
 babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
 babel-latin
 babel-latvian
 babel-macedonian
+babel-malay
 babel-norsk
 babel-piedmontese
 babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
 babel-slovak
 babel-slovenian
 babel-sorbian
+babel-spanish
 babel-swedish
 babel-thai
 babel-turkish
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 4c07025e2d..96e3aeb7e4 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -45,12 +45,12 @@ These typically need to be modified for each LyX release
 #--------------------------------
 # MiKTeX and JabRef
 
-!define MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
+!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 
 !define MiKTeXDeliveredVersion "2.9"
 !define ImageMagickVersion "7.0.7"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
 !endif
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 7a4aa7a983..f96b033169 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -247,14 +247,14 @@ Section -ConfigureScript
     # call the non-admin version
     # at first we need to synchronize the package database
     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-    nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"'
+    nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
    ${else}
     ${if} $MiKTeXUser != "HKCU" # call the admin version
      nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--update-db"'
-     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"'
+     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
     ${else}
      nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"'
+     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"'
     ${endif}
    ${endif}
   ${endif}