From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Tue, 21 Nov 2017 00:10:16 +0000 (+0100)
Subject: Win installer: add two more required packages and correct a word
X-Git-Tag: 2.2.4~48
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=363484a83f04e2d447bb36a4035d4e5666d76017;p=features.git

Win installer: add two more required packages and correct a word

- vntex is necessary for Vietnamese, greek-fontenc for Greek
- use correct term for Farsi
---

diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt
index 69e3e5d4ee..552a2d857e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -83,6 +83,7 @@ filehook
 footmisc
 forest
 framed
+greek-fontenc
 greek-inputenc
 harvard
 hyphenat
@@ -125,6 +126,7 @@ ulem
 undertilde
 unicode-math
 url
+vntex
 wallpaper
 wrapfig
 xargs
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index d43b4ef6e8..b85e11593d 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -212,7 +212,7 @@ Section /o "Euskara" SecDBasque
  AddSize 4850
 SectionEnd
 
-Section /o "Farsi" SecDFarsi
+Section /o "فارسی" SecDFarsi
  StrCpy $DictCodes "fa_IR,$DictCodes"
  AddSize 6710
 SectionEnd
@@ -603,14 +603,15 @@ Function .onInit
     Quit
   ${endif}
   
-  # fixme
+  # Fixme: the Unicode version of FindProcDLL::FindProc
+  # reports always that it is already running
   # check that the installer is not currently running
-  FindProcDLL::FindProc "${BundleExeFile}"
-  ${if} $R0 == "1"
-   MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-   Abort
-  ${endif}
-  FindProcDLL::FindProc "${ExeFile}"
+  #FindProcDLL::FindProc "${BundleExeFile}"
+  #${if} $R0 == "1"
+  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+  # Abort
+  #${endif}
+  #FindProcDLL::FindProc "${ExeFile}"
   #${if} $R0 == "1"
   # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
   # Abort