From ae76c030d38aedd95690d1569903e3eb6122945f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 18 Feb 2018 06:16:22 +0100 Subject: [PATCH] Win installer: backport recent changes for LyX 2.3.0 --- .../Win32/packaging/installer/ChangeLog.txt | 13 +++++- .../packaging/installer/DictionaryMirrors.txt | 41 ++++++++----------- .../installer/HunspellDictionaryNames.txt | 4 +- .../Win32/packaging/installer/Packages.txt | 6 +++ .../installer/ThesaurusDictionaryNames.txt | 2 + .../installer/include/dictionaries.nsh | 14 +++---- .../packaging/installer/include/init.nsh | 24 ++++++++--- .../Win32/packaging/installer/settings.nsh | 4 +- .../packaging/installer/setup/configure.nsh | 6 +-- 9 files changed, 69 insertions(+), 45 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 0a276cf21b..61cd73d4d6 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,5 +1,16 @@ -Changelog for LyX-230-RC2: +Changelog for LyX-230-1: +- installs LyX 2.3.0 +- fix installation of Arabic spell checker +- updated to MiKTeX 2.9 build 6615 +- new thesaurus for Arabic +- updated thesaurus for Ukrainian +- updated spell checker dictionaries for Arabic, Breton and Ukrainian + + +Changelog for LyX-230-RC2: - installs LyX 2.3.0 RC2 +- updated to Qt 5.9.4 +- updated to ImageMagick 7.0.7-22 Changelog for LyX-230-RC1: diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt b/development/Win32/packaging/installer/DictionaryMirrors.txt index 434ea15c65..99a459087e 100644 --- a/development/Win32/packaging/installer/DictionaryMirrors.txt +++ b/development/Win32/packaging/installer/DictionaryMirrors.txt @@ -1,29 +1,22 @@ -dfn +astuteinternet +ayera +cfhcable +cytranet +excellmedia freefr -cznic -garr -optimate -kaz -kent -heanet -hivelocity -ignum -internode iweb jaist -netcologne -switch +kent +liquidtelecom nchc -ncu -skylink -tcpdiag -tenet -ufpr -waia -colocrossing -citylan -aarnet +netcologne +netix +netcologne +newcontinuum +phoenixnap +razaoinfo superb-dca2 -superb-dca3 -softlayer-ams -softlayer-dal +superb-sea2 +ufpr +versaweb +vorboss diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt index ff7b1039b8..817adc9472 100644 --- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt +++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt @@ -1,7 +1,7 @@ af_ZA.aff af_ZA.dic -ar_DZ.aff -ar_DZ.dic +ar_SA.aff +ar_SA.dic be_BY.aff be_BY.dic bg_BG.aff 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/ThesaurusDictionaryNames.txt b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt index 6d19dfa053..27e248f6e3 100644 --- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt +++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt @@ -1,3 +1,5 @@ +th_ar_SA_v2.dat +th_ar_SA_v2.idx th_bg_BG_v2.dat th_bg_BG_v2.idx th_ca_ES_v2.dat diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh index 8119a06eae..415b19cad9 100644 --- a/development/Win32/packaging/installer/include/dictionaries.nsh +++ b/development/Win32/packaging/installer/include/dictionaries.nsh @@ -43,8 +43,8 @@ Function FindDictionaries # read out the possible thesaurus filenames from the file FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r - ${for} $5 1 27 - # the file has 54 lines, but we only need to check for one of the 2 thesaurus files per language + ${for} $5 1 28 + # the file has 56 lines, but we only need to check for one of the 2 thesaurus files per language # therefore check only for every second line FileRead $R5 $String # $String is now the dictionary name FileRead $R5 $String # $String is now the dictionary name @@ -77,11 +77,11 @@ Function DownloadHunspellDictionaries # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt" FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r - ${For} $4 1 29 # there are 29 mirrors in the file + ${For} $4 1 22 # there are 22 mirrors in the file FileRead $R4 $Search # $Search is now the mirror StrCpy $Search $Search -2 # delete the linebreak characters at the end Push $R0 - inetc::get /TIMEOUT=5000 "http://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END + inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END Pop $R0 ${if} $R0 == "OK" ${ExitFor} @@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries # read out the locations from the file FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r - ${For} $5 1 54 # the file has 52 lines + ${For} $5 1 56 # the file has 56 lines FileRead $R5 $String # $String is now the thesaurus name StrCpy $R3 $String 5 3 # $R3 is now the thesaurus language code @@ -123,11 +123,11 @@ Function DownloadThesaurusDictionaries # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt" FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r - ${For} $4 1 29 # there are 29 mirrors in the file + ${For} $4 1 22 # there are 22 mirrors in the file FileRead $R4 $Search # $Search is now the mirror StrCpy $Search $Search -2 # delete the linebreak characters at the end Push $R0 - inetc::get /TIMEOUT=5000 "http://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END + inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END Pop $R0 ${if} $R0 == "OK" ${ExitFor} diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 55f76445b6..85e1350ff0 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -73,8 +73,8 @@ Section /o "Afrikaans" SecDAfrikaans SectionEnd Section /o "العربية" SecDArabic - StrCpy $DictCodes "ar_DZ,$DictCodes" - AddSize 2500 + StrCpy $DictCodes "ar_SA,$DictCodes" + AddSize 7304 SectionEnd Section /o "հայերեն" SecDArmenian @@ -99,7 +99,7 @@ SectionEnd Section /o "Brezhoneg" SecDBreton StrCpy $DictCodes "br_FR,$DictCodes" - AddSize 5510 + AddSize 5556 SectionEnd Section /o "български" SecDBulgarian @@ -426,7 +426,7 @@ SectionEnd Section /o "Українська" SecDUkrainian StrCpy $DictCodes "uk_UA,$DictCodes" - AddSize 5555 + AddSize 6375 SectionEnd Section /o "اردو" SecDUrdu @@ -444,6 +444,11 @@ SectionGroupEnd SectionGroup "$(SecThesaurus)" SecThesaurus +Section /o "العربية" SecTArabic + StrCpy $ThesCodes "ar_SA,$ThesCodes" + AddSize 799 +SectionEnd + Section /o "български" SecTBulgarian StrCpy $ThesCodes "bg_BG,$ThesCodes" AddSize 3020 @@ -726,7 +731,7 @@ Function .onInit SectionSetFlags ${SecDAfrikaans} $0 SectionSetSize ${SecDAfrikaans} 0 ${endif} - StrCpy $Search "ar_DZ" + StrCpy $Search "ar_SA" Call StrPoint ${if} $Pointer != "-1" IntOp $0 ${SF_SELECTED} | ${SF_RO} @@ -1228,8 +1233,15 @@ Function .onInit # select sections of already installed thesaurus dictionaries, make them read-only # and set the necessary size to 0 bytes StrCpy $String $FoundThes - StrCpy $Search "bg_BG" + StrCpy $Search "ar_SA" Call StrPoint # function from LyXUtils.nsh + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTArabic} $0 + SectionSetSize ${SecTArabic} 0 + ${endif} + StrCpy $Search "bg_BG" + Call StrPoint ${if} $Pointer != "-1" IntOp $0 ${SF_SELECTED} | ${SF_RO} SectionSetFlags ${SecTBulgarian} $0 diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index ff8029fa1e..0d94fc7fc7 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -45,13 +45,13 @@ 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 80585073a2..3de31b3e97 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -245,14 +245,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} -- 2.39.5