[Commits] [SCM] claws-win32-installer branch, master, updated. 4.3.0-1-3-g47c00e6

jonathan at claws-mail.org jonathan at claws-mail.org
Sun Jun 23 00:47:36 UTC 2024 

The branch, master has been updated
       via  47c00e609e429680e8a29101ec84171f48ecb188 (commit)
      from  4d8b8017e009c11e01b1717f3aeb3f43ed5da2d7 (commit)

Summary of changes:
 README                       | 47 ++++---------------------
 configure.ac                 | 25 +-------------
 packages/packages.current    |  6 ----
 src/Makefile.am              | 82 ++------------------------------------------
 src/config.nsi.in            |  6 ----
 src/sections-installer.nsi   | 48 --------------------------
 src/sections-uninstaller.nsi | 34 +++++-------------
 7 files changed, 18 insertions(+), 230 deletions(-)


- Log -----------------------------------------------------------------
commit 47c00e609e429680e8a29101ec84171f48ecb188
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Wed Jun 19 19:55:56 2024 -0700

    Remove Fancy plugin support
    
    Fancy support was disabled and left in the tree to minimize the diff
    with the gtk2 build.  Remove it now that Claws has ended gtk2 support.

diff --git a/README b/README
index 0df7095..625052a 100644
--- a/README
+++ b/README
@@ -72,9 +72,7 @@ If any parameters are passed to autogen.sh, the first must be either
 configure script.
 
 
-The configure script has four parameters for developers:
-
---disable-fancy-plugin will skip building the fancy plugin and its dependencies
+The configure script has three parameters for developers:
 
 --disable-strip will skip stripping the debug symbols from the build binaries
 into separate .debug files
@@ -85,15 +83,13 @@ of smaller lzma
 --enable-debug will build packages with debug CFLAGS and configure options
 
 
-The configure script looks for five environment variables:
+The configure script looks for four environment variables:
 
 CFLAGS and CXXFLAGS are respected and passed down when building the packages.
 If CFLAGS is specified but CXXFLAGS isn't, CXXFLAGS will use the CFLAGS value.
 
 EXTRA_MAKENSIS_FLAGS will be added to the makensis command line.
 
-WEBKITGTK_BISON sets a custom path to bison for building webkitgtk-2.4.11.  See below.
-
 MAKE_JOBS sets the make -j parameter for building in parallel.  It defaults to
 the number of CPUs on the system.  It doesn't build multiple packages in
 parallel; it sets the parallelism in each package.
@@ -136,7 +132,7 @@ libglib2.0-bin
 libglib2.0-dev-bin
 git
 cmake
-bison ***
+bison
 flex
 gperf
 intltool
@@ -145,14 +141,7 @@ libgettextpo-dev
 meson
 python3-distutils
 curl
-ruby *
-python-is-python3 *
-gtk-3-examples **
-
-* only needed for webkitgtk on gtk2 builds
-** only needed for gtk3 builds
-*** webkitgtk-2.4.11 fails to build with bison-3.7 but
-    works with bison-3.6.4.  See below.
+gtk-3-examples
 
 On Debian Bookworm, mingw-w64 needs to be configured to use the posix threads
 version, not the win32 threads version.
@@ -163,33 +152,11 @@ version, not the win32 threads version.
  $ update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
  $ update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
 
-Fancy / WebkitGTK / GTK2
-========================
+Fancy / WebkitGTK
+=================
 
 Due to a lack of upstream support, webkitgtk and therefore the Claws Fancy plugin
-are only available with the GTK2 build.  The latest version of webkitgtk that can
-be built for Windows is 2.4.11, which is quite old.  Several packages needed by
-Claws have since broken compatibility with the old version of webkitgtk.  Currently,
-they are:
-	glib
-	glib-networking
-	icu
-
-In order to keep some Fancy support, the GTK2 build of Claws also builds with
-old versions of those packages.
-
-Additionally, webkitgtk-2.4.11 needs bison-3.6.4 to build.  If bison-3.6.4 isn't
-available from your distro:
-
-1. Build and install bison-3.6.4
-	curl -O http://mirrors.kernel.org/gnu/bison/bison-3.6.4.tar.xz
-	tar xf bison-3.6.4.tar.xz
-	cd bison-3.6.4
-	./configure --prefix=/opt/bison-3.6.4
-	make && sudo make install
-
-2. Call autogen.sh with the path to bison
-	./autogen.sh --build-w64 WEBKITGTK_BISON=/opt/bison-3.6.4/bin/bison
+are no longer available in the Windows build.
 
 
 Building in a Docker container
