[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-16-g005c02d

jonathan at claws-mail.org jonathan at claws-mail.org
Tue Sep 21 11:23:56 CEST 2021 

The branch, master has been updated
       via  005c02d3ccd9a62e0df7b070c17b32943b518fff (commit)
       via  d3d49d783ec5dbe7c268df280e3ea3f108738f8d (commit)
       via  0f1eecfadce29c954a509868b730a1e38a9d7efd (commit)
      from  21d67248a52fd7dc936e22886a333b98f19fa84a (commit)

Summary of changes:
 configure.ac                               | 10 ++--
 packages/packages.current                  |  3 +-
 patches/poppler/01-mingw-std-threads.patch | 84 ++++++++++++++++++++++++++++++
 patches/w32pth-2.0.5/01-def-fix.patch      | 11 ----
 patches/w32pth-2.0.5/99-autogen.sh         |  7 ---
 src/Makefile.am                            | 25 +++++++++
 src/config.nsi.in                          |  2 +-
 src/sections-installer.nsi                 | 14 ++---
 src/sections-uninstaller.nsi               | 10 ++--
 9 files changed, 131 insertions(+), 35 deletions(-)
 create mode 100755 patches/poppler/01-mingw-std-threads.patch
 delete mode 100644 patches/w32pth-2.0.5/01-def-fix.patch
 delete mode 100755 patches/w32pth-2.0.5/99-autogen.sh


- Log -----------------------------------------------------------------
commit 005c02d3ccd9a62e0df7b070c17b32943b518fff
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Fri Sep 10 14:25:45 2021 -0700

    update to poppler-21.09.0 and poppler-data-0.4.11

diff --git a/packages/packages.current b/packages/packages.current
index 58782f8..444d20f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -43,8 +43,8 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
 nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
 pango,1.48.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar.xz,a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa,,
 pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,21.08.0,file,https://poppler.freedesktop.org/poppler-21.08.0.tar.xz,e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d,,
-poppler_data,0.4.10,file,https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz,6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30,,
+poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b,,
+poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
 regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
 sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
 webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 9bb063c..708d4a1 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -388,7 +388,7 @@ File ${prefix}/bin/libgumbo-1.dll
 ### poppler
 !insertmacro SetPrefix poppler
 File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-112.dll
+File ${prefix}/bin/libpoppler-113.dll
 
 #######################################
 ### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 77c5e29..1090b10 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
 #######################################
 ### poppler
 Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-112.dll"
+Delete "$INSTDIR\libpoppler-113.dll"
 
 #######################################
 ### gumbo-parser

commit d3d49d783ec5dbe7c268df280e3ea3f108738f8d
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date:   Sat Jul 17 17:36:15 2021 -0700

    add pdf_viewer plugin and dependencies

diff --git a/configure.ac b/configure.ac
index 57ccc7f..2291d19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,11 +235,15 @@ CM_BPKG([bsfilter])
 
 CM_MPKG([bzip2])
 CM_MPKG([zlib])
+CM_MPKG([poppler_data])
+
+CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gtk icu4c jpeg libiconv libpng zlib])
 
 CM_SPKG([gmp])
 CM_SPKG([regex], [gettext])
 CM_SPKG([fribidi])
 CM_SPKG([hunspell], [libiconv gettext])
+CM_SPKG([jpeg])
 
 CM_SPKG([libiconv])
 CM_SPKG([gettext], [libiconv])
@@ -276,7 +280,6 @@ CM_SPKG([ytnef])
 CM_SPKG([gumbo_parser])
 
 if test "$build_fancy" = yes; then
-	CM_SPKG([jpeg])
 	CM_SPKG([sqlite], [zlib])
 	CM_SPKG([libwebp], [zlib libpng jpeg])
 	CM_SPKG([libxslt], [libxml2])
@@ -289,7 +292,7 @@ else
 	AC_SUBST(NSIS_DISABLE_FANCY, [-DDISABLE_FANCY_PLUGIN])
 fi
 
-claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib"
+claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib poppler"
 claws_mail_deps="$claws_mail_deps gpgme regex libetpan gnutls ytnef gumbo_parser"
 claws_mail_deps="$claws_mail_deps libxml2 expat $cm_dep_webkitgtk curl libical nettle"
 CM_SPKG([claws_mail], [$claws_mail_deps])
