[Commits] [SCM] claws-win32-installer branch, master, updated. 4.2.0-2-3-g9b9971f
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon May 27 08:53:33 UTC 2024
The branch, master has been updated
via 9b9971f5ca3acec0c1bef92745304fe7ac12e1e3 (commit)
from 9985318e6e146ac6d231d5c552b73837e9664eb4 (commit)
Summary of changes:
packages/packages.current | 2 +-
patches/enchant/01-fix-relocation.patch | 29 +++++++++++++----------------
patches/enchant/02-free-library-name.patch | 4 ++--
patches/enchant/03-no-doc.diff | 24 ++++++++++++++++++------
src/sections-installer.nsi | 6 +++---
src/sections-uninstaller.nsi | 18 +++++++++---------
6 files changed, 46 insertions(+), 37 deletions(-)
- Log -----------------------------------------------------------------
commit 9b9971f5ca3acec0c1bef92745304fe7ac12e1e3
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun May 5 19:15:07 2024 -0700
Update to enchant-2.7.3
diff --git a/packages/packages.current b/packages/packages.current
index 901b005..8b73c09 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -22,7 +22,7 @@ cairo,1.18.0,file,https://cairographics.org/releases/cairo-1.18.0.tar.xz,243a073
certdata,20240214,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/bfb3a675d0569b740fe865ad6d2ac70f22163e98/security/nss/lib/ckfw/builtins/certdata.txt,4d96bd539f4719e9ace493757afbe4a23ee8579de1c97fbebc50bba3c12e8c1e,,
curl,8.8.0,file,https://curl.se/download/curl-8.8.0.tar.xz,0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400,,
cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
-enchant,2.6.7,file,https://github.com/AbiWord/enchant/releases/download/v2.6.7/enchant-2.6.7.tar.gz,a1c2e5b59acca000bbfb24810af4a1165733d407f2154786588e076c8cd57bfc,,
+enchant,2.7.3,file,https://github.com/AbiWord/enchant/releases/download/v2.7.3/enchant-2.7.3.tar.gz,fe6ad4cbe8c71b9384ffdef962be52d4d2bd5ebfb6351435bb390543d4f78b1e,,
expat,2.6.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_6_1/expat-2.6.1.tar.xz,0c00d2760ad12efef6e26efc8b363c8eb28eb8c8de719e46d5bb67b40ba904a3,,
fontconfig,2.15.0,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.xz,63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e,,
freetype,2.13.2,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz,12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d,,
diff --git a/patches/enchant/01-fix-relocation.patch b/patches/enchant/01-fix-relocation.patch
index 8582e82..d56325b 100644
--- a/patches/enchant/01-fix-relocation.patch
+++ b/patches/enchant/01-fix-relocation.patch
@@ -1,18 +1,15 @@
-# Patch from msys2
-diff -ru a/src/lib.c b/src/lib.c
---- a/src/lib.c 2018-02-04 18:00:53.000000000 +0100
-+++ b/src/lib.c 2018-08-14 16:26:44.587391300 +0200
-@@ -1006,6 +1006,13 @@
- {
- g_return_val_if_fail (g_module_supported (), NULL);
-
+--- a/lib/broker.c 2024-05-26 22:12:55.216925716 -0700
++++ b/lib/broker.c 2024-05-26 22:13:48.425809505 -0700
+@@ -800,6 +800,12 @@
+ return self;
+ #line 802 "broker.c"
+ }
+#ifdef G_OS_WIN32
-+ // gnulib's relocation does not work properly on win32 without setting the prefix explicitly
-+ gchar *module_dir = g_win32_get_package_installation_directory_of_module(NULL);
-+ enchant_set_prefix_dir(module_dir);
-+ g_free(module_dir);
++ // gnulib's relocation does not work properly on win32 without setting the prefix explicitly
++ gchar *module_dir = g_win32_get_package_installation_directory_of_module(NULL);
++ enchant_set_prefix_dir(module_dir);
++ g_free(module_dir);
+#endif
-+
- EnchantBroker *broker = g_new0 (EnchantBroker, 1);
- broker->dict_map = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, enchant_dict_destroyed);
+ #line 87 "broker.vala"
+ enchant_broker_load_providers (self);
+ #line 88 "broker.vala"
diff --git a/patches/enchant/02-free-library-name.patch b/patches/enchant/02-free-library-name.patch
index b55efee..e15a4f2 100644
--- a/patches/enchant/02-free-library-name.patch
+++ b/patches/enchant/02-free-library-name.patch
@@ -1,5 +1,5 @@
---- a/lib/relocatable.c 2021-08-02 22:03:28.502997457 -0700
-+++ b/lib/relocatable.c 2021-08-02 22:09:43.269387994 -0700
+--- a/libgnu/relocatable.c 2021-08-02 22:03:28.502997457 -0700
++++ b/libgnu/relocatable.c 2021-08-02 22:09:43.269387994 -0700
@@ -314,7 +314,7 @@
#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
diff --git a/patches/enchant/03-no-doc.diff b/patches/enchant/03-no-doc.diff
index 3b19ed8..55feb50 100644
--- a/patches/enchant/03-no-doc.diff
+++ b/patches/enchant/03-no-doc.diff
@@ -1,11 +1,23 @@
---- a/src/Makefile.in 2024-03-02 19:45:17.636398793 -0700
-+++ b/src/Makefile.in 2024-03-02 19:45:37.208674173 -0700
-@@ -1002,8 +1002,6 @@
- libenchant_include_HEADERS = enchant.h enchant-provider.h enchant++.h
+--- a/src/Makefile.in 2024-05-05 20:20:22.333709077 -0700
++++ b/src/Makefile.in 2024-05-05 20:20:36.553991816 -0700
+@@ -472,8 +472,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CPPFLAGS = -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/libgnu $(ISYSTEM)$(top_srcdir)/libgnu -I$(top_srcdir)/lib $(GLIB_CFLAGS) $(WARN_CFLAGS) -DG_LOG_DOMAIN='"libenchant"'
+-dist_man_MANS = enchant- at ENCHANT_MAJOR_VERSION@.1 enchant-lsmod- at ENCHANT_MAJOR_VERSION@.1
+-nodist_doc_DATA = enchant- at ENCHANT_MAJOR_VERSION@.html enchant-lsmod- at ENCHANT_MAJOR_VERSION@.html
+ edit = sed \
+ -e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \
+ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
+
+--- a/lib/Makefile.in 2024-05-23 22:00:03.535847609 -0700
++++ b/lib/Makefile.in 2024-05-23 22:00:18.120060277 -0700
+@@ -534,8 +534,6 @@
+ libenchant_include_HEADERS = enchant.h enchant++.h
libenchant_datadir = $(pkgdatadir)- at ENCHANT_MAJOR_VERSION@
libenchant_data_DATA = enchant.ordering
--dist_man_MANS = enchant- at ENCHANT_MAJOR_VERSION@.1 enchant-lsmod- at ENCHANT_MAJOR_VERSION@.1 enchant.5
--nodist_doc_DATA = enchant- at ENCHANT_MAJOR_VERSION@.html enchant-lsmod- at ENCHANT_MAJOR_VERSION@.html enchant.html
+-dist_man_MANS = enchant.5
+-nodist_doc_DATA = enchant.html
edit = sed \
-e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \
-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index c0203bb..88ec65c 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -85,14 +85,14 @@ File ${prefix}/bin/libhunspell-1.7-0.dll
#######################################
### enchant
!insertmacro SetPrefix enchant
-File ${prefix}/bin/libenchant-2.dll
+File ${prefix}/bin/libenchant-2-2.dll
SetOutPath "$INSTDIR\lib\enchant-2"
File ${prefix}/lib/enchant-2/enchant_hunspell.dll
SetShellVarContext all
-SetOutPath "$INSTDIR\share\enchant"
+SetOutPath "$INSTDIR\share\enchant-2"
File ${prefix}/share/enchant-2/enchant.ordering
-SetOutPath "$INSTDIR\share\enchant\hunspell"
+SetOutPath "$INSTDIR\share\hunspell"
File dictionaries/en_US.aff
File dictionaries/en_US.dic
File dictionaries/de_DE_frami.aff
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 0235247..1496d30 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -407,19 +407,19 @@ Delete "$INSTDIR\libetpan-20.dll"
#######################################
### enchant
-Delete "$INSTDIR\libenchant-2.dll"
+Delete "$INSTDIR\libenchant-2-2.dll"
Delete "$INSTDIR\lib\enchant-2\enchant_hunspell.dll"
RMDir "$INSTDIR\lib\enchant-2"
Delete "$INSTDIR\share\enchant-2\enchant.ordering"
-Delete "$INSTDIR\share\enchant\hunspell\en_US.aff"
-Delete "$INSTDIR\share\enchant\hunspell\en_US.dic"
-Delete "$INSTDIR\share\enchant\hunspell\de_DE_frami.aff"
-Delete "$INSTDIR\share\enchant\hunspell\de_DE_frami.dic"
-Delete "$INSTDIR\share\enchant\hunspell\fr.aff"
-Delete "$INSTDIR\share\enchant\hunspell\fr.dic"
-RMDir "$INSTDIR\share\enchant\hunspell"
-RMDir "$INSTDIR\share\enchant"
+Delete "$INSTDIR\share\hunspell\en_US.aff"
+Delete "$INSTDIR\share\hunspell\en_US.dic"
+Delete "$INSTDIR\share\hunspell\de_DE_frami.aff"
+Delete "$INSTDIR\share\hunspell\de_DE_frami.dic"
+Delete "$INSTDIR\share\hunspell\fr.aff"
+Delete "$INSTDIR\share\hunspell\fr.dic"
+RMDir "$INSTDIR\share\hunspell"
+RMDir "$INSTDIR\share\enchant-2"
#######################################
### hunspell
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list