[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.5-3-g9678216
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jul 31 14:23:25 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 9678216dc2f4eef17fc45d53b41470546bb93901 (commit)
via 34f011c2e398dfbe473105732375e5bca88466b3 (commit)
from 8376e1a941503d9d766ab33e9e6c79d10bd0f4d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9678216dc2f4eef17fc45d53b41470546bb93901
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 31 11:02:17 2015 +0200
Remove claws-mail from gpg4win
The removal includes: libetpan, libxml2, regex, crypt,
enchant, claws-mail, gtkhtml2-viewer and pthreads-win32
* Makefile.am (EXTRA_DIST): Remove claws related patches.
* README: Update build dependencies.
* configure.ac: Update tool checks.
* configure.ac: Remove claws related packages.
* packages/packages.current (libetpan, libxml2, regex, crypt),
(enchant, claws-mail, gtkhtml2-viewer, pthreads-win32): Removed.
* src/Makefile.am (EXTRA_DIST): Remove install / uninstall files.
* src/Makefile.am (gpg4win_spkgs): Remove packages.
* src/Makefile.am: Remove configure and build rules.
* src/config.nsi.in, src/gpg4win.nsi: Remove package definitions.
* src/inst-sections.nsi: Remove includes based on definitions.
* src/inst-sections.nsi: Include uninst-claws-mail.nsi for
full and light installers.
* src/inst-sections.nsi: Remove selection dependency code.
* src/installer.nsi (BeforeInstallHooks): New. Call multiple functions.
(CheckClawsUninstall): Check for claws-mail and prompt uninstall.
* src/mkportable-full.h, src/mkportable-light.h: Update accordingly.
* src/uninst-claws-mail-cmds.nsi: New. Uninstall commands for claws
and related packages.
* src/uninst-claws-mail.nsi: Create install and uninstall sections
to uninsall claws.
* patches/claws-mail-3.9.1/01-w64-mingw32.patch,
patches/claws-mail-3.9.1/02-ldap-opt.patch,
patches/claws-mail-3.9.1/03-all-crypto.patch,
patches/claws-mail-3.9.1/20-c416e89d.patch,
patches/claws-mail-3.9.1/21-66aa06c7.patch,
patches/claws-mail-3.9.1/50-configure.patch,
patches/claws-mail-3.9.1/51-version-file.patch,
patches/claws-mail-3.9.1/80-src-makefile.postcfg-build,
patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build,
patches/pthreads-w32-2-8-0-release/01-make.patch,
patches/pthreads-w32-2-8-0-release/
02-mingw_w64_timespec_compatibility.patch,
src/inst-bsfilter.nsi,
src/inst-claws-mail.nsi,
src/inst-crypt.nsi,
src/inst-enchant.nsi,
src/inst-gtkhtml2_viewer.nsi,
src/inst-libetpan.nsi,
src/inst-libxml2.nsi,
src/inst-pthreads-w32.nsi,
src/inst-regex.nsi,
src/uninst-bsfilter.nsi,
src/uninst-crypt.nsi,
src/uninst-enchant.nsi,
src/uninst-gtkhtml2_viewer.nsi,
src/uninst-libetpan.nsi,
src/uninst-libxml2.nsi,
src/uninst-pthreads-w32.nsi,
src/uninst-regex.nsi: Removed.
* po/POTFILES.in: Remove claws-mail
* po/ar.po, po/cz.po, po/es.po, po/fr.po, po/it.po, po/pt.po,
po/ru.po: Update automatically.
* po/de.po: Add translation for uninstall msg.
--
The removal of the unmaintained claws-mail version from gpg4win
has been requested by Andrej Kacain [1] on gpg4win-devel.
A maintained claws-mail Version is available as a standalone installer
from claws-mail.org.
Due to the removal of regex and pthreads-w32 GPG4WIN_PARALLEL
can now also be used properly.
1: http://lists.wald.intevation.org/pipermail/
gpg4win-devel/2015-July/001483.html
diff --git a/Makefile.am b/Makefile.am
index 5d28770..a0653a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,14 +27,6 @@ SUBDIRS = po packages doc src
EXTRA_DIST = autogen.sh README.GIT ONEWS \
doc/license-page doc/GPLv3 \
build-aux/git-log-footer build-aux/git-log-fix \
- patches/claws-mail-3.9.1/01-w64-mingw32.patch \
- patches/claws-mail-3.9.1/02-ldap-opt.patch \
- patches/claws-mail-3.9.1/03-all-crypto.patch \
- patches/claws-mail-3.9.1/20-c416e89d.patch \
- patches/claws-mail-3.9.1/21-66aa06c7.patch \
- patches/claws-mail-3.9.1/50-configure.patch \
- patches/claws-mail-3.9.1/51-version-file.patch \
- patches/claws-mail-3.9.1/80-src-makefile.postcfg-build \
patches/dirmngr-1.1.1/dirmngr-pth.patch \
patches/glib-2.41.5/01-socket.patch \
patches/gpgme-1.5.5/0001-Add-offline-mode-support-for-CMS-keylisting.patch \
@@ -54,10 +46,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch \
patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch \
patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch \
- patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
- patches/pthreads-w32-2-8-0-release/01-make.patch \
- patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/scute-1.4.0/workaround-broken-libtool.patch
diff --git a/README b/README
index 837a9c9..9404ae7 100644
--- a/README
+++ b/README
@@ -52,11 +52,9 @@ to be installed:
imagemagick
gs-common (gs)
docbook-utils
- sharutils (uudecode for claws icon patch)
gettext (msgfmt, dcgettext, gmsgfmt, xgettext for glib)
libglib2.0-dev (glib-genmarshal, glib-compile-{resources,schemas})
libgdk-pixbuf2.0-dev (gdk-pixbuf-csource)
- docbook-utils, ghostscript (claws-mail manual)
texlive (you need most modules)
texlive-latex-extra
texlive-lang-german
diff --git a/configure.ac b/configure.ac
index 32857e7..abf2e16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,18 +313,11 @@ AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
AC_CHECK_PROGS(GLIB_COMPILE_RESOURCES, glib-compile-resources)
AC_CHECK_PROGS(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
-AC_CHECK_PROGS(GS, gs)
-# For the claws manual we need:
-AC_CHECK_PROGS(DOCBOOK2HTML, docbook2html)
-AC_CHECK_PROGS(DOCBOOK2TXT, docbook2txt)
-AC_CHECK_PROGS(DOCBOOK2PS, docbook2ps)
-AC_CHECK_PROGS(DOCBOOK2PDF, docbook2pdf)
missing_opt_tools=
for i in GLIB_GENMARSHAL GLIB_COMPILE_SCHEMAS GLIB_COMPILE_RESOURCES \
- GDK_PIXBUF_CSOURCE GS \
- DOCBOOK2PDF DOCBOOK2TXT DOCBOOK2PS DOCBOOK2PDF; do
+ GDK_PIXBUF_CSOURCE; do
eval tmp='$'$i
if test -z "$tmp"; then
missing_opt_tools="$missing_opt_tools `echo $i | tr 'A-Z' 'a-z'`"
@@ -343,7 +336,6 @@ gpg4win_dup_sources=""
GPG4WIN_SPKG([zlib])
-GPG4WIN_BPKG_GNUWIN32([bsfilter])
GPG4WIN_BPKG_GTK([pkgconfig])
@@ -359,7 +351,6 @@ GPG4WIN_SPKG([gdk-pixbuf], [glib])
GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
glib gdk-pixbuf cairo])
GPG4WIN_SPKG([libpng], [pkgconfig])
-GPG4WIN_SPKG([enchant], [pkgconfig glib])
GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
@@ -373,7 +364,6 @@ GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
GPG4WIN_SPKG([curl], [zlib gnutls])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
w32pth zlib bzip2 adns pinentry])
-GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([scute], [libgpg-error libassuan])
@@ -382,14 +372,6 @@ GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
GPG4WIN_SPKG([libgsasl])
GPG4WIN_SPKG([libtasn1])
GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 libgcrypt])
-GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
-GPG4WIN_SPKG([libxml2], [zlib])
-GPG4WIN_SPKG([regex])
-GPG4WIN_SPKG([crypt])
-GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
- gpgme pthreads-w32 crypt regex libetpan gnutls dnl
- libxml2])
-GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
GPG4WIN_SPKG([w32pth])
GPG4WIN_SPKG([libiconv])
GPG4WIN_SPKG([gettext], [libiconv])
diff --git a/packages/packages.current b/packages/packages.current
index 43aa0ea..a79b208 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -59,26 +59,7 @@ chk 3c0ba2153560abfb08d88dcb016cd6b72e465db5
#
-# libetpan for claws
-#
-
-# (Kept on our own mirror due to Sourceforge/github peculiarities.)
-server ftp://ftp.g10code.com/mirrors/claws
-
-# We use a slighly patched version to avoid the need for g++. See below
-#file libetpan-0.58.tar.gz
-#chk 98a5689bbe99dc77d689c2ea1e8294f217a3b49c
-
-#file libetpan-1.1.tar.gz
-#chk 3476dc9142e0b78056446d2f143617708f8690b2
-
-server ftp://ftp.g10code.com/g10code/misc/
-file libetpan-0.58-g10-1.tar.bz2
-chk d7195498005d340ccd82e183de19163d16e56ec2
-
-
-#
-# curl for Claws plugins
+# curl for GnuPG
#
server http://curl.haxx.se/download
@@ -88,87 +69,6 @@ server http://curl.haxx.se/download
file curl-7.42.1.tar.bz2
chk f65708915875b8cb35edb51d8dd31440dc02fbd3
-
-#
-# libxml2 for Claws plugins
-
-# last-changed: 2015-06-05
-# by: ah
-# verified: Sig C744 15BA 7C9C 7F78 F02E 1DC3 4606 B8A5 DE95 BC1F
-server ftp://xmlsoft.org/libxml2
-
-file libxml2-2.9.2.tar.gz
-chk f46a37ea6d869f702e03f393c376760f3cbee673
-
-#
-# regex for Claws
-# (Kept on our own mirror due to Sourceforge and packaging pecularities.)
-# (Note that this is incompatible to various other variants of
-# regex.dll floating around, but this is what claws expects.)
-server ftp://ftp.g10code.com/g10code/misc
-file regex-20090805.tar.gz
-chk 56c87366f49916997729fc335747a6a55a2bacc3
-
-# Crypt for claws.
-# (Kept on our own mirror due to Sourceforge and packaging pecularities.)
-server ftp://ftp.g10code.com/g10code/misc
-file crypt-1.1.tar.gz
-chk 04b4c2ac296499d378f4a35bbeb1b129165b2e61
-
-#
-# bsfilter.exe for antispam in Claws
-#
-server http://www.claws-mail.org/win32
-
-#file bsfilter-1.0.16-bin.tar.gz
-#chk 5ed34f22ebf433d83cd3571309b5cbc52c45d6d2
-
-#file bsfilter-1.0.16-lib.tar.gz
-#chk c7fa5ec9c70c75b7b1bc852bac8eb0a5ec9e01ea
-
-#file bsfilter-1.0.16-src.tar.gz
-#chk fe718884dd7ca0652613a2cb5c302ac6323605d8
-
-#
-# Enchant for Claws
-#
-
-server http://www.abisource.com/downloads/enchant/1.6.0
-
-# checked: 2014-06-20 ah
-file enchant-1.6.0.tar.gz
-chk 321f9cf0abfa1937401676ce60976d8779c39536
-
-#
-# Claws
-#
-
-# (Kept on our own mirror due to Sourceforge peculiarities.)
-server ftp://ftp.g10code.com/mirrors/claws
-
-# checked: 2013-05-10 wk
-file claws-mail-3.9.1.tar.bz2
-chk ec3a787b34b07983d938f7d353e3cfd85167122b
-
-server http://www.claws-mail.org/downloads/plugins_obsolete
-
-# checked: 2013-05-10 wk
-file gtkhtml2_viewer-0.34.tar.gz
-chk 7f3f8a9e3f7bec443a51c890d1bbcd26049dde02
-
-
-#
-# Pthreads for Windows.
-#
-server ftp://sources.redhat.com/pub
-
-# checked: 2013-04-29 wk - There is a 2.9.1 but the release notes
-# don't tell anything about security critical
-# bugs. Thus we stay with 2.8.0 for now.
-# 2015-06-05 ah - ^ still applies
-file pthreads-win32/pthreads-w32-2-8-0-release.tar.gz
-chk da8371cb20e8e238f96a1d0651212f154d84a9ac
-
#
# GLIB
#
diff --git a/patches/claws-mail-3.9.1/01-w64-mingw32.patch b/patches/claws-mail-3.9.1/01-w64-mingw32.patch
deleted file mode 100755
index 51d5831..0000000
--- a/patches/claws-mail-3.9.1/01-w64-mingw32.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-Fixes for using i686-w64-mingw32.
-
-diff -urp orig/claws-mail-3.9.0/src/common/w32lib.h claws-mail-3.9.0/src/common/w32lib.h
---- orig/claws-mail-3.9.0/src/common/w32lib.h 2011-03-04 17:30:32.000000000 +0100
-+++ claws-mail-3.9.0/src/common/w32lib.h 2013-05-02 19:49:26.859688386 +0200
-@@ -54,7 +54,7 @@
-
- * w32_reg.c: Replaced g_free and g_strdup by regular C functions.
- (get_content_type_from_registry_with_ext): Ditto.
-- * w32_dirent.c (readdir): Ditto.
-+ * w32_dirent.c (readdir): Ditto.
- (opendir): Ditto.
- (closedir): Reformatted.
- (readdir): Reformatted, replaced use of g_strdup_printf and other
-@@ -76,17 +76,22 @@
- #include <stdio.h>
-
- #ifdef __MINGW32__
--#include <_mingw.h>
--#define MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 100 \
-- + __MINGW32_MINOR_VERSION)
--#include <wchar.h>
--#include <dirent.h>
--#include <sys/time.h>
--#endif
-+# include <_mingw.h>
-+# define MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 100 \
-+ + __MINGW32_MINOR_VERSION)
-+# define MINGW64_VERSION (__MINGW64_VERSION_MAJOR * 100 \
-+ + __MINGW64_VERSION_MINOR)
-+# include <wchar.h>
-+# include <dirent.h>
-+# include <sys/time.h>
-+# if MINGW64_VERSION >= 200
-+# include <sys/types.h>
-+# endif
-+#endif /* __MINGW32__ */
-
- /* Mingw32 3.4.4 defines interface to struct and thus breaks our own
- use of that symbol. Undef it here. */
--#if defined(_BASETYPS_H) && defined(interface)
-+#if defined(_BASETYPS_H) && defined(interface)
- #undef interface
- #endif
-
-@@ -123,9 +128,11 @@ typedef unsigned int uid_t;
-
- /* functions */
- /*** str ***/
--int strcasecmp( const char *s1, const char *s2 );
-
-+#if MINGW64_VERSION < 200
-+int strcasecmp( const char *s1, const char *s2 );
- int strncasecmp( const char *s1, const char *s2, size_t n );
-+#endif /* MINGW64_VERSION < 200 */
-
- /*** dir ***/
- #ifndef __MINGW32__
-@@ -166,12 +173,16 @@ DIR *opendir( const char *name );
- int closedir( DIR *dir );
- struct dirent *readdir( DIR *dir );
-
-+/* Mingw64 (32 and 64 bit) defines timezone but also sets the mingw32
-+ version macros to 3.11. Thus we need an extra test. */
- #if defined (__MINGW32__) && MINGW32_VERSION < 312
-+#if MINGW64_VERSION < 200
- struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
- };
- #endif
-+#endif
-
- /*** stat ***/
- int lstat( const char *file_name, struct stat *buf );
-@@ -181,8 +192,10 @@ pid_t waitpid( pid_t pid, int *status, i
-
- /*** sys/time ***/
- #if ! defined (__MINGW32__) || MINGW32_VERSION < 312
-+#if MINGW64_VERSION < 200
- int gettimeofday( struct timeval *tv, struct timezone *tz );
- #endif
-+#endif
-
- /*** unistd ***/
- int setpgid( pid_t pid, pid_t pgid );
-@@ -193,14 +206,18 @@ unsigned int sleep( unsigned int seconds
- /*** stdlib ***/
- long int random( void );
- void srandom( unsigned int seed );
-+#if MINGW64_VERSION < 200
- int truncate( const char *path, off_t length );
-+#endif /* MINGW64_VERSION < 200 */
-
- /*** signal ***/
- int kill( pid_t pid, int sig );
-
- /*** stdio ***/
-+#if MINGW64_VERSION < 200
- FILE *popen( const char *command, const char *type );
- int pclose( FILE *stream );
-+#endif /* MINGW64_VERSION < 200 */
-
- /*** w32_account.c ***/
- int w32_is_administrator (void);
-diff -urp orig/claws-mail-3.9.0/src/common/w32_stdio.c claws-mail-3.9.0/src/common/w32_stdio.c
---- orig/claws-mail-3.9.0/src/common/w32_stdio.c 2005-12-20 18:43:38.000000000 +0100
-+++ claws-mail-3.9.0/src/common/w32_stdio.c 2013-05-02 19:49:26.859688386 +0200
-@@ -3,6 +3,8 @@
-
- #include "w32lib.h"
-
-+#if MINGW64_VERSION < 200
-+
- FILE *popen( const char *command, const char *type ){
- return NULL;
- }
-@@ -10,3 +12,6 @@ FILE *popen( const char *command, const
- int pclose( FILE *stream ){
- return -1;
- }
-+
-+#endif
-+
-diff -urp orig/claws-mail-3.9.0/src/common/w32_stdlib.c claws-mail-3.9.0/src/common/w32_stdlib.c
---- orig/claws-mail-3.9.0/src/common/w32_stdlib.c 2007-07-11 18:35:56.000000000 +0200
-+++ claws-mail-3.9.0/src/common/w32_stdlib.c 2013-05-02 19:49:26.859688386 +0200
-@@ -31,6 +31,8 @@ void srandom( unsigned int seed ){
- srand( seed );
- }
-
-+#if MINGW64_VERSION < 200
- int truncate( const char *path, off_t length ){
- return -1;
- }
-+#endif /* MINGW64_VERSION < 200 */
-diff -urp orig/claws-mail-3.9.0/src/common/w32_string.c claws-mail-3.9.0/src/common/w32_string.c
---- orig/claws-mail-3.9.0/src/common/w32_string.c 2007-07-11 18:35:56.000000000 +0200
-+++ claws-mail-3.9.0/src/common/w32_string.c 2013-05-02 19:49:26.859688386 +0200
-@@ -24,6 +24,8 @@
-
- #include "w32lib.h"
-
-+#if MINGW64_VERSION < 200
-+
- int strcasecmp( const char *s1, const char *s2 ){
- size_t len1, len2, len;
-
-@@ -50,3 +52,4 @@ int strncasecmp( const char *s1, const c
- return 0;
- }
-
-+#endif /* MINGW64_VERSION < 200 */
-diff -urp orig/claws-mail-3.9.0/src/common/w32_time.c claws-mail-3.9.0/src/common/w32_time.c
---- orig/claws-mail-3.9.0/src/common/w32_time.c 2007-12-06 23:17:52.000000000 +0100
-+++ claws-mail-3.9.0/src/common/w32_time.c 2013-05-02 19:49:26.859688386 +0200
-@@ -25,6 +25,7 @@
- #include "w32lib.h"
-
- #if ! defined (__MINGW32__) || MINGW32_VERSION < 312
-+#if MINGW64_VERSION < 200
- int gettimeofday( struct timeval *tv, struct timezone *tz ){
- struct _timeb tstruct;
- _ftime( &tstruct );
-@@ -33,3 +34,4 @@ int gettimeofday( struct timeval *tv, st
- return 1;
- }
- #endif
-+#endif
diff --git a/patches/claws-mail-3.9.1/02-ldap-opt.patch b/patches/claws-mail-3.9.1/02-ldap-opt.patch
deleted file mode 100755
index 4c81bcc..0000000
--- a/patches/claws-mail-3.9.1/02-ldap-opt.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-Fixes missing LDAP_OPT_SUCCESS.
-
---- orig/claws-mail-3.9.0/src/ldaputil.h 2012-05-27 19:16:13.000000000 +0200
-+++ claws-mail-3.9.0/src/ldaputil.h 2013-05-02 19:58:31.275669432 +0200
-@@ -14,7 +14,7 @@
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-- *
-+ *
- */
-
- /*
-@@ -37,6 +37,9 @@
- #define ldap_unbind_ext(ld,x,y) ldap_unbind_s(ld)
- #define LDAP_ADMINLIMIT_EXCEEDED LDAP_ADMIN_LIMIT_EXCEEDED
- #define timeval l_timeval
-+#ifndef LDAP_OPT_SUCCESS
-+# define LDAP_OPT_SUCCESS 0
-+#endif
- #endif
- /* Function Prototypes */
- GList *ldaputil_read_basedn ( const gchar *host, const gint port,
diff --git a/patches/claws-mail-3.9.1/03-all-crypto.patch b/patches/claws-mail-3.9.1/03-all-crypto.patch
deleted file mode 100755
index 3476863..0000000
--- a/patches/claws-mail-3.9.1/03-all-crypto.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-
---- a/src/common/plugin.c 2013-05-06 17:12:52.454020853 +0200
-+++ b/src/common/plugin.c 2013-05-06 17:09:00.954027453 +0200
-@@ -604,13 +604,11 @@
- void plugin_load_standard_plugins (void)
- {
- static const char *names[] = {
--#ifdef G_OS_WIN32
- "pgpmime",
- "pgpinline",
--#else
-+ "smime",
- /* post-2.5 maybe
- "bogofilter", */
--#endif
- NULL
- };
- int i;
diff --git a/patches/claws-mail-3.9.1/20-c416e89d.patch b/patches/claws-mail-3.9.1/20-c416e89d.patch
deleted file mode 100755
index 27da02a..0000000
--- a/patches/claws-mail-3.9.1/20-c416e89d.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-commit c416e89d2a88b817eaffe17a801bf97f3e510018
-Author: Colin Leroy <colin at colino.net>
-Date: Tue May 7 12:46:40 2013 +0200
-
- Never decode multipart/* or message/* parts, as RFC states.
-
-
-diff --git a/src/procmime.c b/src/procmime.c
-index 95b326a..79dc7c3 100644
---- a/src/procmime.c
-+++ b/src/procmime.c
-@@ -349,8 +349,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
- ))
- return TRUE;
-
-- if (mimeinfo->type == MIMETYPE_MULTIPART &&
-- !strcasecmp(mimeinfo->subtype, "signed"))
-+ if (mimeinfo->type == MIMETYPE_MULTIPART || mimeinfo->type == MIMETYPE_MESSAGE)
- return TRUE;
-
- infp = procmime_fopen(mimeinfo->data.filename, "rb");
diff --git a/patches/claws-mail-3.9.1/21-66aa06c7.patch b/patches/claws-mail-3.9.1/21-66aa06c7.patch
deleted file mode 100755
index 97866e9..0000000
--- a/patches/claws-mail-3.9.1/21-66aa06c7.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-commit 66aa06c74413386eeb2198365e45c98df75e2782
-Author: Colin Leroy <colin at colino.net>
-Date: Tue May 7 12:47:25 2013 +0200
-
- Usual Windows fixes
-
- Modified src/plugins/address_keeper/claws.def
-diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/address_keeper/claws.def
-index e777d73..14daf07 100644
---- a/src/plugins/address_keeper/claws.def
-+++ b/src/plugins/address_keeper/claws.def
-@@ -37,3 +37,5 @@ end_address_completion
- addressbook_peek_folder_exists
- prefs_common_translated_header_name
- addressbook_folder_selection
-+matcherlist_new_from_lines
-+gtkut_get_options_frame
- Modified src/plugins/attachwarner/claws.def
-diff --git a/src/plugins/attachwarner/claws.def b/src/plugins/attachwarner/claws.def
-index 5d8ff75..64010d0 100644
---- a/src/plugins/attachwarner/claws.def
-+++ b/src/plugins/attachwarner/claws.def
-@@ -28,3 +28,4 @@ prefs_set_default
- prefs_write_open
- prefs_write_param
- prefs_common_get_prefs
-+matcherlist_new_from_lines
- Modified src/plugins/pgpcore/claws.def
-diff --git a/src/plugins/pgpcore/claws.def b/src/plugins/pgpcore/claws.def
-index 265d11f..fe8c176 100644
---- a/src/plugins/pgpcore/claws.def
-+++ b/src/plugins/pgpcore/claws.def
-@@ -76,3 +76,4 @@ textview_init
- textview_set_font
- textview_show_icon
- textview_show_mime_part
-+fast_strftime
- Modified src/plugins/pgpcore/sgpgme.c
-diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
-index 71ec5eb..a2d7fa3 100644
---- a/src/plugins/pgpcore/sgpgme.c
-+++ b/src/plugins/pgpcore/sgpgme.c
-@@ -294,7 +294,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
- }
-
- memset(buf, 0, sizeof(buf));
-- fast_strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&sig->timestamp, <));
-+ fast_strftime(buf, sizeof(buf)-1, prefs_common_get_prefs()->date_format, localtime_r(&sig->timestamp, <));
- g_string_append_printf(siginfo,
- _("Signature made on %s using %s key ID %s\n"),
- buf, keytype, keyid);
diff --git a/patches/claws-mail-3.9.1/50-configure.patch b/patches/claws-mail-3.9.1/50-configure.patch
deleted file mode 100755
index 06f6821..0000000
--- a/patches/claws-mail-3.9.1/50-configure.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-patch -p0 -l -f $* < $0
-exit $?
-
-libsoup is not required but it terminates anyway.
-
-
---- configure.orig 2013-05-10 10:50:50.524750367 +0200
-+++ configure 2013-05-10 10:53:59.856738695 +0200
-@@ -20482,31 +20482,6 @@
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSOUP_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (libsoup-2.4) were not met:
--
--$LIBSOUP_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables LIBSOUP_CFLAGS
--and LIBSOUP_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details." "$LINENO" 5
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables LIBSOUP_CFLAGS
--and LIBSOUP_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
- else
- LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
- LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
diff --git a/patches/claws-mail-3.9.1/51-version-file.patch b/patches/claws-mail-3.9.1/51-version-file.patch
deleted file mode 100755
index 0e1d378..0000000
--- a/patches/claws-mail-3.9.1/51-version-file.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-#
-# Hack to copy the ugly version file
-#
-set -e
-echo 'copying the version file' >&2
-mkdir ../claws-mail-3.9.1-build || true
-cp version version.in ../claws-mail-3.9.1-build/
-exit $?
diff --git a/patches/claws-mail-3.9.1/80-src-makefile.postcfg-build b/patches/claws-mail-3.9.1/80-src-makefile.postcfg-build
deleted file mode 100755
index 30f39cf..0000000
--- a/patches/claws-mail-3.9.1/80-src-makefile.postcfg-build
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Hack to remove bad use of -export-all-symbols. That option is already
-# correcty provided by libtool using -Wl,.
-#
-set -e
-echo 'Fixing src/Makefile' >&2
-cd src
-sed -i 's/ -export-all-symbols//' Makefile
-exit $?
diff --git a/patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build b/patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build
deleted file mode 100755
index 68b722a..0000000
--- a/patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
---- src/Makefile.orig 2013-05-10 12:39:57.612558040 +0200
-+++ src/Makefile 2013-05-10 12:40:23.440554587 +0200
-@@ -261,7 +261,7 @@
- top_builddir = ..
- top_srcdir = ../../gtkhtml2_viewer-0.34
- EXTRA_DIST = claws.def plugin.def version.rc
--LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
-+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
- sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
diff --git a/patches/pthreads-w32-2-8-0-release/01-make.patch b/patches/pthreads-w32-2-8-0-release/01-make.patch
deleted file mode 100755
index 72c51a2..0000000
--- a/patches/pthreads-w32-2-8-0-release/01-make.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-2005-11-17 Werner Koch <wk at g10code.com>
-
- * GNUmakefile (install): Add new target.
-
-
---- pthreads-w32-2-7-0-release.orig/GNUmakefile 2005-06-03 10:36:27.000000000 +0200
-+++ pthreads-w32-2-7-0-release/GNUmakefile 2005-11-17 10:35:41.000000000 +0100
-@@ -541,6 +541,22 @@
- $(RANLIB) $(GC_LIB)
- echo touched > $(GC_STATIC_STAMP)
-
-+
-+install:
-+ set -e; \
-+ for i in include lib bin ; do \
-+ mkdir -p "$(DESTDIR)$(prefix)/$$i" || true ; \
-+ done; \
-+ for i in pthread.h sched.h semaphore.h ; do \
-+ cp "$$i" "$(DESTDIR)$(prefix)/include/$$i" ; \
-+ done; \
-+ for i in libpthread*.a pthread.def ; do \
-+ cp "$$i" "$(DESTDIR)$(prefix)/lib/$$i" ; \
-+ done; \
-+ for i in pthread*.dll ; do \
-+ cp "$$i" "$(DESTDIR)$(prefix)/bin/$$i" ; \
-+ done
-+
- clean:
- -$(RM) *~
- -$(RM) *.i
diff --git a/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch b/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
deleted file mode 100755
index cc83013..0000000
--- a/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Ignore whitespace is necessary because the original context of the patch
-# contains whitespace errors
-patch -p0 -f --ignore-whitespace $* < $0
-exit $?
-
-2013-04-18 Andre Heinecke <aheinecke at intevation.de>
-
- * pthread.h: Handle that struct timespec might be defined
- on windows without _UWIN definition.
-
---- pthread.h.orig 2013-04-18 15:52:11.470656381 +0000
-+++ pthread.h 2013-04-18 15:52:14.762630601 +0000
-@@ -110,7 +110,6 @@
- #endif
-
- #ifdef _UWIN
--# define HAVE_STRUCT_TIMESPEC 1
- # define HAVE_SIGNAL_H 1
- # undef HAVE_CONFIG_H
- # pragma comment(lib, "pthread")
-@@ -227,6 +226,12 @@
- #include <setjmp.h>
- #include <limits.h>
-
-+// Check if someone defined timespec
-+#if defined(_UWIN) || defined(_TIMESPEC_DEFINED)
-+# define HAVE_STRUCT_TIMESPEC 1
-+#endif
-+
-+
- /*
- * Boolean values to make us independent of system includes.
- */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e8cd016..b291bfd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@ src/g4wihelp.nsi
src/gpg4win.nsi
src/gpg4win-src.nsi
src/installer.nsi
-src/inst-claws-mail.nsi
src/inst-gnupg2.nsi
src/inst-gpa.nsi
src/inst-gpg4win.nsi
diff --git a/po/ar.po b/po/ar.po
index 6aa5fff..0931996 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -272,26 +272,18 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä WinPT."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä DirMngr."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "ÈÑãÌíÉ ÇáÈÑíÏ Claws"
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "ÇÚÑÖ ßÊíøÈ ÈÑíÏ Claws Úáì ÇáæÈ"
-
#, fuzzy
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -384,6 +376,22 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä DirMngr."
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "ÈÑãÌíÉ ÇáÈÑíÏ Claws"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "ÇÚÑÖ ßÊíøÈ ÈÑíÏ Claws Úáì ÇáæÈ"
+
#, fuzzy
#~ msgctxt "DESC_Menu_compendium_de_html"
#~ msgid "Show the Gpg4win Compendium (html, German)"
diff --git a/po/cz.po b/po/cz.po
index 1c27ae4..0424956 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -279,25 +279,17 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Pokus o ukonèení pravdìpodobnì bìžícího programu WinPT."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "Pokus o ukonèení pravdìpodobnì bìžícího programu DirMngr."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
-msgstr "Chcete nastavit Claws Mail jako váš pøednastavený poštovní program?"
-
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "Claws Mail-User-Agent"
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Spustit Claws Mail."
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Ukázat on-line manuál programu Claws Mail"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
+msgstr ""
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -386,6 +378,26 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Ukázat Gpg4win Compendium (pdf, anglicky)"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "Pokus o ukonèení pravdìpodobnì bìžícího programu DirMngr."
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr "Chcete nastavit Claws Mail jako váš pøednastavený poštovní program?"
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "Claws Mail-User-Agent"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Spustit Claws Mail."
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Ukázat on-line manuál programu Claws Mail"
+
#~ msgctxt "T_SMIMEHeaderText"
#~ msgid "Define trustable root certificates"
#~ msgstr "Vyberte dùveryhodné koøenové certifikáty"
diff --git a/po/de.po b/po/de.po
index 525232d..fc3245c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -332,27 +332,27 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Ein möglicherweise laufendes WinPT wird jetzt automatisch beendet."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
-msgstr "Möchten Sie Claws-Mail als Ihr E-Mail-Standardprogramm auswählen?"
-
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-"Claws Mail ist ein vollständiges Mail- und News-Programm mit sehr guter "
-"Unterstützung für GnuPG."
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Das Mailprogramm Claws Mail aufrufen."
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Das englische Handbuch zu Claws Mail anzeigen"
+"Eine alte Version von Claws Mail wurde im Installationsverzeichnis "
+"gefunden.\n"
+"Claws Mail ist nicht länger ein Teil von Gpg4win, da es als eigenständiges "
+"Installationspaket verfügbar ist.\n"
+"Wenn Sie Claws Mail weiterhin verwenden wollen sollten Sie es nun "
+"deinstallieren und eine aktuelle Version von der folgenden Website "
+"beziehen:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Claws Mail aus Gpg4win jetzt deinstallieren?"
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -447,6 +447,29 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Gpg4win-Kompendium (pdf, englisch)"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr ""
+#~ "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr "Möchten Sie Claws-Mail als Ihr E-Mail-Standardprogramm auswählen?"
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr ""
+#~ "Claws Mail ist ein vollständiges Mail- und News-Programm mit sehr guter "
+#~ "Unterstützung für GnuPG."
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Das Mailprogramm Claws Mail aufrufen."
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Das englische Handbuch zu Claws Mail anzeigen"
+
#~ msgctxt "T_SMIMEHeaderText"
#~ msgid "Define trustable root certificates"
#~ msgstr "Vertrauenswürdige Wurzelzertifikate festlegen"
diff --git a/po/es.po b/po/es.po
index 05eab0c..f6694f0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -279,27 +279,18 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Intentado cerrar instancias de WinPT que podrían estar ejecutándose."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr ""
-"Intentando cerrar instancias de DirMngr que podrían estar ejecutándose."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "Cliente de correo Claws."
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Ejecutar el cliente de correo Claws."
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Mostrar el manual en línea de Claws"
-
#, fuzzy
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -385,6 +376,23 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr ""
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr ""
+#~ "Intentando cerrar instancias de DirMngr que podrían estar ejecutándose."
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "Cliente de correo Claws."
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Ejecutar el cliente de correo Claws."
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Mostrar el manual en línea de Claws"
+
#~ msgctxt "DESC_SEC_eudoragpg"
#~ msgid "EudoraGPG is a plugin for the Eudora mail program"
#~ msgstr "EudoraGPG es un plugin para el cliente de correo Eudora"
diff --git a/po/fr.po b/po/fr.po
index 8382776..82253ca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -283,28 +283,17 @@ msgid "Trying to shutdown a possible running instance of WinPT."
msgstr ""
"Tentative de quitter une éventuelle instance de WinPT en cours d'exécution."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr ""
-"Tentative de quitter une éventuelle instance de DirMngr en cours d'exécution."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-"Voulez-vous faire de Claws Mail votre client de messagerie électronique par "
-"défaut ?"
-
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "Claws Mail-User-Agent"
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Lancer le programme de messagerie Claws Mail."
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Afficher le manuel en ligne de Claws Mail"
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -389,6 +378,30 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Afficher le Compendium de Gpg4win (PDF, anglais)"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr ""
+#~ "Tentative de quitter une éventuelle instance de DirMngr en cours "
+#~ "d'exécution."
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr ""
+#~ "Voulez-vous faire de Claws Mail votre client de messagerie électronique "
+#~ "par défaut ?"
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "Claws Mail-User-Agent"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Lancer le programme de messagerie Claws Mail."
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Afficher le manuel en ligne de Claws Mail"
+
#~ msgctxt "T_SMIMEHeaderText"
#~ msgid "Define trustable root certificates"
#~ msgstr "Définir les certificats racine dignes de confiance"
diff --git a/po/it.po b/po/it.po
index dabf859..6d02018 100644
--- a/po/it.po
+++ b/po/it.po
@@ -285,25 +285,17 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Prova di arresto di una possibile istanza di WinPT."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "Prova di arresto di una possibile istanza di DirMngr."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
-msgstr "Volete rendere Claws Mail il vostro cliente di posta predefinito?"
-
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "Claws Mail-User-Agent"
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Esegui il programma Claws Mail"
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Mostra il manuale in linea di Claws Mail"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
+msgstr ""
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -388,6 +380,26 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Mostra il riassunto di Gpg4win (pdf, Inglese)"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "Prova di arresto di una possibile istanza di DirMngr."
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr "Volete rendere Claws Mail il vostro cliente di posta predefinito?"
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "Claws Mail-User-Agent"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Esegui il programma Claws Mail"
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Mostra il manuale in linea di Claws Mail"
+
#~ msgctxt "T_SMIMEHeaderText"
#~ msgid "Define trustable root certificates"
#~ msgstr "Definisca i certificati affidabili di base"
diff --git a/po/pt.po b/po/pt.po
index e55e0a7..21704a2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -284,25 +284,17 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "A tentar encerrar uma possível instância do WinPT em execução."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "A tentar encerrar uma possível instância do DirMngr em execução."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
-msgstr "Queres tornar o Claws Mail o teu cliente de e-mail por defeito?"
-
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "Claws Mail-User-Agent"
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Executar o programa de e-mail Claws."
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Mostrar o manual online do Claws Mail"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
+msgstr ""
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -384,6 +376,26 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Mostrar o Compêndio Gpg4win (pdf, Inglês)"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "A tentar encerrar uma possível instância do DirMngr em execução."
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr "Queres tornar o Claws Mail o teu cliente de e-mail por defeito?"
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "Claws Mail-User-Agent"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Executar o programa de e-mail Claws."
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Mostrar o manual online do Claws Mail"
+
#~ msgctxt "DESC_Menu_compendium_de_html"
#~ msgid "Show the Gpg4win Compendium (html, German)"
#~ msgstr "Mostrar o Compêndio Gpg4win (html, Alemão)"
diff --git a/po/ru.po b/po/ru.po
index 4de12d8..09c5392 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -280,26 +280,18 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà WinPT. Ïîïðîáóåì çàêðûòü åå."
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà DirMngr. Ïîïðîáóåì çàêðûòü åå."
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
-msgstr "Ïî÷òîâûé êëèåíò Claws"
-
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "Çàïóñê ïî÷òîâîé ïðîãðàììû Claws."
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ê ïî÷òîâîìó êëèåíòó Claws Mail"
-
#, fuzzy
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
@@ -392,6 +384,22 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà DirMngr. Ïîïðîáóåì çàêðûòü åå."
+
+#~ msgctxt "DESC_SEC_claws_mail"
+#~ msgid "Claws Mail-User-Agent"
+#~ msgstr "Ïî÷òîâûé êëèåíò Claws"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "Çàïóñê ïî÷òîâîé ïðîãðàììû Claws."
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ê ïî÷òîâîìó êëèåíòó Claws Mail"
+
#, fuzzy
#~ msgctxt "DESC_Menu_compendium_de_html"
#~ msgid "Show the Gpg4win Compendium (html, German)"
diff --git a/src/Makefile.am b/src/Makefile.am
index ee34e84..ccd3269 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,11 +35,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-libtasn1.nsi uninst-libtasn1.nsi \
inst-gnutls.nsi uninst-gnutls.nsi \
inst-curl.nsi uninst-curl.nsi \
- inst-libxml2.nsi uninst-libxml2.nsi \
- inst-libetpan.nsi uninst-libetpan.nsi \
- inst-claws-mail.nsi uninst-claws-mail.nsi \
- inst-gtkhtml2_viewer.nsi uninst-gtkhtml2_viewer.nsi \
- inst-crypt.nsi uninst-crypt.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
inst-gettext.nsi uninst-gettext.nsi \
inst-libffi.nsi uninst-libffi.nsi \
@@ -60,7 +55,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-libksba.nsi uninst-libksba.nsi \
inst-adns.nsi uninst-adns.nsi \
inst-libpng.nsi uninst-libpng.nsi \
- inst-enchant.nsi uninst-enchant.nsi \
inst-compendium.nsi uninst-compendium.nsi \
inst-man_advanced_de.nsi uninst-man_advanced_de.nsi \
inst-man_advanced_en.nsi uninst-man_advanced_en.nsi \
@@ -69,16 +63,14 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-pango.nsi uninst-pango.nsi \
inst-pinentry.nsi uninst-pinentry.nsi \
inst-pkgconfig.nsi uninst-pkgconfig.nsi \
- inst-pthreads-w32.nsi uninst-pthreads-w32.nsi \
- inst-regex.nsi uninst-regex.nsi \
inst-w32pth.nsi uninst-w32pth.nsi \
inst-zlib.nsi uninst-zlib.nsi \
- inst-bsfilter.nsi uninst-bsfilter.nsi \
inst-qt.nsi uninst-qt.nsi \
inst-dbus.nsi uninst-dbus.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
inst-bzip2.nsi uninst-bzip2.nsi \
+ uninst-claws-mail.nsi uninst-claws-mail-cmds.nsi \
inst-final.nsi
SUBDIRS = dictionaries
@@ -102,10 +94,9 @@ CLEANFILES = g4wihelp.dll versioninfo.txt $(README_files) $(HOWTO_files) \
# Supported source packages.
gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
- libgpg-error gpgme gpgol gpgex libpng enchant \
- gpa libgsasl libtasn1 opencdk gnutls curl libxml2 \
- libetpan claws-mail gtkhtml2_viewer \
- vcalendar rssyl gnupg2 pinentry libassuan libksba libgcrypt \
+ libgpg-error gpgme gpgol gpgex libpng \
+ gpa libgsasl libtasn1 opencdk gnutls curl \
+ gnupg2 pinentry libassuan libksba libgcrypt \
adns dirmngr w32pth scute paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
@@ -222,8 +213,6 @@ gpg4win_pkg_adns_configure = --silent
gpg4win_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
-gpg4win_pkg_enchant_configure = CPPFLAGS=\"-I$(idir)/include -UENCHANT_GLOBAL_MODULE_DIR -UENCHANT_GLOBAL_ORDERING -UENCHANT_MYSPELL_DICT_DIR -UENCHANT_USPELL_DICT_DIR\" LDFLAGS=\"-L$(idir)/lib\"
-
gpg4win_pkg_dirmngr_configure = \
--with-gpg-error-prefix=$(idir) \
--with-ksba-prefix=$(idir) \
@@ -308,73 +297,22 @@ gpg4win_pkg_curl_configure = \
--with-gnutls --without-ca-bundle --with-libiconv-prefix=$(idir) \
CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
-gpg4win_pkg_libxml2_configure = \
- --enable-shared --without-python --with-iconv=$(idir)
-
-# The CFLAGS are needed to find pthread-w32.
-gpg4win_pkg_libetpan_configure = --with-gnutls \
- CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
-
-gpg4win_pkg_claws_mail_configure = \
- --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
- --with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
- --with-config-dir="Claws-mail" --enable-pthread --enable-gnutls \
- --enable-libetpan --disable-dbus --disable-valgrind --disable-ipv6 \
- --disable-jpilot --disable-startup-notification \
- --disable-spamassassin-plugin --disable-bogofilter-plugin \
- --disable-fancy-plugin --disable-geolocation-plugin \
- --disable-acpi_notifier-plugin --disable-clamd-plugin \
- --disable-bogofilter-plugin --disable-spamassassin-plugin \
- --disable-perl-plugin --disable-python-plugin --disable-demo-plugin \
- --disable-newmail-plugin --disable-mailmbox-plugin
-
-
-# This is not anymore needed sinces 3.8.0 already builds a PDF version.
-# define gpg4win_pkg_claws_mail_post_install
-# (for i in de en ; do \
-# (cd $$$${pkgidir}/share/doc/claws-mail/manual/$$$${i}; \
-# ps2pdf claws-mail-manual.ps); \
-# done)
-# endef
-
-
-gpg4win_pkg_gtkhtml2_viewer_configure = \
- --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
-
-gpg4win_pkg_vcalendar_configure = \
- --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
-
-gpg4win_pkg_rssyl_configure = \
- --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
-
gpg4win_pkg_scute_configure = --silent \
--with-gpg-error-prefix=$(idir) --with-libassuan-prefix=$(idir)
gpg4win_pkg_paperkey_configure = --silent
# Supported make-only source packages.
-gpg4win_mpkgs = pthreads-w32 bzip2 zlib crypt
+gpg4win_mpkgs = bzip2 zlib
# Extra options for the make invocations for individual packages.
# make_flags is used for building, make_args_inst is used for installing.
-gpg4win_pkg_pthreads_w32_make_args = \
- prefix=$(idir) CROSS=$(host_alias)- clean GC-inlined
-
-gpg4win_pkg_pthreads_w32_make_args_inst = \
- prefix=$$$${pkgidir} CROSS=$(host_alias)-
-
gpg4win_pkg_bzip2_make_args = \
CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
gpg4win_pkg_bzip2_make_args_inst = \
PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
-gpg4win_pkg_crypt_make_args = \
- CC=$(CC) AR=$(AR)
-
-gpg4win_pkg_crypt_make_args_inst = \
- prefix=$$$${pkgidir}
-
gpg4win_pkg_zlib_make_args = \
-fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
@@ -426,12 +364,6 @@ echo "dlpreopen=''" >> lib/libz.la; \
echo "libdir=\"$$$${pkgidir}/lib\"" >> lib/libz.la)
endef
-# To make sure that we link against the static versions we need
-# remove the import libs from crypt
-#define gpg4win_pkg_crypt_post_install
-#(cd $$$${pkgidir}/lib && rm libcrypt.dll.a libcrypt.lib)
-#endef
-
# We need to fix the prefix in the various packages using pkgconfig,
# or we can't substitute it properly in our pkg-config wrapper.
# glib also installs an empty charset.alias for mingw which creates
@@ -487,11 +419,6 @@ define gpg4win_pkg_libpng_post_install
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
-define gpg4win_pkg_enchant_post_install
- (cd $$$${pkgidir}; \
- perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
-endef
-
define gpg4win_pkg_libgsasl_post_install
(cd $$$${pkgidir}; \
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
diff --git a/src/config.nsi.in b/src/config.nsi.in
index fe9be38..9a24f38 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -120,44 +120,10 @@
!define gpg4win_pkg_curl @gpg4win_pkg_curl@
!define gpg4win_pkg_curl_version @gpg4win_pkg_curl_version@
- at HAVE_PKG_LIBXML2@
-!define gpg4win_pkg_libxml2 @gpg4win_pkg_libxml2@
-!define gpg4win_pkg_libxml2_version @gpg4win_pkg_libxml2_version@
-
- at HAVE_PKG_LIBETPAN@
-!define gpg4win_pkg_libetpan @gpg4win_pkg_libetpan@
-!define gpg4win_pkg_libetpan_version @gpg4win_pkg_libetpan_version@
-
- at HAVE_PKG_BSFILTER@
-!define gpg4win_pkg_bsfilter @gpg4win_pkg_bsfilter@
-!define gpg4win_pkg_bsfilter_version @gpg4win_pkg_bsfilter_version@
-!define gpg4win_pkg_bsfilter_dev @gpg4win_pkg_bsfilter_dev@
-!define gpg4win_pkg_bsfilter_src @gpg4win_pkg_bsfilter_src@
-
- at HAVE_PKG_REGEX@
-!define gpg4win_pkg_regex @gpg4win_pkg_regex@
-!define gpg4win_pkg_regex_version @gpg4win_pkg_regex_version@
-
- at HAVE_PKG_CRYPT@
-!define gpg4win_pkg_crypt @gpg4win_pkg_crypt@
-!define gpg4win_pkg_crypt_version @gpg4win_pkg_crypt_version@
-
- at HAVE_PKG_CLAWS_MAIL@
-!define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
-!define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
-
- at HAVE_PKG_GTKHTML2_VIEWER@
-!define gpg4win_pkg_gtkhtml2_viewer @gpg4win_pkg_gtkhtml2_viewer@
-!define gpg4win_pkg_gtkhtml2_viewer_version @gpg4win_pkg_gtkhtml2_viewer_version@
-
@HAVE_PKG_ZLIB@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
!define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
- at HAVE_PKG_PTHREADS_W32@
-!define gpg4win_pkg_pthreads_w32 @gpg4win_pkg_pthreads_w32@
-!define gpg4win_pkg_pthreads_w32_version @gpg4win_pkg_pthreads_w32_version@
-
@HAVE_PKG_BZIP2@
!define gpg4win_pkg_bzip2 @gpg4win_pkg_bzip2@
!define gpg4win_pkg_bzip2_version @gpg4win_pkg_bzip2_version@
@@ -166,10 +132,6 @@
!define gpg4win_pkg_libpng @gpg4win_pkg_libpng@
!define gpg4win_pkg_libpng_version @gpg4win_pkg_libpng_version@
- at HAVE_PKG_ENCHANT@
-!define gpg4win_pkg_enchant @gpg4win_pkg_enchant@
-!define gpg4win_pkg_enchant_version @gpg4win_pkg_enchant_version@
-
@HAVE_PKG_PKGCONFIG@
!define gpg4win_pkg_pkgconfig @gpg4win_pkg_pkgconfig@
!define gpg4win_pkg_pkgconfig_version @gpg4win_pkg_pkgconfig_version@
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index d89b354..4f0b599 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -62,51 +62,9 @@
;!ifdef HAVE_PKG_GNUTLS
;!undef HAVE_PKG_GNUTLS
;!endif
-!ifdef HAVE_PKG_LIBXML2
-!undef HAVE_PKG_LIBXML2
-!endif
-!ifdef HAVE_PKG_LIBETPAN
-!undef HAVE_PKG_LIBETPAN
-!endif
-!ifdef HAVE_PKG_BSFILTER
-!undef HAVE_PKG_BSFILTER
-!endif
-!ifdef HAVE_PKG_CRYPT
-!undef HAVE_PKG_CRYPT
-!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!undef HAVE_PKG_CLAWS_MAIL
-!endif
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
-!undef HAVE_PKG_NOTIFICATION_PLUGIN
-!endif
-!ifdef HAVE_PKG_GTKHTML2_VIEWER
-!undef HAVE_PKG_GTKHTML2_VIEWER
-!endif
-!ifdef HAVE_PKG_VCALENDAR
-!undef HAVE_PKG_VCALENDAR
-!endif
-!ifdef HAVE_PKG_RSSYL
-!undef HAVE_PKG_RSSYL
-!endif
-!ifdef HAVE_PKG_TNEF_PARSE
-!undef HAVE_PKG_TNEF_PARSE
-!endif
-!ifdef HAVE_PKG_ATTACHWARNER
-!undef HAVE_PKG_ATTACHWARNER
-!endif
-!ifdef HAVE_PKG_BSFILTER_PLUGIN
-!undef HAVE_PKG_BSFILTER_PLUGIN
-!endif
-!ifdef HAVE_PKG_PTHREADS_W32
-!undef HAVE_PKG_PTHREADS_W32
-!endif
!ifdef HAVE_PKG_LIBPNG
!undef HAVE_PKG_LIBPNG
!endif
-!ifdef HAVE_PKG_ENCHANT
-!undef HAVE_PKG_ENCHANT
-!endif
!ifdef HAVE_PKG_PKGCONFIG
!undef HAVE_PKG_PKGCONFIG
!endif
@@ -213,6 +171,14 @@ SetCompressor /SOLID lzma
!endif
!endif
+!ifndef GPG4WIN_VANILLA
+# Claws is a bit special because we installed
+# it for some time and now remove the old
+# version we did install during installation
+# to be part of an update.
+!include "uninst-claws-mail.nsi"
+!endif
+
# Now include the generic parts.
!define HAVE_STARTMENU
!include "installer.nsi"
diff --git a/src/inst-bsfilter.nsi b/src/inst-bsfilter.nsi
deleted file mode 100644
index ac97c09..0000000
--- a/src/inst-bsfilter.nsi
+++ /dev/null
@@ -1,38 +0,0 @@
-# inst-bsfilter.nsi - Installer snippet for bsfilter. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/bsfilter-${gpg4win_pkg_bsfilter_version}
-
-!ifdef DEBUG
-Section "bsfilter" SEC_bsfilter
-!else
-Section "-bsfilter" SEC_bsfilter
-!endif
- SetOutPath "$INSTDIR\pub"
-!ifdef SOURCES
- File ${gpg4win_pkg_bsfilter_src}
-!else
- File ${prefix}/bin/bsfilterw.exe
- File ${prefix}/bin/bsfilter.exe
-!endif
-SectionEnd
diff --git a/src/inst-claws-mail.nsi b/src/inst-claws-mail.nsi
deleted file mode 100644
index 6b17797..0000000
--- a/src/inst-claws-mail.nsi
+++ /dev/null
@@ -1,156 +0,0 @@
-# inst-claws-mail.nsi - Installer snippet for Claws. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/claws-mail-${gpg4win_pkg_claws_mail_version}
-
-LangString T_SetDefaultClient ${LANG_ENGLISH} \
- "Do you want to make Claws Mail your default mail client?"
-
-
-!ifdef GPG4WIN_LIGHT
- ${MementoSection} "Claws-Mail" SEC_claws_mail
-!else
- ${MementoUnselectedSection} "Claws-Mail" SEC_claws_mail
-!endif
-
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_claws_mail}"
-!else
- File ${prefix}/bin/claws-mail.exe
-
-!ifndef GPG4WIN_LIGHT
-!ifndef GPG4WIN_VANILLA
- File ${prefix}/share/doc/claws-mail/manual/en/claws-mail-manual.pdf
-!endif
-!endif
-
- SetOutPath "$INSTDIR\share\claws-mail"
- File ${prefix}/share/claws-mail/ca-certificates.crt
-
- SetOutPath "$INSTDIR\lib\claws-mail\plugins"
- File ${prefix}/lib/claws-mail/plugins/pgpcore.dll
- File ${prefix}/lib/claws-mail/plugins/pgpinline.dll
- File ${prefix}/lib/claws-mail/plugins/pgpinline.deps
- File ${prefix}/lib/claws-mail/plugins/pgpmime.dll
- File ${prefix}/lib/claws-mail/plugins/pgpmime.deps
- File ${prefix}/lib/claws-mail/plugins/smime.dll
- File ${prefix}/lib/claws-mail/plugins/smime.deps
- File ${prefix}/lib/claws-mail/plugins/address_keeper.dll
- File ${prefix}/lib/claws-mail/plugins/att_remover.dll
- File ${prefix}/lib/claws-mail/plugins/attachwarner.dll
- File ${prefix}/lib/claws-mail/plugins/bsfilter.dll
- File ${prefix}/lib/claws-mail/plugins/fetchinfo.dll
- File ${prefix}/lib/claws-mail/plugins/notification.dll
- File ${prefix}/lib/claws-mail/plugins/tnef_parse.dll
- File ${prefix}/lib/claws-mail/plugins/rssyl.dll
- File ${prefix}/lib/claws-mail/plugins/spamreport.dll
- File ${prefix}/lib/claws-mail/plugins/vcalendar.dll
-
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\uk\LC_MESSAGES"
- File ${prefix}/share/locale/uk/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\bg\LC_MESSAGES"
- File ${prefix}/share/locale/bg/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
- File ${prefix}/share/locale/pl/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\pt_PT\LC_MESSAGES"
- File ${prefix}/share/locale/pt_PT/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\id\LC_MESSAGES"
- File ${prefix}/share/locale/id_ID/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- File ${prefix}/share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
- File ${prefix}/share/locale/nl/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
- File ${prefix}/share/locale/sv/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
- File ${prefix}/share/locale/de/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/claws-mail.mo
- SetOutPath "$INSTDIR\share\locale\en_GB\LC_MESSAGES"
- File ${prefix}/share/locale/en_GB/LC_MESSAGES/claws-mail.mo
-
- MessageBox MB_YESNO "$(T_SetDefaultClient)" IDNO skip_default_client
-
-#register user's default client
-
- WriteRegStr HKCU "Software\Classes\mailto" "" "URL:MailTo-Protocol"
- WriteRegStr HKCU "Software\Classes\mailto" "URL Protocol" ""
- WriteRegDword HKCU "Software\Classes\mailto" "EditFlags" 2
- WriteRegStr HKCU "Software\Classes\mailto" "FriendlyTypeName" "Claws-Mail URL"
-
- WriteRegStr HKCU "Software\Classes\mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
- WriteRegStr HKCU "Software\Classes\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
- WriteRegStr HKLM "SOFTWARE\Clients\Mail" "" "Claws Mail"
-skip_default_client:
-
-#just register Claws in the list of available mailers
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "" "Claws Mail"
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "DLLPath" ""
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "" "URL:MailTo-Protocol"
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "URL Protocol" ""
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "FriendlyTypeName" "Claws-Mail URL"
- WriteRegDword HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "EditFlags" 2
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
- WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\shell\open\command" "" "$INSTDIR\claws-mail.exe"
-
- WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "" "Claws-Mail URL"
- WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "FriendlyTypeName" "Claws-Mail URL"
- WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "URL Protocol" ""
- WriteRegDword HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "EditFlags" 2
-
- WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
- WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
-!endif
-${MementoSectionEnd}
-
-
-LangString DESC_SEC_claws_mail ${LANG_ENGLISH} \
- "Claws Mail-User-Agent"
-
-LangString DESC_Menu_claws_mail ${LANG_ENGLISH} \
- "Run the Claws mailprogram."
-
-LangString DESC_Menu_claws_mail_pdf ${LANG_ENGLISH} \
- "Show the online manual of Claws Mail"
diff --git a/src/inst-crypt.nsi b/src/inst-crypt.nsi
deleted file mode 100644
index 3cdb94f..0000000
--- a/src/inst-crypt.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# inst-crypt.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/crypt-${gpg4win_pkg_crypt_version}
-
-!ifdef DEBUG
-Section "crypt" SEC_crypt
-!else
-Section "-crypt" SEC_crypt
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_crypt}"
-!else
- # Nothing to install as we link statically.
-!endif
-SectionEnd
diff --git a/src/inst-enchant.nsi b/src/inst-enchant.nsi
deleted file mode 100644
index a7a61ca..0000000
--- a/src/inst-enchant.nsi
+++ /dev/null
@@ -1,50 +0,0 @@
-# inst-enchant.nsi - Installer snippet for enchant. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/enchant-${gpg4win_pkg_enchant_version}
-
-!ifdef DEBUG
-Section "enchant" SEC_enchant
-!else
-Section "-enchant" SEC_enchant
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_enchant}"
-!else
- File ${prefix}/bin/libenchant-1.dll
-
- SetOutPath "$INSTDIR\lib\enchant"
- File ${prefix}/lib/enchant/libenchant_myspell.dll
-
-#Dictionaries
- SetShellVarContext all
- SetOutPath "$INSTDIR\share\enchant\myspell"
- File dictionaries/en_US.aff
- File dictionaries/en_US.dic
- File dictionaries/de.aff
- File dictionaries/de.dic
- File dictionaries/fr.aff
- File dictionaries/fr.dic
-!endif
-SectionEnd
diff --git a/src/inst-gtkhtml2_viewer.nsi b/src/inst-gtkhtml2_viewer.nsi
deleted file mode 100644
index 4ee7efa..0000000
--- a/src/inst-gtkhtml2_viewer.nsi
+++ /dev/null
@@ -1,73 +0,0 @@
-# inst-gtkhtml2_viewer.nsi - Installer snippet for gtkhtml2_viewer. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gtkhtml2_viewer-${gpg4win_pkg_gtkhtml2_viewer_version}
-
-!ifdef DEBUG
-Section "gtkhtml2_viewer" SEC_gtkhtml2_viewer
-!else
-Section "-gtkhtml2_viewer" SEC_gtkhtml2_viewer
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_gtkhtml2_viewer}
-!else
-
- SetOutPath "$INSTDIR\lib\claws-mail\plugins"
- File ${prefix}/lib/claws-mail/plugins/gtkhtml2_viewer.dll
-
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
- File ${prefix}/share/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\id_ID\LC_MESSAGES"
- File ${prefix}/share/locale/id_ID/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- File ${prefix}/share/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
- File ${prefix}/share/locale/nl/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
- File ${prefix}/share/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/gtkhtml2_viewer.mo
- SetOutPath "$INSTDIR\share\locale\sr\LC_MESSAGES"
- File ${prefix}/share/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
-!endif
-SectionEnd
diff --git a/src/inst-libetpan.nsi b/src/inst-libetpan.nsi
deleted file mode 100644
index 12e4812..0000000
--- a/src/inst-libetpan.nsi
+++ /dev/null
@@ -1,36 +0,0 @@
-# inst-libetpan.nsi - Installer snippet for libetpan. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libetpan-${gpg4win_pkg_libetpan_version}
-
-!ifdef DEBUG
-Section "libetpan" SEC_libetpan
-!else
-Section "-libetpan" SEC_libetpan
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_libetpan}
-!else
- File ${prefix}/bin/libetpan-13.dll
-!endif
-SectionEnd
diff --git a/src/inst-libxml2.nsi b/src/inst-libxml2.nsi
deleted file mode 100644
index 4a2b50e..0000000
--- a/src/inst-libxml2.nsi
+++ /dev/null
@@ -1,38 +0,0 @@
-# inst-libxml2.nsi - Installer snippet for libxml2. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libxml2-${gpg4win_pkg_libxml2_version}
-
-!ifdef DEBUG
-Section "libxml2" SEC_libxml2
-!else
-Section "-libxml2" SEC_libxml2
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_libxml2}
-!else
-
- File ${prefix}/bin/libxml2-2.dll
-
-!endif
-SectionEnd
diff --git a/src/inst-pthreads-w32.nsi b/src/inst-pthreads-w32.nsi
deleted file mode 100644
index 7131851..0000000
--- a/src/inst-pthreads-w32.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# inst-pthreads-w32.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/pthreads-w32-${gpg4win_pkg_pthreads_w32_version}
-
-!ifdef DEBUG
-Section "pthreads-w32" SEC_pthreads_w32
-!else
-Section "-pthreads-w32" SEC_pthreads_w32
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_pthreads_w32}"
-!else
- File ${prefix}/bin/pthreadGC2.dll
-!endif
-SectionEnd
diff --git a/src/inst-regex.nsi b/src/inst-regex.nsi
deleted file mode 100644
index 3d35ef5..0000000
--- a/src/inst-regex.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# inst-regex.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/regex-${gpg4win_pkg_regex_version}
-
-!ifdef DEBUG
-Section "regex" SEC_regex
-!else
-Section "-regex" SEC_regex
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_regex}"
-!else
- File ${prefix}/bin/libregex-1.dll
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 9ef0eb0..d5906e0 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -32,9 +32,6 @@
!ifdef HAVE_PKG_BZIP2
!include "inst-bzip2.nsi"
!endif
-!ifdef HAVE_PKG_CRYPT
-!include "inst-crypt.nsi"
-!endif
!ifdef HAVE_PKG_DBUS
!include "inst-dbus.nsi"
!endif
@@ -53,21 +50,12 @@
!ifdef HAVE_PKG_PKGCONFIG
!include "inst-pkgconfig.nsi"
!endif
-!ifdef HAVE_PKG_PTHREADS_W32
-!include "inst-pthreads-w32.nsi"
-!endif
-!ifdef HAVE_PKG_REGEX
-!include "inst-regex.nsi"
-!endif
!ifdef HAVE_PKG_W32PTH
!include "inst-w32pth.nsi"
!endif
!ifdef HAVE_PKG_ZLIB
!include "inst-zlib.nsi"
!endif
-!ifdef HAVE_PKG_BSFILTER
-!include "inst-bsfilter.nsi"
-!endif
!ifdef HAVE_PKG_QT
!include "inst-qt.nsi"
!endif
@@ -77,12 +65,6 @@
!ifdef HAVE_PKG_LIBPNG
!include "inst-libpng.nsi"
!endif
-!ifdef HAVE_PKG_ENCHANT
-!include "inst-enchant.nsi"
-!endif
-!ifdef HAVE_PKG_LIBETPAN
-!include "inst-libetpan.nsi"
-!endif
!ifdef HAVE_PKG_LIBASSUAN
!include "inst-libassuan.nsi"
!endif
@@ -134,9 +116,6 @@
!ifdef HAVE_PKG_CURL
!include "inst-curl.nsi"
!endif
-!ifdef HAVE_PKG_LIBXML2
-!include "inst-libxml2.nsi"
-!endif
!ifdef HAVE_PKG_PINENTRY
!include "inst-pinentry.nsi"
!endif
@@ -167,12 +146,6 @@
!ifdef HAVE_PKG_PAPERKEY
!include "inst-paperkey.nsi"
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!include "inst-claws-mail.nsi"
-!endif
-!ifdef HAVE_PKG_GTKHTML2_VIEWER
-!include "inst-gtkhtml2_viewer.nsi"
-!endif
!ifdef HAVE_PKG_COMPENDIUM
!include "inst-compendium.nsi"
!endif
@@ -208,12 +181,6 @@
!ifdef HAVE_PKG_COMPENDIUM
!include "uninst-compendium.nsi"
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!include "uninst-claws-mail.nsi"
-!endif
-!ifdef HAVE_PKG_GTKHTML2_VIEWER
-!include "uninst-gtkhtml2_viewer.nsi"
-!endif
!ifdef HAVE_PKG_PAPERKEY
!include "uninst-paperkey.nsi"
!endif
@@ -248,9 +215,6 @@
!ifdef HAVE_PKG_CURL
!include "uninst-curl.nsi"
!endif
-!ifdef HAVE_PKG_LIBXML2
-!include "uninst-libxml2.nsi"
-!endif
!ifdef HAVE_PKG_GTK_
!include "uninst-gtk+.nsi"
!endif
@@ -296,36 +260,21 @@
!ifdef HAVE_PKG_LIBASSUAN
!include "uninst-libassuan.nsi"
!endif
-!ifdef HAVE_PKG_LIBETPAN
-!include "uninst-libetpan.nsi"
-!endif
!ifdef HAVE_PKG_LIBPNG
!include "uninst-libpng.nsi"
!endif
-!ifdef HAVE_PKG_ENCHANT
-!include "uninst-enchant.nsi"
-!endif
!ifdef HAVE_PKG_GETTEXT
!include "uninst-gettext.nsi"
!endif
!ifdef HAVE_PKG_QT
!include "uninst-qt.nsi"
!endif
-!ifdef HAVE_PKG_BSFILTER
-!include "uninst-bsfilter.nsi"
-!endif
!ifdef HAVE_PKG_ZLIB
!include "uninst-zlib.nsi"
!endif
!ifdef HAVE_PKG_W32PTH
!include "uninst-w32pth.nsi"
!endif
-!ifdef HAVE_PKG_REGEX
-!include "uninst-regex.nsi"
-!endif
-!ifdef HAVE_PKG_PTHREADS_W32
-!include "uninst-pthreads-w32.nsi"
-!endif
!ifdef HAVE_PKG_PKGCONFIG
!include "uninst-pkgconfig.nsi"
!endif
@@ -356,9 +305,6 @@
!ifdef HAVE_PKG_DBUS
!include "uninst-dbus.nsi"
!endif
-!ifdef HAVE_PKG_CRYPT
-!include "uninst-crypt.nsi"
-!endif
!ifdef HAVE_PKG_BZIP2
!include "uninst-bzip2.nsi"
!endif
@@ -394,8 +340,6 @@ StrCmp $R0 "" +2
!insertmacro MUI_INSTALLOPTIONS_WRITE "installer-options.ini" \
"Field 4" "State" $R0
-
-
!ifdef HAVE_PKG_KLEOPATRA
g4wihelp::config_fetch_bool "inst_kleopatra"
StrCmp $R0 "1" 0 calc_defaults_kleopatra_not_one
@@ -462,17 +406,6 @@ calc_defaults_paperkey_done:
calc_defaults_gpa_done:
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- g4wihelp::config_fetch_bool "inst_claws_mail"
- StrCmp $R0 "1" 0 calc_defaults_claws_mail_not_one
- !insertmacro SelectSection ${SEC_claws_mail}
- Goto calc_defaults_claws_mail_done
- calc_defaults_claws_mail_not_one:
- StrCmp $R0 "0" 0 calc_defaults_claws_mail_done
- !insertmacro UnselectSection ${SEC_claws_mail}
-calc_defaults_claws_mail_done:
-!endif
-
!ifdef HAVE_PKG_COMPENDIUM
g4wihelp::config_fetch_bool "inst_compendium"
StrCmp $R0 "1" 0 calc_defaults_compendium_not_one
@@ -547,21 +480,9 @@ Function CalcDepends
!ifdef HAVE_PKG_ZLIB
!insertmacro UnselectSection ${SEC_zlib}
!endif
-!ifdef HAVE_PKG_BSFILTER
- !insertmacro UnselectSection ${SEC_bsfilter}
-!endif
-!ifdef HAVE_PKG_CRYPT
- !insertmacro UnselectSection ${SEC_crypt}
-!endif
-!ifdef HAVE_PKG_REGEX
- !insertmacro UnselectSection ${SEC_regex}
-!endif
!ifdef HAVE_PKG_LIBPNG
!insertmacro UnselectSection ${SEC_libpng}
!endif
-!ifdef HAVE_PKG_ENCHANT
- !insertmacro UnselectSection ${SEC_enchant}
-!endif
!ifdef HAVE_PKG_PKGCONFIG
!insertmacro UnselectSection ${SEC_pkgconfig}
!endif
@@ -619,9 +540,6 @@ Function CalcDepends
!ifdef HAVE_PKG_GPGME
!insertmacro UnselectSection ${SEC_gpgme}
!endif
-!ifdef HAVE_PKG_PTHREADS_W32
- !insertmacro UnselectSection ${SEC_pthreads_w32}
-!endif
!ifdef HAVE_PKG_LIBGSASL
!insertmacro UnselectSection ${SEC_libgsasl}
!endif
@@ -634,12 +552,6 @@ Function CalcDepends
!ifdef HAVE_PKG_CURL
!insertmacro UnselectSection ${SEC_curl}
!endif
-!ifdef HAVE_PKG_LIBXML2
- !insertmacro UnselectSection ${SEC_libxml2}
-!endif
-!ifdef HAVE_PKG_GTKHTML2_VIEWER
- !insertmacro UnselectSection ${SEC_gtkhtml2_viewer}
-!endif
!ifdef HAVE_PKG_DBUS
!insertmacro UnselectSection ${SEC_dbus}
!endif
@@ -657,8 +569,6 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_gnupg2}
# Then enable all dependencies, mostly in reverse build list order!
- # An exception are the claws plugins, which are build after claws,
- # but are installed as a dependency of claws.
# First the explicitely installed packages.
@@ -754,28 +664,6 @@ Function CalcDepends
skip_gpa:
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- !insertmacro SectionFlagIsSet ${SEC_claws_mail} ${SF_SELECTED} have_claws_mail skip_claws_mail
- have_claws_mail:
- !insertmacro SelectSection ${SEC_libiconv}
- !insertmacro SelectSection ${SEC_gettext}
- !insertmacro SelectSection ${SEC_zlib}
- !insertmacro SelectSection ${SEC_gtk_}
- !insertmacro SelectSection ${SEC_libpng}
- !insertmacro SelectSection ${SEC_enchant}
- !insertmacro SelectSection ${SEC_glib}
- !insertmacro SelectSection ${SEC_gpgme}
- !insertmacro SelectSection ${SEC_pthreads_w32}
- !insertmacro SelectSection ${SEC_crypt}
- !insertmacro SelectSection ${SEC_regex}
- !insertmacro SelectSection ${SEC_libetpan}
- !insertmacro SelectSection ${SEC_gnutls}
- # These are not build dependencies, but we always want to install
- # all plugins.
- !insertmacro SelectSection ${SEC_gtkhtml2_viewer}
- skip_claws_mail:
-!endif
-
# Now the implicitely installed packages.
!ifdef HAVE_PKG_KLEOPATRA
@@ -798,21 +686,6 @@ Function CalcDepends
# Package "dbus" has no dependencies.
# Package "oxygen-icons" has no dependencies.
-!ifdef HAVE_PKG_GTKHTML2_VIEWER
- !insertmacro SectionFlagIsSet ${SEC_gtkhtml2_viewer} ${SF_SELECTED} have_gtkhtml2_viewer skip_gtkhtml2_viewer
- have_gtkhtml2_viewer:
- !insertmacro SelectSection ${SEC_curl}
- !insertmacro SelectSection ${SEC_libxml2}
- skip_gtkhtml2_viewer:
-!endif
-
-!ifdef HAVE_PKG_LIBXML2
- !insertmacro SectionFlagIsSet ${SEC_libxml2} ${SF_SELECTED} have_libxml2 skip_libxml2
- have_libxml2:
- !insertmacro SelectSection ${SEC_zlib}
- skip_libxml2:
-!endif
-
!ifdef HAVE_PKG_CURL
!insertmacro SectionFlagIsSet ${SEC_curl} ${SF_SELECTED} have_curl skip_curl
have_curl:
@@ -821,14 +694,6 @@ Function CalcDepends
skip_curl:
!endif
-!ifdef HAVE_PKG_LIBETPAN
- !insertmacro SectionFlagIsSet ${SEC_libetpan} ${SF_SELECTED} have_libetpan skip_libetpan
- have_libetpan:
- !insertmacro SelectSection ${SEC_pthreads_w32}
- !insertmacro SelectSection ${SEC_gnutls}
- skip_libetpan:
-!endif
-
!ifdef HAVE_PKG_GNUTLS
!insertmacro SectionFlagIsSet ${SEC_gnutls} ${SF_SELECTED} have_gnutls skip_gnutls
have_gnutls:
@@ -839,7 +704,6 @@ Function CalcDepends
# Package "libtasn1" has no dependencies.
# Package "libgsasl" has no dependencies.
- # Package "pthreads-w32" has no dependencies.
!ifdef HAVE_PKG_GPGME
!insertmacro SectionFlagIsSet ${SEC_gpgme} \
@@ -986,16 +850,6 @@ Function CalcDepends
skip_libpng:
!endif
-!ifdef HAVE_PKG_ENCHANT
- !insertmacro SectionFlagIsSet ${SEC_enchant} \
- ${SF_SELECTED} have_enchant skip_enchant
- have_enchant:
- !insertmacro SelectSection ${SEC_pkgconfig}
- skip_enchant:
-!endif
-
- # Package "regex" has no dependencies.
- # Package "crypt" has no dependencies.
# Package "zlib" has no dependencies.
!ifdef HAVE_PKG_GETTEXT
@@ -1103,9 +957,6 @@ FunctionEnd
!ifdef HAVE_PKG_GPA
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpa} $(DESC_SEC_gpa)
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_claws_mail} $(DESC_SEC_claws_mail)
-!endif
!ifdef HAVE_PKG_KLEOPATRA
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_kleopatra} $(DESC_SEC_kleopatra)
!endif
@@ -1174,24 +1025,6 @@ Section "-startmenu"
no_kleopatra_menu:
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- SectionGetFlags ${SEC_claws_mail} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_claws_mail_menu
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Claws-Mail.lnk" \
- "$INSTDIR\claws-mail.exe" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
-!ifndef GPG4WIN_LIGHT
-!ifndef GPG4WIN_VANILLA
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Claws-Mail Manual.lnk" \
- "$INSTDIR\claws-mail-manual.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail_pdf)
-!endif
-!endif
- no_claws_mail_menu:
-!endif
-
!ifdef HAVE_PKG_MAN_NOVICE_EN
SectionGetFlags ${SEC_man_novice_en} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1356,24 +1189,6 @@ Section "-startmenu"
no_kleopatra_desktop:
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- SectionGetFlags ${SEC_claws_mail} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_claws_mail_desktop
- CreateShortCut "$DESKTOP\Claws-Mail.lnk" \
- "$INSTDIR\claws-mail.exe" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
-!ifndef GPG4WIN_LIGHT
-!ifndef GPG4WIN_VANILLA
- CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk" \
- "$INSTDIR\claws-mail-manual.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail_pdf)
-!endif
-!endif
- no_claws_mail_desktop:
-!endif
-
!ifdef HAVE_PKG_MAN_NOVICE_EN
SectionGetFlags ${SEC_man_novice_en} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1508,17 +1323,6 @@ no_desktop:
no_kleopatra_quicklaunch:
!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- SectionGetFlags ${SEC_claws_mail} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_claws_mail_quicklaunch
- CreateShortCut "$QUICKLAUNCH\Claws-Mail.lnk" \
- "$INSTDIR\claws-mail.exe" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
- no_claws_mail_quicklaunch:
-!endif
-
-
no_quick_launch:
diff --git a/src/installer.nsi b/src/installer.nsi
index 8048e77..b56acd6 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -171,7 +171,7 @@ Var STARTMENU_FOLDER
!endif
-!define MUI_PAGE_CUSTOMFUNCTION_PRE PrintCloseOtherApps
+!define MUI_PAGE_CUSTOMFUNCTION_PRE BeforeInstallHooks
!insertmacro MUI_PAGE_INSTFILES
!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
@@ -435,6 +435,15 @@ Function CheckIfStartMenuWanted
Abort
FunctionEnd
+# Check for claws mail installation which was shipped in Gpg4win
+# versions < 2.2.6
+Function CheckClawsUninstall
+ IfFileExists $INSTDIR\claws-mail.exe 0 leave
+ MessageBox MB_YESNO "$(T_FoundOldClaws)" IDYES uninstall IDNO leave
+ uninstall:
+ !insertmacro SelectSection ${SecUninstClawsMail}
+ leave:
+FunctionEnd
# Check whether this is a reinstall and popup a message box to explain
# that it is better to close other apps before continuing
@@ -455,6 +464,14 @@ Function PrintCloseOtherApps
leave:
FunctionEnd
+# Called right before installation
+Function BeforeInstallHooks
+ Call PrintCloseOtherApps
+!ifndef GPG4WIN_VANILLA
+ Call CheckClawsUninstall
+!endif
+FunctionEnd
+
# Called right before the final page to show more warnings.
Function ShowFinalWarnings
StrCmp $OtherGnupgDetected "" +2
@@ -568,6 +585,15 @@ LangString T_CloseOtherApps ${LANG_ENGLISH} \
LangString T_ShuttingDownWinPT ${LANG_ENGLISH} \
"Trying to shutdown a possible running instance of WinPT."
+# From Function CheckClawsUninstall
+LangString T_FoundOldClaws ${LANG_ENGLISH} \
+ "An old version of Claws Mail was found in your Installation directory. \
+ $\r$\nPlease note that Claws Mail is no longer bundled with Gpg4win \
+ and is now available as a standalone package.$\r$\n\
+ You should uninstall Claws Mail now, and if you wish to \
+ continue to use it, install an up-to-date version from:$\r$\n\
+ http://www.claws-mail.org/win32 $\r$\n$\r$\n\
+ Uninstall Claws Mail from Gpg4win now?"
# FIXME: The GetAfterChar function comes from the NSIS wiki.
Function un.GetAfterChar
diff --git a/src/mkportable-full.h b/src/mkportable-full.h
index 3130746..ce60117 100644
--- a/src/mkportable-full.h
+++ b/src/mkportable-full.h
@@ -7,8 +7,6 @@ const char * const full_files[] =
"bin/kleopatra.exe",
"bin/kwatchgnupg.exe",
"bin/libkdecore.dll",
- "claws-mail-manual.pdf",
- "claws-mail.exe",
"dbus-env.bat",
"dbus-launch.exe",
"dbus-monitor.exe",
@@ -65,25 +63,6 @@ const char * const full_files[] =
"kgpgconf.exe",
"kleopatra.exe",
"kwatchgnupg.exe",
- "lib/claws-mail/plugins/address_keeper.dll",
- "lib/claws-mail/plugins/attachwarner.dll",
- "lib/claws-mail/plugins/att_remover.dll",
- "lib/claws-mail/plugins/bsfilter.dll",
- "lib/claws-mail/plugins/fetchinfo.dll",
- "lib/claws-mail/plugins/gtkhtml2_viewer.dll",
- "lib/claws-mail/plugins/notification.dll",
- "lib/claws-mail/plugins/pgpcore.dll",
- "lib/claws-mail/plugins/pgpinline.deps",
- "lib/claws-mail/plugins/pgpinline.dll",
- "lib/claws-mail/plugins/pgpmime.deps",
- "lib/claws-mail/plugins/pgpmime.dll",
- "lib/claws-mail/plugins/rssyl.dll",
- "lib/claws-mail/plugins/smime.deps",
- "lib/claws-mail/plugins/smime.dll",
- "lib/claws-mail/plugins/spamreport.dll",
- "lib/claws-mail/plugins/tnef_parse.dll",
- "lib/claws-mail/plugins/vcalendar.dll",
- "lib/enchant/libenchant_myspell.dll",
"lib/gtk-2.0/2.10.0/engines/libpixmap.dll",
"lib/gtk-2.0/2.10.0/engines/libwimp.dll",
"lib/gtk-2.0/2.10.0/immodules/im-am-et.dll",
@@ -109,8 +88,6 @@ const char * const full_files[] =
"libcurl-4.dll",
"libdbus-1.dll",
"libdbusmenu-qt.dll",
- "libenchant-1.dll",
- "libetpan-13.dll",
"libexpat-1.dll",
"libexpat.dll",
"libffi-6.dll",
@@ -151,10 +128,8 @@ const char * const full_files[] =
"libpangowin32-1.0-0.dll",
"libpng14-14.dll",
"libqgpgme.dll",
- "libregex-1.dll",
"libtasn1-3.dll",
"libw32pth-0.dll",
- "libxml2-2.dll",
"md5sum.exe",
"pango-querymodules.exe",
"paperkey.exe",
@@ -167,7 +142,6 @@ const char * const full_files[] =
"plugins/imageformats/qmng4.dll",
"plugins/imageformats/qsvg4.dll",
"plugins/imageformats/qtiff4.dll",
- "pthreadGC2.dll",
"pub/gpa.exe",
"pub/gpg-connect-agent.exe",
"pub/gpg.exe",
@@ -239,7 +213,6 @@ const char * const full_files[] =
"share/apps/libkleopatra/pics/key_ok.png",
"share/apps/libkleopatra/pics/key_unknown.png",
"share/apps/libkleopatra/pics/smartcard.xpm",
- "share/claws-mail/ca-certificates.crt",
"share/config/colors/40.colors",
"share/config/colors/Oxygen.colors",
"share/config/colors/Rainbow.colors",
@@ -345,12 +318,6 @@ const char * const full_files[] =
"share/doc/HTML/en/kleopatra/menutools.html",
"share/doc/HTML/en/kleopatra/menuview.html",
"share/doc/HTML/en/kleopatra/menuwindow.html",
- "share/enchant/myspell/de.aff",
- "share/enchant/myspell/de.dic",
- "share/enchant/myspell/en_US.aff",
- "share/enchant/myspell/en_US.dic",
- "share/enchant/myspell/fr.aff",
- "share/enchant/myspell/fr.dic",
"share/glib-2.0/schemas/gschema.dtd",
"share/gnupg/gpg-agent.man",
"share/gnupg/gpg-conf.skel",
@@ -713,7 +680,6 @@ const char * const full_files[] =
"share/locale/*/LC_MESSAGES/gpa.mo",
"share/locale/*/LC_MESSAGES/gtk20-properties.mo",
"share/locale/*/LC_MESSAGES/gtk20.mo",
- "share/locale/*/LC_MESSAGES/gtkhtml2_viewer.mo",
"share/locale/*/LC_MESSAGES/kabc.mo",
"share/locale/*/LC_MESSAGES/kabcclient.mo",
"share/locale/*/LC_MESSAGES/kabcformat_binary.mo",
diff --git a/src/mkportable-light.h b/src/mkportable-light.h
index 01b8654..23777be 100644
--- a/src/mkportable-light.h
+++ b/src/mkportable-light.h
@@ -1,6 +1,5 @@
const char * const light_files[] =
{
- "claws-mail.exe",
"dirmngr-client.exe",
"dirmngr.exe",
"dirmngr_ldap.exe",
@@ -41,25 +40,6 @@ const char * const light_files[] =
"gtk-update-icon-cache.exe",
"gtk-update-icon-cache.exe.manifest",
"intl.dll",
- "lib/claws-mail/plugins/address_keeper.dll",
- "lib/claws-mail/plugins/attachwarner.dll",
- "lib/claws-mail/plugins/att_remover.dll",
- "lib/claws-mail/plugins/bsfilter.dll",
- "lib/claws-mail/plugins/fetchinfo.dll",
- "lib/claws-mail/plugins/gtkhtml2_viewer.dll",
- "lib/claws-mail/plugins/notification.dll",
- "lib/claws-mail/plugins/pgpcore.dll",
- "lib/claws-mail/plugins/pgpinline.deps",
- "lib/claws-mail/plugins/pgpinline.dll",
- "lib/claws-mail/plugins/pgpmime.deps",
- "lib/claws-mail/plugins/pgpmime.dll",
- "lib/claws-mail/plugins/rssyl.dll",
- "lib/claws-mail/plugins/smime.deps",
- "lib/claws-mail/plugins/smime.dll",
- "lib/claws-mail/plugins/spamreport.dll",
- "lib/claws-mail/plugins/tnef_parse.dll",
- "lib/claws-mail/plugins/vcalendar.dll",
- "lib/enchant/libenchant_myspell.dll",
"lib/gtk-2.0/2.10.0/engines/libpixmap.dll",
"lib/gtk-2.0/2.10.0/engines/libwimp.dll",
"lib/gtk-2.0/2.10.0/immodules/im-am-et.dll",
@@ -81,8 +61,6 @@ const char * const light_files[] =
"libcairo-gobject-2.dll",
"libcairo-script-interpreter-2.dll",
"libcurl-4.dll",
- "libenchant-1.dll",
- "libetpan-13.dll",
"libexpat-1.dll",
"libffi-6.dll",
"libfontconfig-1.dll",
@@ -111,16 +89,13 @@ const char * const light_files[] =
"libpangoft2-1.0-0.dll",
"libpangowin32-1.0-0.dll",
"libpng14-14.dll",
- "libregex-1.dll",
"libtasn1-3.dll",
"libw32pth-0.dll",
- "libxml2-2.dll",
"md5sum.exe",
"pango-querymodules.exe",
"paperkey.exe",
"pinentry-gtk-2.exe",
"pinentry-w32.exe",
- "pthreadGC2.dll",
"pub/gpa.exe",
"pub/gpg-connect-agent.exe",
"pub/gpg.exe",
@@ -134,13 +109,6 @@ const char * const light_files[] =
"scute.dll",
"sha1sum.exe",
"sha256sum.exe",
- "share/claws-mail/ca-certificates.crt",
- "share/enchant/myspell/de.aff",
- "share/enchant/myspell/de.dic",
- "share/enchant/myspell/en_US.aff",
- "share/enchant/myspell/en_US.dic",
- "share/enchant/myspell/fr.aff",
- "share/enchant/myspell/fr.dic",
"share/glib-2.0/schemas/gschema.dtd",
"share/gnupg/gpg-agent.man",
"share/gnupg/gpg-conf.skel",
@@ -166,7 +134,6 @@ const char * const light_files[] =
"share/locale/*/LC_MESSAGES/gnupg2.mo",
"share/locale/*/LC_MESSAGES/claws-mail.mo",
"share/locale/*/LC_MESSAGES/gnupg2.mo",
- "share/locale/*/LC_MESSAGES/gtkhtml2_viewer.mo",
"share/locale/*/LC_MESSAGES/libgpg-error.mo",
"share/themes/Default/gtk-2.0-key/gtkrc",
"share/themes/Emacs/gtk-2.0-key/gtkrc",
diff --git a/src/uninst-bsfilter.nsi b/src/uninst-bsfilter.nsi
deleted file mode 100644
index 08b63a5..0000000
--- a/src/uninst-bsfilter.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# uninst-bsfilter.nsi - Installer snippet for bsfilter. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/bsfilter-${gpg4win_pkg_bsfilter_version}
-
-
-; Uninstaller section.
-Section "-un.bsfilter"
-!ifdef SOURCES
- Push "${gpg4win_pkg_bsfilter_src}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\pub\bsfilterw.exe"
- Delete "$INSTDIR\pub\bsfilter.exe"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-claws-mail-cmds.nsi b/src/uninst-claws-mail-cmds.nsi
new file mode 100644
index 0000000..ffcfe06
--- /dev/null
+++ b/src/uninst-claws-mail-cmds.nsi
@@ -0,0 +1,139 @@
+# uninst-claws-mail-cmds.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2015 Intevation GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+# We delete this file from the old (and removed) jpeg package, that
+# was only installed if claws was selected.
+Delete "$INSTDIR\jpeg62.dll"
+
+Delete "$INSTDIR\claws-mail.exe"
+
+Delete "$INSTDIR\claws-mail-manual.pdf"
+
+Delete "$INSTDIR\share\claws-mail\ca-certificates.crt"
+Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
+Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.deps"
+Delete "$INSTDIR\lib\claws-mail\plugins\smime.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\smime.deps"
+Delete "$INSTDIR\lib\claws-mail\plugins\address_keeper.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\att_remover.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\attachwarner.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\fetchinfo.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\notification.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\tnef_parse.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\rssyl.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\spamreport.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
+
+RMDir "$INSTDIR\lib\claws-mail\plugins"
+RMDir "$INSTDIR\lib\claws-mail"
+RMDir "$INSTDIR\share\claws-mail"
+RMDir "$INSTDIR\lib"
+RMDir "$INSTDIR\share"
+
+Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\bg\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\pt_PT\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\it\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\es\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\id\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\de\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\claws-mail.mo"
+Delete "$INSTDIR\share\locale\en_GB\LC_MESSAGES\claws-mail.mo"
+
+RMDir "$INSTDIR\share\claws-mail"
+
+DeleteRegKey HKLM "SOFTWARE\Clients\Mail\Claws Mail"
+DeleteRegKey HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto"
+
+; libetpan
+Delete "$INSTDIR\libetpan-13.dll"
+
+; libxml2
+Delete "$INSTDIR\libxml2-2.dll"
+
+; regex
+# Old version.
+Delete "$INSTDIR\regex.dll"
+
+Delete "$INSTDIR\libregex-1.dll"
+
+; crypt had nothing to uninstall
+
+; enchant
+Delete "$INSTDIR\libenchant-1.dll"
+Delete "$INSTDIR\lib\enchant\libenchant_myspell.dll"
+
+RMDir "$INSTDIR\lib\enchant"
+RMDir "$INSTDIR\lib"
+
+# Dictionaries
+Delete "$INSTDIR\share\enchant\myspell\en_US.aff"
+Delete "$INSTDIR\share\enchant\myspell\en_US.dic"
+Delete "$INSTDIR\share\enchant\myspell\de.aff"
+Delete "$INSTDIR\share\enchant\myspell\de.dic"
+Delete "$INSTDIR\share\enchant\myspell\fr.aff"
+Delete "$INSTDIR\share\enchant\myspell\fr.dic"
+
+RMDir "$INSTDIR\share\enchant\myspell"
+RMDIR "$INSTDIR\share\enchant"
+
+; gtkhtmlviewer2
+Delete "$INSTDIR\lib\claws-mail\plugins\gtkhtml2_viewer.dll"
+RMDir "$INSTDIR\lib\claws-mail\plugins"
+RMDir "$INSTDIR\lib\claws-mail"
+Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\id_ID\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\gtkhtml2_viewer.mo"
+Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtkhtml2_viewer.mo"
+
+; pthreads
+Delete "$INSTDIR\pthreadGC2.dll"
+
+RMDir "$INSTDIR\share"
+RMDir "$INSTDIR"
diff --git a/src/uninst-claws-mail.nsi b/src/uninst-claws-mail.nsi
index 7fbff76..5c1715a 100644
--- a/src/uninst-claws-mail.nsi
+++ b/src/uninst-claws-mail.nsi
@@ -1,5 +1,6 @@
# uninst-claws-mail.nsi - Installer snippet. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007 g10 Code GmbH
+# 2015, Intevation GmbH
#
# This file is part of GPG4Win.
#
@@ -18,77 +19,13 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/claws-mail-${gpg4win_pkg_claws_mail_version}
-
-
-# Uninstaller section.
-Section "-un.claws-mail"
-!ifdef SOURCES
- Push "${gpg4win_pkg_claws_mail}"
- Call un.SourceDelete
-!else
- # We delete this file from the old (and removed) jpeg package, that
- # was only installed if claws was selected.
- Delete "$INSTDIR\jpeg62.dll"
-
- Delete "$INSTDIR\claws-mail.exe"
-
- Delete "$INSTDIR\claws-mail-manual.pdf"
-
- Delete "$INSTDIR\share\claws-mail\ca-certificates.crt"
- Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
- Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.deps"
- Delete "$INSTDIR\lib\claws-mail\plugins\smime.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\smime.deps"
- Delete "$INSTDIR\lib\claws-mail\plugins\address_keeper.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\att_remover.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\attachwarner.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\fetchinfo.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\notification.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\tnef_parse.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\rssyl.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\spamreport.dll"
- Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
-
- RMDir "$INSTDIR\lib\claws-mail\plugins"
- RMDir "$INSTDIR\lib\claws-mail"
- RMDir "$INSTDIR\share\claws-mail"
- RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR\share"
-
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\bg\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\pt_PT\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\claws-mail.mo"
- Delete "$INSTDIR\share\locale\en_GB\LC_MESSAGES\claws-mail.mo"
-
- RMDir "$INSTDIR\share\claws-mail"
-
- DeleteRegKey HKLM "SOFTWARE\Clients\Mail\Claws Mail"
- DeleteRegKey HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto"
+# Special installer section that uninstalls claws and its libaries
+Section /o "-uninst_claws_mail" SecUninstClawsMail
+!include "uninst-claws-mail-cmds.nsi"
+SectionEnd
-!endif
+# And the normal uninstall part in case claws was not removed during
+# installation
+Section "-un.claws_mail"
+!include "uninst-claws-mail-cmds.nsi"
SectionEnd
diff --git a/src/uninst-crypt.nsi b/src/uninst-crypt.nsi
deleted file mode 100644
index 5a679bc..0000000
--- a/src/uninst-crypt.nsi
+++ /dev/null
@@ -1,35 +0,0 @@
-# uninst-crypt.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/crypt-${gpg4win_pkg_crypt_version}
-
-
-; Uninstaller section.
-Section "-un.crypt"
-!ifdef SOURCES
- Push "${gpg4win_pkg_crypt}"
- Call un.SourceDelete
-!else
- # Nothing to uninstall
-!endif
-SectionEnd
diff --git a/src/uninst-enchant.nsi b/src/uninst-enchant.nsi
deleted file mode 100644
index 702bb03..0000000
--- a/src/uninst-enchant.nsi
+++ /dev/null
@@ -1,53 +0,0 @@
-# uninst-enchant.nsi - Installer snippet for enchant. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/enchant-${gpg4win_pkg_enchant_version}
-
-
-; Uninstaller section.
-Section "-un.enchant"
-!ifdef SOURCES
- Push "${gpg4win_pkg_enchant}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libenchant-1.dll"
- Delete "$INSTDIR\lib\enchant\libenchant_myspell.dll"
-
- RMDir "$INSTDIR\lib\enchant"
- RMDir "$INSTDIR\lib"
-
-#Dictionaries
- Delete "$INSTDIR\share\enchant\myspell\en_US.aff"
- Delete "$INSTDIR\share\enchant\myspell\en_US.dic"
- Delete "$INSTDIR\share\enchant\myspell\de.aff"
- Delete "$INSTDIR\share\enchant\myspell\de.dic"
- Delete "$INSTDIR\share\enchant\myspell\fr.aff"
- Delete "$INSTDIR\share\enchant\myspell\fr.dic"
-
- RMDir "$INSTDIR\share\enchant\myspell"
- RMDIR "$INSTDIR\share\enchant"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-gtkhtml2_viewer.nsi b/src/uninst-gtkhtml2_viewer.nsi
deleted file mode 100644
index 23f9d6f..0000000
--- a/src/uninst-gtkhtml2_viewer.nsi
+++ /dev/null
@@ -1,53 +0,0 @@
-# uninst-gtkhtml2_viewer.nsi - Installer snippet for gtkhtml2_viewer.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gtkhtml2_viewer-${gpg4win_pkg_gtkhtml2_viewer_version}
-
-
-; Uninstaller section.
-Section "-un.gtkhtml2_viewer"
-!ifdef SOURCES
- Push "${gpg4win_pkg_gtkhtml2_viewer}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\lib\claws-mail\plugins\gtkhtml2_viewer.dll"
- RMDir "$INSTDIR\lib\claws-mail\plugins"
- RMDir "$INSTDIR\lib\claws-mail"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\id_ID\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\gtkhtml2_viewer.mo"
- Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtkhtml2_viewer.mo"
-!endif
-SectionEnd
diff --git a/src/uninst-libetpan.nsi b/src/uninst-libetpan.nsi
deleted file mode 100644
index 8494222..0000000
--- a/src/uninst-libetpan.nsi
+++ /dev/null
@@ -1,36 +0,0 @@
-# uninst-libetpan.nsi - Installer snippet for libetpan.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libetpan-${gpg4win_pkg_libetpan_version}
-
-
-; Uninstaller section.
-Section "-un.libetpan"
-!ifdef SOURCES
- Push "${gpg4win_pkg_libetpan}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libetpan-13.dll"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-libxml2.nsi b/src/uninst-libxml2.nsi
deleted file mode 100644
index f6a1472..0000000
--- a/src/uninst-libxml2.nsi
+++ /dev/null
@@ -1,37 +0,0 @@
-# uninst-libxml2.nsi - Installer snippet for libxml2.-*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libxml2-${gpg4win_pkg_libxml2_version}
-
-
-; Uninstaller section.
-Section "-un.libxml2"
-!ifdef SOURCES
- Push "${gpg4win_pkg_libxml2}"
- Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\libxml2-2.dll"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-pthreads-w32.nsi b/src/uninst-pthreads-w32.nsi
deleted file mode 100644
index 0a7977f..0000000
--- a/src/uninst-pthreads-w32.nsi
+++ /dev/null
@@ -1,36 +0,0 @@
-# uninst-pthreads-w32.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/pthreads-w32-${gpg4win_pkg_pthreads_w32_version}
-
-
-; Uninstaller section.
-Section "-un.pthreads-w32"
-!ifdef SOURCES
- Push "${gpg4win_pkg_pthreads_w32}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\pthreadGC2.dll"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-regex.nsi b/src/uninst-regex.nsi
deleted file mode 100644
index ea2e778..0000000
--- a/src/uninst-regex.nsi
+++ /dev/null
@@ -1,40 +0,0 @@
-# uninst-regex.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/regex-${gpg4win_pkg_regex_version}
-
-
-; Uninstaller section.
-Section "-un.regex"
-!ifdef SOURCES
- Push "${gpg4win_pkg_regex}"
- Call un.SourceDelete
-!else
- # Old version.
- Delete "$INSTDIR\regex.dll"
-
- Delete "$INSTDIR\libregex-1.dll"
-
- RMDir "$INSTDIR"
-!endif
-SectionEnd
commit 34f011c2e398dfbe473105732375e5bca88466b3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jul 30 12:44:57 2015 +0200
Remove dirmngr shutdown message box
* src/installer.nsi: Remove "shutting down dirmgnr" msg.
--
I have never understood why the user should
be informed about that. Reduces a click during
installation.
diff --git a/src/installer.nsi b/src/installer.nsi
index 1dd7f04..8048e77 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -451,7 +451,6 @@ Function PrintCloseOtherApps
MessageBox MB_OK "$(T_ShuttingDownWinPT)"
ExecWait '"$INSTDIR\winpt.exe" --stop'
IfFileExists $INSTDIR\dirmngr.exe 0 +3
- MessageBox MB_OK "$(T_ShuttingDownDirMngr)"
g4wihelp::service_stop "DirMngr"
leave:
FunctionEnd
@@ -568,8 +567,6 @@ LangString T_CloseOtherApps ${LANG_ENGLISH} \
will be required then."
LangString T_ShuttingDownWinPT ${LANG_ENGLISH} \
"Trying to shutdown a possible running instance of WinPT."
-LangString T_ShuttingDownDirMngr ${LANG_ENGLISH} \
- "Trying to shutdown a possible running instance of DirMngr."
# FIXME: The GetAfterChar function comes from the NSIS wiki.
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 11 --
README | 2 -
configure.ac | 20 +--
packages/packages.current | 102 +----------
patches/claws-mail-3.9.1/01-w64-mingw32.patch | 173 ------------------
patches/claws-mail-3.9.1/02-ldap-opt.patch | 27 ---
patches/claws-mail-3.9.1/03-all-crypto.patch | 22 ---
patches/claws-mail-3.9.1/20-c416e89d.patch | 25 ---
patches/claws-mail-3.9.1/21-66aa06c7.patch | 55 ------
patches/claws-mail-3.9.1/50-configure.patch | 41 -----
patches/claws-mail-3.9.1/51-version-file.patch | 9 -
.../claws-mail-3.9.1/80-src-makefile.postcfg-build | 10 --
.../80-src-makefile.postcfg-build | 14 --
patches/pthreads-w32-2-8-0-release/01-make.patch | 34 ----
.../02-mingw_w64_timespec_compatibility.patch | 34 ----
po/POTFILES.in | 1 -
po/ar.po | 44 +++--
po/cz.po | 50 ++++--
po/de.po | 63 ++++---
po/es.po | 46 +++--
po/fr.po | 55 +++---
po/it.po | 50 ++++--
po/pt.po | 50 ++++--
po/ru.po | 44 +++--
src/Makefile.am | 83 +--------
src/config.nsi.in | 38 ----
src/gpg4win.nsi | 50 +-----
src/inst-bsfilter.nsi | 38 ----
src/inst-claws-mail.nsi | 156 ----------------
src/inst-crypt.nsi | 37 ----
src/inst-enchant.nsi | 50 ------
src/inst-gtkhtml2_viewer.nsi | 73 --------
src/inst-libetpan.nsi | 36 ----
src/inst-libxml2.nsi | 38 ----
src/inst-pthreads-w32.nsi | 37 ----
src/inst-regex.nsi | 37 ----
src/inst-sections.nsi | 196 ---------------------
src/installer.nsi | 31 +++-
src/mkportable-full.h | 34 ----
src/mkportable-light.h | 33 ----
src/uninst-bsfilter.nsi | 37 ----
src/uninst-claws-mail-cmds.nsi | 139 +++++++++++++++
src/uninst-claws-mail.nsi | 81 +--------
src/uninst-crypt.nsi | 35 ----
src/uninst-enchant.nsi | 53 ------
src/uninst-gtkhtml2_viewer.nsi | 53 ------
src/uninst-libetpan.nsi | 36 ----
src/uninst-libxml2.nsi | 37 ----
src/uninst-pthreads-w32.nsi | 36 ----
src/uninst-regex.nsi | 40 -----
50 files changed, 439 insertions(+), 2057 deletions(-)
delete mode 100755 patches/claws-mail-3.9.1/01-w64-mingw32.patch
delete mode 100755 patches/claws-mail-3.9.1/02-ldap-opt.patch
delete mode 100755 patches/claws-mail-3.9.1/03-all-crypto.patch
delete mode 100755 patches/claws-mail-3.9.1/20-c416e89d.patch
delete mode 100755 patches/claws-mail-3.9.1/21-66aa06c7.patch
delete mode 100755 patches/claws-mail-3.9.1/50-configure.patch
delete mode 100755 patches/claws-mail-3.9.1/51-version-file.patch
delete mode 100755 patches/claws-mail-3.9.1/80-src-makefile.postcfg-build
delete mode 100755 patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build
delete mode 100755 patches/pthreads-w32-2-8-0-release/01-make.patch
delete mode 100755 patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
delete mode 100644 src/inst-bsfilter.nsi
delete mode 100644 src/inst-claws-mail.nsi
delete mode 100644 src/inst-crypt.nsi
delete mode 100644 src/inst-enchant.nsi
delete mode 100644 src/inst-gtkhtml2_viewer.nsi
delete mode 100644 src/inst-libetpan.nsi
delete mode 100644 src/inst-libxml2.nsi
delete mode 100644 src/inst-pthreads-w32.nsi
delete mode 100644 src/inst-regex.nsi
delete mode 100644 src/uninst-bsfilter.nsi
create mode 100644 src/uninst-claws-mail-cmds.nsi
delete mode 100644 src/uninst-crypt.nsi
delete mode 100644 src/uninst-enchant.nsi
delete mode 100644 src/uninst-gtkhtml2_viewer.nsi
delete mode 100644 src/uninst-libetpan.nsi
delete mode 100644 src/uninst-libxml2.nsi
delete mode 100644 src/uninst-pthreads-w32.nsi
delete mode 100644 src/uninst-regex.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list