diff --git a/configure.ac b/configure.ac
index 9396037..77a1dc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,15 +74,6 @@ AC_SUBST(BUILD_TIMESTAMP)
 AC_SUBST(BUILD_ISODATE)
 AC_SUBST(BUILD_FILEVERSION)
 
-AC_ARG_ENABLE([fancy-plugin],
-	AS_HELP_STRING([--enable-fancy-plugin],[Enable building the fancy plugin and dependencies (default=no)]),
-	[build_fancy=$enableval],
-	[build_fancy=no])
-AS_IF([test "$build_fancy" = yes],
-	[ENABLE_FANCY_PLUGIN=--enable-fancy-plugin],
-	[ENABLE_FANCY_PLUGIN=--disable-fancy-plugin])
-AC_SUBST(ENABLE_FANCY_PLUGIN)
-
 AC_ARG_ENABLE([strip],
 	AS_HELP_STRING([--enable-strip],[Strip debug symbols from binaries (default=yes)]),
 	[strip_binaries=$enableval],
@@ -279,21 +270,8 @@ CM_SPKG([poppler], [cairo fontconfig freetype gdk_pixbuf glib gtk icu4c jpeg lib
 CM_SPKG([regex], [gettext])
 CM_SPKG([ytnef])
 
-if test "$build_fancy" = yes; then
-	CM_SPKG([sqlite], [zlib])
-	CM_SPKG([libwebp], [jpeg libpng zlib])
-	CM_SPKG([libxslt], [libxml2])
-	CM_SPKG([glib_networking], [glib gnutls])
-	CM_SPKG([libsoup], [glib_networking gnutls libpsl libxml2 sqlite])
-	CM_SPKG([webkitgtk], [glib gtk harfbuzz icu4c jpeg libpng libsoup libwebp libxml2 libxslt])
-	cm_dep_webkitgtk="webkitgtk"
-else
-	cm_dep_webkitgtk=""
-	AC_SUBST(NSIS_DISABLE_FANCY, [-DDISABLE_FANCY_PLUGIN])
-fi
-
 claws_mail_deps="curl enchant expat gettext glib gnutls gpgme gtk gumbo_parser libetpan libical libiconv libpng libxml2"
-claws_mail_deps="$claws_mail_deps nettle poppler regex $cm_dep_webkitgtk ytnef zlib"
+claws_mail_deps="$claws_mail_deps nettle poppler regex ytnef zlib"
 CM_SPKG([claws_mail], [$claws_mail_deps])
 
 AC_SUBST(cm_bpkgs)
@@ -318,7 +296,6 @@ echo "
 	${PACKAGE_NAME} ${VERSION_NO_REL}${GIT_REVISION}-${REL} prepared for make
 
 	Platform: $host
-	Fancy plugin: $ENABLE_FANCY_PLUGIN
 	Strip binaries: $STRIP_BINARIES
 	NSIS compression: $NSIS_COMPRESSOR
 	Enable debug options: $ENABLE_DEBUG_OPTS
diff --git a/packages/packages.current b/packages/packages.current
index 7816f4c..585db18 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -30,7 +30,6 @@ fribidi,1.0.15,file,https://github.com/fribidi/fribidi/releases/download/v1.0.15
 gdk_pixbuf,2.42.12,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.12.tar.xz,b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7,,
 gettext,0.22.5,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.5.tar.xz,fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640,,
 glib,2.78.6,file,https://download.gnome.org/sources/glib/2.78/glib-2.78.6.tar.xz,244854654dd82c7ebcb2f8e246156d2a05eb9cd1ad07ed7a779659b4602c9fae,,
-glib_networking,2.78.1,file,https://download.gnome.org/sources/glib-networking/2.78/glib-networking-2.78.1.tar.xz,e48f2ddbb049832cbb09230529c5e45daca9f0df0eda325f832f7379859bf09f,,
 gmp,6.3.0,file,https://gmplib.org/download/gmp/gmp-6.3.0.tar.xz,a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898,,
 gnutls,3.7.11,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.11.tar.xz,90e337504031ef7d3077ab1a52ca8bac9b2f72bc454c95365a1cd1e0e81e06e9,,
 gpgme,1.23.2,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.23.2.tar.bz2,9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224,,
@@ -49,11 +48,8 @@ libical,3.0.18,file,https://github.com/libical/libical/releases/download/v3.0.18
 libiconv,1.17,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz,8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313,,
 libpng,1.6.43,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.43/libpng-1.6.43.tar.xz,6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c,,
 libpsl,0.21.5,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.gz,1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208,,
-libsoup,2.74.3,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.3.tar.xz,e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13,,
 libtasn1,4.19.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.19.0.tar.gz,1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a,,
-libwebp,1.4.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.4.0.tar.gz,61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5,,
 libxml2,2.12.7,file,https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz,24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56,,
-libxslt,1.1.39,file,https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.tar.xz,2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0,,
 nettle,3.9.1,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.9.1.tar.gz,ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3,,
 p11_kit,0.25.3,file,https://github.com/p11-glue/p11-kit/releases/download/0.25.3/p11-kit-0.25.3.tar.xz,d8ddce1bb7e898986f9d250ccae7c09ce14d82f1009046d202a0eb1b428b2adc,,
 pango,1.52.2,file,https://download.gnome.org/sources/pango/1.52/pango-1.52.2.tar.xz,d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b,,
@@ -62,7 +58,5 @@ pixman,0.43.4,file,https://cairographics.org/releases/pixman-0.43.4.tar.gz,a0624
 poppler,24.06.0,file,https://poppler.freedesktop.org/poppler-24.06.0.tar.xz,0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76,,
 poppler_data,0.4.12,file,https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz,c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74,,
 regex,20240301,git,git://git.savannah.gnu.org/gnulib.git,68b015146e2e5675f23e753bdccd5e61262aa231f325229722edad3f8c24c43a,master,1348f1fd10b8a6e184cb29a0c6f930aff1a4017d
-sqlite,3.46.0,file,https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz,6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d,,
-webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
 ytnef,2.1.2,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.1.2.tar.gz,340f03f495884611209e9c0bc943fad06ce920e8c79655aa228d5ca7418dc360,,
 zlib,1.3.1,file,https://zlib.net/zlib-1.3.1.tar.gz,9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23,,
diff --git a/src/Makefile.am b/src/Makefile.am
index 410bf92..9aa4944 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,11 +43,9 @@ cm_pkg_libepoxy_meson = yes
 cm_pkg_atk_meson = yes
 cm_pkg_glib_meson = yes
 cm_pkg_pixman_meson = yes
-cm_pkg_glib_networking_meson = yes
 cm_pkg_gdk_pixbuf_meson = yes
 cm_pkg_fribidi_meson = yes
 cm_pkg_pango_meson = yes
-cm_pkg_libsoup_meson = yes
 cm_pkg_libpsl_meson = yes
 cm_pkg_harfbuzz_meson = yes
 cm_pkg_p11_kit_meson = yes
@@ -248,10 +246,6 @@ cm_pkg_libxml2_configure = \
 	--without-python \
 	--with-iconv=$(idir)
 
-cm_pkg_libxslt_configure = \
-	--enable-shared \
-	--without-python
-
 cm_pkg_expat_configure = \
 	--without-docbook
 
@@ -297,7 +291,7 @@ cm_pkg_claws_mail_configure = \
 	--disable-startup-notification \
 	--disable-spamassassin-plugin \
 	--disable-bogofilter-plugin \
-	$(ENABLE_FANCY_PLUGIN) \
+	--disable-fancy-plugin \
 	--disable-acpi_notifier-plugin \
 	--disable-clamd-plugin \
 	--disable-perl-plugin \
@@ -311,80 +305,8 @@ cm_pkg_claws_mail_configure = \
 	CPPFLAGS="-I$(idir)/include -D_POSIX_C_SOURCE" \
 	LDFLAGS=-L$(idir)/lib
 
-cm_pkg_sqlite_configure = \
-	--disable-static-shell
-
-cm_pkg_glib_networking_configure = \
-	-Dgnutls=enabled \
-	-Dopenssl=disabled \
-	-Dlibproxy=disabled \
-	-Dgnome_proxy=disabled
-cm_pkg_glib_networking_meson_cppflags = -I$(idir)/include
-cm_pkg_glib_networking_meson_ldflags = -L$(idir)/lib
-
 cm_pkg_libpsl_meson_cppflags = -I$(idir)/include
 
-cm_pkg_libsoup_configure = \
-	-Dgnome=false \
-	-Dgssapi=disabled \
-	-Dtests=false \
-	-Dsysprof=disabled \
-	-Dtls_check=false \
-	-Dintrospection=disabled
-cm_pkg_libsoup_meson_cppflags = -I$(idir)/include
-cm_pkg_libsoup_meson_ldflags = -L$(idir)/lib
-
-cm_pkg_libwebp_configure = \
-	LDFLAGS=-L$(idir)/lib \
-	CPPFLAGS=-I$(idir)/include
-
-# --enable-debug-symbols=yes|full sets -ggdb which causes the ICE below
-if ENABLE_DEBUG_OPTS
-webkitgtk_debug = \
-	--enable-debug \
-	--enable-debug-symbols=min \
-	--enable-developer-mode=no \
-	--enable-optimizations=no
-else
-webkitgtk_debug = \
-	--disable-debug
-endif
-
-cm_pkg_webkitgtk_configure = \
-	--disable-webkit2 \
-	--enable-webkit1 \
-	--with-gtk=2.0 \
-	--disable-x11-target \
-	--disable-wayland-target \
-	--enable-win32-target \
-	--disable-spellcheck \
-	--disable-credential-storage \
-	--disable-gtk-doc-html \
-	--disable-svg-fonts \
-	--disable-jit \
-	--disable-video \
-	--disable-web-audio \
-	--disable-battery-status \
-	--disable-geolocation \
-	--disable-coverage \
-	--disable-glx \
-	--disable-egl \
-	--disable-gles2 \
-	--disable-gamepad \
-	--disable-webgl \
-	--disable-glibtest \
-	$(webkitgtk_debug) \
-	--disable-accelerated-compositing \
-	--enable-silent-rules \
-	CPPFLAGS="-I$(idir)/include -Wno-expansion-to-defined -Wno-class-memaccess" \
-	CC=$(CC) \
-	LDFLAGS=-L$(idir)/lib
-# -ggdb causes an ICE with gcc-8.3 / webkit-2.4.11
-cm_pkg_webkitgtk_cflags = \
-	-pipe -mms-bitfields
-cm_pkg_webkitgtk_cxxflags = \
-	-pipe -mms-bitfields -fexceptions
-
 cm_pkg_libical_configure = \
 	-DICAL_BUILD_DOCS=OFF \
 	-DICAL_GLIB=OFF \
@@ -464,7 +386,7 @@ $(eval $(call INCLUDE_BY_MAKE,claws-mail.mk))
 
 claws-mail-$(VERSION).exe: claws-mail.nsi stamps/stamp-final license.blurb
 	$(MAKENSIS) -V3 -DTOP_SRCDIR=$(top_srcdir) -DPKG_ROOT=$(ipdir) \
-		$(NSIS_DISABLE_FANCY) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/claws-mail.nsi
+		$(EXTRA_MAKENSIS_FLAGS) $(srcdir)/claws-mail.nsi
 
 license.blurb: $(top_srcdir)/doc/license-page $(top_srcdir)/doc/GPLv3
 	cat $(top_srcdir)/doc/license-page $(top_srcdir)/doc/GPLv3 >$@
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 725112e..d87bc30 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -53,20 +53,14 @@
 !define cm_pkg_p11_kit_version @cm_pkg_p11_kit_version@
 !define cm_pkg_curl_version @cm_pkg_curl_version@
 !define cm_pkg_libxml2_version @cm_pkg_libxml2_version@
-!define cm_pkg_libxslt_version @cm_pkg_libxslt_version@
 !define cm_pkg_cyrus_sasl_version @cm_pkg_cyrus_sasl_version@
 !define cm_pkg_libetpan_version @cm_pkg_libetpan_version@
 !define cm_pkg_regex_version @cm_pkg_regex_version@
 !define cm_pkg_claws_mail_version @cm_pkg_claws_mail_version@
-!define cm_pkg_libwebp_version @cm_pkg_libwebp_version@
-!define cm_pkg_sqlite_version @cm_pkg_sqlite_version@
 !define cm_pkg_icu4c_version @cm_pkg_icu4c_version@
 !define cm_pkg_libepoxy_version @cm_pkg_libepoxy_version@
-!define cm_pkg_webkitgtk_version @cm_pkg_webkitgtk_version@
 !define cm_pkg_jpeg_version @cm_pkg_jpeg_version@
-!define cm_pkg_glib_networking_version @cm_pkg_glib_networking_version@
 !define cm_pkg_libpsl_version @cm_pkg_libpsl_version@
-!define cm_pkg_libsoup_version @cm_pkg_libsoup_version@
 !define cm_pkg_bsfilter_version @cm_pkg_bsfilter_version@
 !define cm_pkg_zlib_version @cm_pkg_zlib_version@
 !define cm_pkg_bzip2_version @cm_pkg_bzip2_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index f3d7cf2..b81f3fc 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -418,13 +418,6 @@ File ${prefix}/bin/libcurl-4.dll
 !insertmacro SetPrefix libxml2
 File ${prefix}/bin/libxml2-2.dll
 
-#######################################
-### libxslt
-!ifndef DISABLE_FANCY_PLUGIN
-!insertmacro SetPrefix libxslt
-File ${prefix}/bin/libxslt-1.dll
-!endif
-
 #######################################
 ### gpgme
 !insertmacro SetPrefix gpgme
@@ -433,13 +426,6 @@ File ${prefix}/bin/libgpgmepp-6.dll
 File ${prefix}/bin/libgpgme-glib-11.dll
 File ${prefix}/libexec/gpgme-w32spawn.exe
 
-#######################################
-### libwebp
-!ifndef DISABLE_FANCY_PLUGIN
-!insertmacro SetPrefix libwebp
-File ${prefix}/bin/libwebp-7.dll
-!endif
-
 #######################################
 ### icu4c
 !insertmacro SetPrefix icu4c
@@ -453,47 +439,16 @@ File ${prefix}/bin/icuuc75.dll
 SetOutPath "$INSTDIR"
 File ${prefix}/bin/libepoxy-0.dll
 
-#######################################
-### sqlite-autoconf
-!ifndef DISABLE_FANCY_PLUGIN
-!insertmacro SetPrefix sqlite
-File ${prefix}/bin/libsqlite3-0.dll
-!endif
-
-#######################################
-### webkit
-!ifndef DISABLE_FANCY_PLUGIN
-!insertmacro SetPrefix webkitgtk
-File ${prefix}/bin/libwebkitgtk-1.0-0.dll
-File ${prefix}/bin/libjavascriptcoregtk-1.0-0.dll
-!endif
-
 #######################################
 ### jpeg
 !insertmacro SetPrefix jpeg
 File ${prefix}/bin/libjpeg-9.dll
 
-#######################################
-### glib-networking
-!ifndef DISABLE_FANCY_PLUGIN
-!insertmacro SetPrefix glib_networking
-SetOutPath "$INSTDIR\lib\gio\modules"
-File ${prefix}/lib/gio/modules/libgiognutls.dll
-SetOutPath "$INSTDIR"
-!endif
-
 #######################################
 ### libpsl
 !insertmacro SetPrefix libpsl
 File ${prefix}/bin/libpsl-5.dll
 
-#######################################
-### libsoup
-!ifndef DISABLE_FANCY_PLUGIN
-!insertmacro SetPrefix libsoup
-File ${prefix}/bin/libsoup-2.4-1.dll
-!endif
-
 #######################################
 ### gmp
 !insertmacro SetPrefix gmp
@@ -542,9 +497,6 @@ File ${prefix}/lib/claws-mail/plugins/address_keeper.dll
 File ${prefix}/lib/claws-mail/plugins/attachwarner.dll
 File ${prefix}/lib/claws-mail/plugins/att_remover.dll
 File ${prefix}/lib/claws-mail/plugins/bsfilter.dll
-!ifndef DISABLE_FANCY_PLUGIN
-File ${prefix}/lib/claws-mail/plugins/fancy.dll
-!endif
 File ${prefix}/lib/claws-mail/plugins/fetchinfo.dll
 File ${prefix}/lib/claws-mail/plugins/keyword_warner.dll
 File ${prefix}/lib/claws-mail/plugins/libravatar.dll
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index b964cec..622b677 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -12,7 +12,6 @@ Delete "$INSTDIR\lib\claws-mail\plugins\address_keeper.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\attachwarner.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\att_remover.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\fancy.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\fetchinfo.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\keyword_warner.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\libravatar.dll"
@@ -62,35 +61,14 @@ Delete "$INSTDIR\libnettle-8.dll"
 ### gmp
 Delete "$INSTDIR\libgmp-10.dll"
 
-#######################################
-### libsoup
-Delete "$INSTDIR\libsoup-2.4-1.dll"
-
 #######################################
 ### libpsl
 Delete "$INSTDIR\libpsl-5.dll"
 
-#######################################
-### glib-networking
-Delete "$INSTDIR\lib\gio\modules\libgiognutls.dll"
-
 #######################################
 ### jpeg
 Delete "$INSTDIR\libjpeg-9.dll"
 
-#######################################
-### webkitgtk
-Delete "$INSTDIR\libwebkitgtk-1.0-0.dll"
-Delete "$INSTDIR\libjavascriptcoregtk-1.0-0.dll"
-
-#######################################
-### sqlite-autoconf
-Delete "$INSTDIR\libsqlite3-0.dll"
-
-#######################################
-### libwebp
-Delete "$INSTDIR\libwebp-7.dll"
-
 #######################################
 ### icu4c
 Delete "$INSTDIR\icudt75.dll"
@@ -107,10 +85,6 @@ Delete /REBOOTOK "$INSTDIR\libgpgmepp-6.dll"
 Delete /REBOOTOK "$INSTDIR\libgpgme-glib-11.dll"
 Delete "$INSTDIR\gpgme-w32spawn.exe"
 
-#######################################
-### libxslt
-Delete "$INSTDIR\libxslt-1.dll"
-
 #######################################
 ### libxml2
 Delete "$INSTDIR\libxml2-2.dll"
@@ -470,9 +444,17 @@ RMDir /r "$INSTDIR\share\locale"
 
 # Remove files that were previously distributed
 Delete "$INSTDIR\intl.dll"
+Delete "$INSTDIR\libwebkitgtk-1.0-0.dll"
+Delete "$INSTDIR\libjavascriptcoregtk-1.0-0.dll"
+Delete "$INSTDIR\libsoup-2.4-1.dll"
+Delete "$INSTDIR\libsqlite3-0.dll"
+Delete "$INSTDIR\libwebp-7.dll"
+Delete "$INSTDIR\libxslt-1.dll"
 Delete "$INSTDIR\include\assuan.h"
 Delete "$INSTDIR\include\gpg-error.h"
 Delete "$INSTDIR\include\gpgme.h"
+Delete "$INSTDIR\lib\claws-mail\plugins\fancy.dll"
+Delete "$INSTDIR\lib\gio\modules\libgiognutls.dll"
 Delete "$INSTDIR\lib\libassuan.imp"
 Delete "$INSTDIR\lib\libgpg-error.imp"
 Delete "$INSTDIR\lib\libgpg-assuan.imp"

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


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

More information about the Commits mailing list