[Commits] [SCM] claws-win32-installer branch, master, updated. 4.2.0-1-3-g3f15b07

[jonathan at claws-mail.org]

The branch, master has been updated
       via  3f15b0760ec974b9560cd1a2b3d9974cfdc08fec (commit)
      from  0ee144a47ecb60a9f6c4458c0e5054e25006fcb4 (commit)

Summary of changes:
 packages/packages.current      |  2 +-
 patches/enchant/03-no-doc.diff | 14 +++++++-------
 src/sections-installer.nsi     |  2 +-
 src/sections-uninstaller.nsi   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 3f15b0760ec974b9560cd1a2b3d9974cfdc08fec
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Mar 2 17:29:52 2024 -0700

    Update to enchant-2.6.7

diff --git a/packages/packages.current b/packages/packages.current
index d02507c..59683c8 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,20231115,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/a3dd112b0ed075be924f114a490abaeb9d7c3cd6/security/nss/lib/ckfw/builtins/certdata.txt,1970dd65858925d68498d2356aea6d03f764422523c5887deca8ce3ba9e1f845,,
 curl,8.6.0,file,https://curl.se/download/curl-8.6.0.tar.xz,3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15,,
 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.2,file,https://github.com/AbiWord/enchant/releases/download/v2.6.2/enchant-2.6.2.tar.gz,6686a728e56e760f8dee09a22f0fb53b46ee9dbe7d64cf9e5bb35a658bff7e1d,,
+enchant,2.6.7,file,https://github.com/AbiWord/enchant/releases/download/v2.6.7/enchant-2.6.7.tar.gz,a1c2e5b59acca000bbfb24810af4a1165733d407f2154786588e076c8cd57bfc,,
 expat,2.5.0,file,https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz,ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe,,
 fontconfig,2.14.2,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz,dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b,,
 freetype,2.13.2,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz,12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d,,
diff --git a/patches/enchant/03-no-doc.diff b/patches/enchant/03-no-doc.diff
index b234405..3b19ed8 100644
--- a/patches/enchant/03-no-doc.diff
+++ b/patches/enchant/03-no-doc.diff
@@ -1,11 +1,11 @@
---- a/src/Makefile.in	2023-02-19 21:31:01.360862203 -0700
-+++ b/src/Makefile.in	2023-02-19 21:32:41.674710533 -0700
-@@ -908,8 +908,6 @@
+--- 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
- noinst_HEADERS = debug.h
- pkgdata_DATA = enchant.ordering
+ 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
  edit = sed \
- 	-e 's|DATADIR|$(datadir)|g'
- 
+ 	-e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \
+ 	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index b86655f..c7168d4 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -91,7 +91,7 @@ File ${prefix}/lib/enchant-2/enchant_hunspell.dll
 
 SetShellVarContext all
 SetOutPath "$INSTDIR\share\enchant"
-File ${prefix}/share/enchant/enchant.ordering
+File ${prefix}/share/enchant-2/enchant.ordering
 SetOutPath "$INSTDIR\share\enchant\hunspell"
 File dictionaries/en_US.aff
 File dictionaries/en_US.dic
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index c487b0c..f0dbe3d 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -411,7 +411,7 @@ Delete "$INSTDIR\libenchant-2.dll"
 Delete "$INSTDIR\lib\enchant-2\enchant_hunspell.dll"
 RMDir "$INSTDIR\lib\enchant-2"
 
-Delete "$INSTDIR\share\enchant\enchant.ordering"
+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"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port