diff --git a/packages/packages.current b/packages/packages.current
index 5358f7a..58782f8 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -43,6 +43,8 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
 nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
 pango,1.48.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar.xz,a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa,,
 pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
+poppler,21.08.0,file,https://poppler.freedesktop.org/poppler-21.08.0.tar.xz,e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d,,
+poppler_data,0.4.10,file,https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz,6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30,,
 regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
 sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
 webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
diff --git a/patches/poppler/01-mingw-std-threads.patch b/patches/poppler/01-mingw-std-threads.patch
new file mode 100755
index 0000000..c06e824
--- /dev/null
+++ b/patches/poppler/01-mingw-std-threads.patch
@@ -0,0 +1,84 @@
+diff -aur apoppler-21.08.0/poppler/Annot.h poppler-21.08.0/poppler/Annot.h
+--- apoppler-21.08.0/poppler/Annot.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Annot.h	2021-08-22 17:26:09.443799196 -0700
+@@ -50,7 +50,7 @@
+ 
+ #include <memory>
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+ 
+ #include "Object.h"
+diff -aur apoppler-21.08.0/poppler/Array.h poppler-21.08.0/poppler/Array.h
+--- apoppler-21.08.0/poppler/Array.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Array.h	2021-08-22 17:26:00.011882041 -0700
+@@ -29,7 +29,7 @@
+ #define ARRAY_H
+ 
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+ 
+ #include "poppler-config.h"
+diff -aur apoppler-21.08.0/poppler/CairoFontEngine.h poppler-21.08.0/poppler/CairoFontEngine.h
+--- apoppler-21.08.0/poppler/CairoFontEngine.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/CairoFontEngine.h	2021-08-22 17:26:19.525249517 -0700
+@@ -30,7 +30,7 @@
+ #ifndef CAIROFONTENGINE_H
+ #define CAIROFONTENGINE_H
+ 
+-#include <mutex>
++#include "mingw.mutex.h"
+ 
+ #include "poppler-config.h"
+ #include <cairo-ft.h>
+diff -aur apoppler-21.08.0/poppler/Dict.h poppler-21.08.0/poppler/Dict.h
+--- apoppler-21.08.0/poppler/Dict.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Dict.h	2021-08-22 17:26:32.638869326 -0700
+@@ -31,7 +31,7 @@
+ #define DICT_H
+ 
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <string>
+ #include <vector>
+ #include <utility>
+diff -aur apoppler-21.08.0/poppler/GlobalParams.h poppler-21.08.0/poppler/GlobalParams.h
+--- apoppler-21.08.0/poppler/GlobalParams.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/GlobalParams.h	2021-08-22 17:25:33.690499390 -0700
+@@ -47,7 +47,7 @@
+ #include <unordered_map>
+ #include <string>
+ #include <memory>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+ 
+ class GooString;
+diff -aur apoppler-21.08.0/poppler/Page.h poppler-21.08.0/poppler/Page.h
+--- apoppler-21.08.0/poppler/Page.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Page.h	2021-08-22 17:26:41.951851455 -0700
+@@ -36,7 +36,7 @@
+ #define PAGE_H
+ 
+ #include <memory>
+-#include <mutex>
++#include "mingw.mutex.h"
+ 
+ #include "poppler-config.h"
+ #include "Object.h"
+diff -aur apoppler-21.08.0/poppler/PDFDoc.h poppler-21.08.0/poppler/PDFDoc.h
+--- apoppler-21.08.0/poppler/PDFDoc.h	2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/PDFDoc.h	2021-08-22 17:25:50.992805747 -0700
+@@ -46,7 +46,7 @@
+ 
+ #include <algorithm>
+ #include <cstdio>
+-#include <mutex>
++#include "mingw.mutex.h"
+ 
+ #include "poppler-config.h"
+ 
diff --git a/src/Makefile.am b/src/Makefile.am
index fe41b37..679d317 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,7 @@ EXTRA_DIST = config.nsi.in claws-mail.nsi \
 # We can use $(idir) here for the installation prefix.
 
 cm_pkg_libical_cmake = yes
+cm_pkg_poppler_cmake = yes
 
 cm_pkg_atk_meson = yes
 cm_pkg_glib_meson = yes
