From fd0236414fb750b9cfecfe42118602f93b22b487 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 30 Jun 2016 02:52:26 +0200 Subject: [PATCH] Win installer: prepare for next release - MiKTeX fixed some issues that might have caused the problems users had with 64bit MiKTeX - the latest MSVC 2015 update fixed potential buffer overflows in compiled programs --- development/Win32/packaging/installer/ChangeLog.txt | 9 ++++++++- development/Win32/packaging/installer/settings.nsh | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index f512d25e2c..9004980dd5 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,11 @@ -Changelog for LyX-220-3: +Changelog for LyX-220-4: +- recompiled LyX using MSVC 2015 update 3 +- updated to MiKTeX 2.9 build 6022 +- updated to Imagemagick 6.9.x + + + +Changelog for LyX-220-3: - updated to Qt 5.6.1 - updated to MiKTeX 2.9 build 5997 - updated to JabRef 3.4 diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 6553c33605..09e58b1367 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 "" # 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 @@ -57,6 +57,6 @@ These typically need to be modified for each LyX release !if ${SETUPTYPE} == BUNDLE !define JabRefInstall "external\JabRef_windows_3_4.exe" !define SIZE_JABREF 25700 # size in KB - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5997.exe" + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe" !endif -- 2.39.5