pidgin/pidgin

Fix some issues with the Windows installer that included it thinking Pidgin was already running
release-2.x.y
2020-06-11, Gary Kramlich
406a0d4d1b40
Parents 051552bb1442
Children df60c1f5d071
Fix some issues with the Windows installer that included it thinking Pidgin was already running
2 files changed, 13 insertions(+), 8 deletions(-)
  • +5 -1
    pidgin/win32/nsis/create_nsis_translations.pl
  • +8 -7
    pidgin/win32/nsis/pidgin-installer.nsi
    • --- a/pidgin/win32/nsis/create_nsis_translations.pl Wed Jun 10 16:15:57 2020 -0500
    +++ b/pidgin/win32/nsis/create_nsis_translations.pl Thu Jun 11 03:44:30 2020 -0500
    @@ -276,7 +276,11 @@
    $gcomprisLanguages .= '
    !macro GCOMPRIS_MACRO_INCLUDE_LANGFILE LANG FILE
    !insertmacro GCOMPRIS_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
    - !include "${FILE}"
    + !if /FileExists "${FILE}.utf8"
    + !include /CHARSET=UTF8 "${FILE}.utf8"
    + !else
    + !include /CHARSET=ACP "${FILE}"
    + !endif
    !insertmacro GCOMPRIS_MACRO_LANGUAGEFILE_END
    !macroend
    ';
    --- a/pidgin/win32/nsis/pidgin-installer.nsi Wed Jun 10 16:15:57 2020 -0500
    +++ b/pidgin/win32/nsis/pidgin-installer.nsi Thu Jun 11 03:44:30 2020 -0500
    @@ -29,6 +29,7 @@
    ShowUninstDetails show
    SetDateSave on
    RequestExecutionLevel highest
    +Unicode true
    ; $name and $INSTDIR are set in .onInit function..
    @@ -418,7 +419,7 @@
    SectionEnd
    !macroend
    SectionGroup $(PIDGINSPELLCHECKSECTIONTITLE) SecSpellCheck
    - !include "pidgin-spellcheck.nsh"
    + !include /CHARSET=ACP "pidgin-spellcheck.nsh"
    SectionGroupEnd
    Section /o $(DEBUGSYMBOLSSECTIONTITLE) SecDebugSymbols
    @@ -980,7 +981,7 @@
    ; Close the Handle (needed if we're retrying)
    IntCmp $R1 0 +2
    System::Call 'kernel32::CloseHandle(i $R1) i .R1'
    - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "pidgin_is_running") i .R1 ?e'
    + System::Call 'kernel32::CreateMutexW(i 0, i 0, t "pidgin_is_running") i .R1 ?e'
    Pop $R0
    IntCmp $R0 0 +3 ;This could check for ERROR_ALREADY_EXISTS(183), but lets just assume
    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(PIDGINISRUNNING) /SD IDCANCEL IDRETRY retry_runcheck
    @@ -1010,7 +1011,7 @@
    ; Close the Handle (needed if we're retrying)
    IntCmp $R1 0 +2
    System::Call 'kernel32::CloseHandle(i $R1) i .R1'
    - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "pidgin_installer_running") i .R1 ?e'
    + System::Call 'kernel32::CreateMutexW(i 0, i 0, t "pidgin_installer_running") i .R1 ?e'
    Pop $R0
    IntCmp $R0 0 +3 ;This could check for ERROR_ALREADY_EXISTS(183), but lets just assume
    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(INSTALLERISRUNNING) /SD IDCANCEL IDRETRY retry_runcheck
    @@ -1301,12 +1302,12 @@
    Pop $R2 ;SHA1sum
    Push $R1
    - SHA1Plugin::FileSum "$R0"
    - Pop $R1
    + ClearErrors
    + Crypto::HashFile "SHA1" "$R0"
    Pop $R0
    - StrCmp "$R1" "0" +4
    - DetailPrint "SHA1Sum calculation error: $R0"
    + IfErrors 0 +4
    + DetailPrint "SHA1Sum calculation error"
    IntOp $R1 0 + 1
    Goto done