From bf4e6c776783dc9b59510e84ee74104d25877b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Fri, 12 Feb 2016 02:52:36 +0100
Subject: [PATCH] Win installer: several fixes

- fix broken weblinks
- remove unused includes
---
 .../installer/include/declarations.nsh        |  7 +------
 .../packaging/installer/include/init.nsh      | 20 ++-----------------
 .../packaging/installer/include/nsis.nsh      | 10 ----------
 .../packaging/installer/include/variables.nsh |  2 --
 .../packaging/installer/setup/configure.nsh   |  6 +++---
 5 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 9be495351d..6657ffc4cb 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -57,7 +57,7 @@ Configuration of LyX installer
 !define APP_WEBPAGE_INFO "${APP_NAME} Website"
 !define APP_WIKI "http://wiki.lyx.org"
 !define APP_WIKI_INFO "${APP_NAME} Wiki"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2014 by the LyX Team"
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2016 by the LyX Team"
 
 !define APP_RUN "bin\lyx.exe"
 !define BIN_LYX "lyx.exe"
@@ -101,8 +101,3 @@ Configuration of LyX installer
 
 !define BIN_LATEX "latex.exe"
 !define BIN_BIBTEXEDITOR "JabRef.exe"
-
-#--------------------------------
-# Custom NSIS plug-ins
-
-!addplugindir "${FILES_NSISPLUGINS}"
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index f4ceacbfa2..11415db27c 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -583,19 +583,6 @@ SectionGroupEnd
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
-#--------------------------------
-# Installer initialization
-
-!macro PRINTER_INIT
-
-  ${If} ${AtLeastWinVista}
-    StrCpy $PrinterConf "printui.exe"
-  ${Else}
-    StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry"
-  ${EndIf}
-
-!macroend
-
 # .onInit must be here after the section definition because we have to set
 # the selection states of the dictionary sections
 Function .onInit
@@ -631,10 +618,10 @@ Function .onInit
   # Abort
   #${endif}
   
-  # read the use and computer name
+  # read the user and computer name
   ReadRegStr $ComputerName HKLM "System\CurrentControlSet\Control\ComputerName\ActiveComputerName" "ComputerName"
   System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
-  StrCpy $UserName $0  
+  StrCpy $UserName $0
   
   !insertmacro MULTIUSER_INIT
   
@@ -702,8 +689,6 @@ Function .onInit
    Abort
   ${endif}
 
-  !insertmacro PRINTER_INIT
-  
   # this can be reset to "true" in section SecDesktop
   StrCpy $CreateDesktopIcon "false"
   StrCpy $CreateFileAssociations "false"
@@ -1412,7 +1397,6 @@ FunctionEnd
 # this function is called at first after starting the uninstaller
 Function un.onInit
 
-  !insertmacro PRINTER_INIT
   !insertmacro MULTIUSER_UNINIT
 
   # Check that LyX is not currently running
diff --git a/development/Win32/packaging/installer/include/nsis.nsh b/development/Win32/packaging/installer/include/nsis.nsh
index 0a6585d490..5e6b513f35 100644
--- a/development/Win32/packaging/installer/include/nsis.nsh
+++ b/development/Win32/packaging/installer/include/nsis.nsh
@@ -26,14 +26,10 @@ Configuration of standard NSIS header files
 
 !include MUI2.nsh
 !include LogicLib.nsh
-!include StrFunc.nsh
-!include FileFunc.nsh
-!include WordFunc.nsh
 !include Sections.nsh
 !include WinVer.nsh
 !include LangFile.nsh
 !include MultiUser.nsh
-!include nsDialogs.nsh
 !include InstallOptions.nsh
 !include x64.nsh
 
@@ -50,9 +46,3 @@ Configuration of standard NSIS header files
 
 # Functions to download spell-checker and thesaurus dictionaries
 !include include\dictionaries.nsh
-
-#--------------------------------
-# Include standard functions
-
-!insertmacro RefreshShellIcons
-!insertmacro WordFind2X
diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh
index 4a263c3957..0a9d64b608 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -57,5 +57,3 @@ Var UserList
 Var UserName
 
 Var LangName
-
-Var PrinterConf
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index ccf8b3a049..cd5c4fa81d 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -47,10 +47,10 @@ Section -InstallData
   WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx,0"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "http://www.lyx.org/"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "http://www.lyx.org/about/"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "http://www.lyx.org/AboutLyX"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "LyX Team"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "HelpLink" "http://www.lyx.org/internet/mailing.php"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "HelpLink" "http://www.lyx.org/MailingLists"
   WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoModify" 0x00000001
   WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoRepair" 0x00000001
   WriteRegStr SHCTX ${APP_UNINST_KEY} "StartMenu" "$SMPROGRAMS\$StartmenuFolder"