pidgin/pidgin

Fix the downloading of dictionaries in the windows installer
release-2.x.y
2022-03-04, Gary Kramlich
17237faf35cb
Parents 79900d84f4bf
Children acd1360af5cb
Fix the downloading of dictionaries in the windows installer

Testing Done:
* Installed en_US and some other dictionaries with both installers.
* Verified they were installed properly
* Verified the English dictionary worked.

Reviewed at https://reviews.imfreedom.org/r/1303/
--- a/Makefile.mingw Thu Jan 27 20:37:21 2022 -0600
+++ b/Makefile.mingw Fri Mar 04 00:08:27 2022 -0600
@@ -8,6 +8,8 @@
PIDGIN_TREE_TOP := .
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+DICTIONARY_TIMESTAMP := 20220215-003057
+
# Generate a X.X.X.X version for the installer file versioning header
# The last digit will be 99 for a final release, 0 for dev or unknown, or the beta number
PIDGIN_PRODUCT_VERSION = $(shell \
@@ -129,15 +131,13 @@
| LC_ALL=C sort | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
> pidgin/win32/nsis/pidgin-translations.nsh
#Convert the available.lst lines to "!insertmacro SPELLCHECK_SECTION lang lang_name lang_file"
- sed -e "/^#/d" -e "s/^[^,]\{1,\},[^,]\{1,\},/\"/" \
- -e "s/,/\"\ \"/" -e "s/,/\"\ \"/" -e "s/[\ \t]*$$/\"/" \
- -e "s/^/\!insertmacro\ SPELLCHECK_SECTION\ /" \
+ sed -e "/^#/d" -e "s/,/\ /" -e "s/^/\!insertmacro\ SPELLCHECK_SECTION\ /" \
pidgin/win32/nsis/available.lst \
> pidgin/win32/nsis/pidgin-spellcheck.nsh
#Convert the lines to "!insertmacro CHECK_SPELLCHECK_SECTION lang"
iconv -f latin1 -t utf-8 pidgin/win32/nsis/pidgin-spellcheck.nsh | \
sed -e "s/SPELLCHECK_SECTION/CHECK_SPELLCHECK_SECTION/" \
- -e "s/ \"[^\"]*\"\ \"[^\"]*\"[\t\ ]*$$//" | \
+ -e "s/ \"[^\"]*\"[\t\ ]*$$//" | \
iconv -f utf-8 -t latin1 \
> pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
#Generate the Installer translations
@@ -163,7 +163,8 @@
$(eval $@_GTK_SHA1SUM := $(shell sha1sum pidgin/win32/nsis/gtk-runtime-$(GTK_INSTALL_VERSION).zip | sed -e "s/\ .*$$//"))
$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" \
-DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
- -DDEBUG_SYMBOLS_SHA1SUM="$($@_DEBUG_SYMBOLS_SHA1SUM)" -DGTK_SHA1SUM="$($@_GTK_SHA1SUM)"\
+ -DDEBUG_SYMBOLS_SHA1SUM="$($@_DEBUG_SYMBOLS_SHA1SUM)" -DGTK_SHA1SUM="$($@_GTK_SHA1SUM)" \
+ -DDICTIONARY_TIMESTAMP="$(DICTIONARY_TIMESTAMP)" \
pidgin/win32/nsis/pidgin-installer.nsi
$(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe, "Pidgin Installer")
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
@@ -172,7 +173,7 @@
installer_offline: generate_installer_includes
$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" \
-DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
- -DOFFLINE_INSTALLER \
+ -DDICTIONARY_TIMESTAMP="$(DICTIONARY_TIMESTAMP)" -DOFFLINE_INSTALLER \
pidgin/win32/nsis/pidgin-installer.nsi
$(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe, "Pidgin Installer")
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/nsis/README.md Fri Mar 04 00:08:27 2022 -0600
@@ -0,0 +1,20 @@
+This directory contains all of the stuff to create our nsis installer. This
+file is meant to document what they all do, but we're still determining some of