@@ -370,6 +371,24 @@ cm_pkg_libical_configure = \
 	-DICAL_GLIB=OFF \
 	-DLIBICAL_BUILD_TESTING=OFF
 
+cm_pkg_poppler_configure = \
+	-DBUILD_GTK_TESTS=OFF \
+	-DBUILD_QT5_TESTS=OFF \
+	-DBUILD_QT6_TESTS=OFF \
+	-DBUILD_CPP_TESTS=OFF \
+	-DBUILD_MANUAL_TESTS=OFF \
+	-DENABLE_BOOST=OFF \
+	-DENABLE_CPP=OFF \
+	-DENABLE_UTILS=OFF \
+	-DENABLE_GOBJECT_INTROSPECTION=OFF \
+	-DENABLE_GTK_DOC=OFF \
+	-DENABLE_QT5=OFF \
+	-DENABLE_QT6=OFF \
+	-DENABLE_LIBCURL=OFF \
+	-DENABLE_LIBOPENJPEG=none \
+	-DCMAKE_C_FLAGS="$(CM_CFLAGS)" \
+	-DCMAKE_CXX_FLAGS="$(CM_CXXFLAGS) -fexceptions"
+
 cm_pkg_gumbo_parser_configure = \
 	LDFLAGS=-L$(idir)/lib \
 	CPPFLAGS=-I$(idir)/include
@@ -402,6 +421,12 @@ cm_pkg_zlib_make_args_inst = \
 	LIBRARY_PATH=$(pkg_idir)/lib \
 	SHARED_MODE=1
 
+cm_pkg_poppler_data_make_args = \
+	prefix=$(pkg_idir)
+
+cm_pkg_poppler_data_make_args_inst = \
+	prefix=$(pkg_idir)
+
 # Now do the bunch of the work.  This is a bunch of dirty magic to
 # integrate our special makefile into automake, while not actually
 # including it (make should include it).  This is in turn necessary
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 70dc68c..61ad0ed 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -87,3 +87,4 @@
 !define cm_pkg_libical_version @cm_pkg_libical_version@
 !define cm_pkg_ytnef_version @cm_pkg_ytnef_version@
 !define cm_pkg_gumbo_parser_version @cm_pkg_gumbo_parser_version@
+!define cm_pkg_poppler_version @cm_pkg_poppler_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index f08c82d..9bb063c 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -332,10 +332,8 @@ File ${prefix}/bin/libjavascriptcoregtk-1.0-0.dll
 
 #######################################
 ### jpeg
-!ifndef DISABLE_FANCY_PLUGIN
 !insertmacro SetPrefix jpeg
 File ${prefix}/bin/libjpeg-9.dll
-!endif
 
 #######################################
 ### glib-networking
@@ -386,6 +384,12 @@ File ${prefix}/bin/libytnef-0.dll
 !insertmacro SetPrefix gumbo_parser
 File ${prefix}/bin/libgumbo-1.dll
 
+#######################################
+### poppler
+!insertmacro SetPrefix poppler
+File ${prefix}/bin/libpoppler-glib-8.dll
+File ${prefix}/bin/libpoppler-112.dll
+
 #######################################
 ### claws-mail
 !insertmacro SetPrefix claws_mail
@@ -408,6 +412,7 @@ File ${prefix}/lib/claws-mail/plugins/libravatar.dll
 File ${prefix}/lib/claws-mail/plugins/litehtml_viewer.dll
 File ${prefix}/lib/claws-mail/plugins/managesieve.dll
 File ${prefix}/lib/claws-mail/plugins/notification.dll
+File ${prefix}/lib/claws-mail/plugins/pdf_viewer.dll
 File ${prefix}/lib/claws-mail/plugins/pgpcore.dll
 File ${prefix}/lib/claws-mail/plugins/pgpinline.dll
 File ${prefix}/lib/claws-mail/plugins/pgpinline.deps
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index bf9813a..77c5e29 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -18,6 +18,7 @@ Delete "$INSTDIR\lib\claws-mail\plugins\libravatar.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\litehtml_viewer.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\managesieve.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\notification.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\pdf_viewer.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
@@ -32,6 +33,11 @@ Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
 RMDir "$INSTDIR\lib\claws-mail\plugins"
 RMDir "$INSTDIR\lib\claws-mail"
 
+#######################################
+### poppler
+Delete "$INSTDIR\libpoppler-glib-8.dll"
+Delete "$INSTDIR\libpoppler-112.dll"
+
 #######################################
 ### gumbo-parser
 Delete "$INSTDIR\libgumbo-1.dll"

commit 0f1eecfadce29c954a509868b730a1e38a9d7efd
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Mon Sep 20 02:42:28 2021 -0700

    Remove unused w32pth package

diff --git a/configure.ac b/configure.ac
index cb80754..57ccc7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,7 +236,6 @@ CM_BPKG([bsfilter])
 CM_MPKG([bzip2])
 CM_MPKG([zlib])
 
-CM_SPKG([w32pth])
 CM_SPKG([gmp])
 CM_SPKG([regex], [gettext])
 CM_SPKG([fribidi])
@@ -259,7 +258,7 @@ CM_SPKG([libpng], [zlib])
 CM_SPKG([enchant], [glib hunspell])
 
 CM_SPKG([libgpg_error], [libiconv gettext])
-CM_SPKG([libassuan], [libgpg_error w32pth])
+CM_SPKG([libassuan], [libgpg_error])
 CM_SPKG([gpgme], [libgpg_error libassuan glib])
 CM_SPKG([libtasn1])
 CM_SPKG([nettle], [gmp])
diff --git a/packages/packages.current b/packages/packages.current
index 1badf11..5358f7a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -45,7 +45,6 @@ pango,1.48.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar
 pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
 regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
 sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
-w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
 webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
 ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
 zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
diff --git a/patches/w32pth-2.0.5/01-def-fix.patch b/patches/w32pth-2.0.5/01-def-fix.patch
deleted file mode 100644
index 8f1443a..0000000
--- a/patches/w32pth-2.0.5/01-def-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur w32pth-2.0.5.orig/libw32pth.def w32pth-2.0.5/libw32pth.def
---- w32pth-2.0.5.orig/libw32pth.def	2015-05-25 18:30:22.734187106 +0200
-+++ w32pth-2.0.5/libw32pth.def	2015-05-25 18:30:32.838459236 +0200
-@@ -18,7 +18,6 @@
- ;; 02110-1301, USA.
- 
- 
--EXPORTS
-       pth_init  @1
-       pth_kill  @2
-       pth_ctrl  @3
diff --git a/patches/w32pth-2.0.5/99-autogen.sh b/patches/w32pth-2.0.5/99-autogen.sh
deleted file mode 100755
index f97c38b..0000000
--- a/patches/w32pth-2.0.5/99-autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# We run this primarily for the libtoolize step, so that libtool
-# gets updated to a newer version. The version enchant ships is older
-# and buggy when it comes to generating a DLL for x86_64.
-libtoolize
-./autogen.sh
diff --git a/src/config.nsi.in b/src/config.nsi.in
index e75b63a..70dc68c 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -42,7 +42,6 @@
 
 # The version of each package.
 !define cm_pkg_libgpg_error_version @cm_pkg_libgpg_error_version@
-!define cm_pkg_w32pth_version @cm_pkg_w32pth_version@
 !define cm_pkg_libassuan_version @cm_pkg_libassuan_version@
 !define cm_pkg_gpgme_version @cm_pkg_gpgme_version@
 !define cm_pkg_libtasn1_version @cm_pkg_libtasn1_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index e66a5aa..f08c82d 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -55,11 +55,6 @@ File ${prefix}/bin/libtasn1-6.dll
 !insertmacro SetPrefix regex
 File ${prefix}/bin/libregex-1.dll
 
-#######################################
-### w32pth
-!insertmacro SetPrefix w32pth
-File ${prefix}/bin/libw32pth-0.dll
-
 #######################################
 ### zlib
 !insertmacro SetPrefix zlib
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 1efd979..bf9813a 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -300,10 +300,6 @@ Delete /REBOOTOK "$INSTDIR\iconv.dll"
 ### zlib
 Delete /REBOOTOK "$INSTDIR\zlib1.dll"
 
-#######################################
-### w32pth
-Delete "$INSTDIR\libw32pth-0.dll"
-
 #######################################
 ### regex
 Delete "$INSTDIR\libregex-1.dll"

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


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

More information about the Commits mailing list