[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-171-g1c59bff
by Werner Koch
cvs at cvs.gnupg.org
Fri May 10 11:32:13 CEST 2013
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 1c59bff59bfbda8ae0d9c74c887783409b6d4161 (commit)
from f4c227991fe171419914f8650f9bcaba220e12fd (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 1c59bff59bfbda8ae0d9c74c887783409b6d4161
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 10:47:17 2013 +0200
Update to claws 3.9.1.
* packages/packages.current: Update claws.
* patches/claws-mail-3.9.1/01-w64-mingw32.patch: New.
* patches/claws-mail-3.9.1/02-ldap-opt.patch: new.
* patches/claws-mail-3.9.1/03-all-crypto.patch: New.
* patches/claws-mail-3.9.1/20-c416e89d.patch: New
* patches/claws-mail-3.9.1/21-66aa06c7.patch: New.
* patches/claws-mail-3.9.1/50-configure.patch: New.
* patches/claws-mail-3.9.1/51-version-file.patch: New.
* patches/claws-mail-3.9.1/80-src-makefile.postcfg-build: new.
* Makefile.am (EXTRA_DIST): Add new patches. Remove 3.9.0 patches.
* src/Makefile.am (gpg4win_pkg_claws_mail_configure): Adjust options.
* src/inst-claws-mail.nsi: Install now included plugins.
* src/uninst-claws-mail.nsi: Uninstall them.
* include/config.nsi.in, src/inst-sections.nsi: Remove support for the
now included plugins.
* src/inst-attachwarner.nsi, src/inst-bsfilter_plugin.nsi
* src/inst-notification_plugin.nsi, src/inst-tnef_parse.nsi
* src/uninst-attachwarner.nsi, src/uninst-bsfilter_plugin.nsi
* src/uninst-notification_plugin.nsi, src/uninst-tnef_parse.nsi: Remove.
diff --git a/Makefile.am b/Makefile.am
index 5c25df2..a4e8d28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,10 +82,14 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/scute-1.2.0/01-bugfixes.patch \
patches/scute-1.3.0/01-wsastartup.patch \
patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch \
- patches/claws-mail-3.9.0/01-w64-mingw32.patch \
- patches/claws-mail-3.9.0/02-ldap-opt.patch \
- patches/claws-mail-3.9.0/03-all-crypto.patch
- patches/claws-mail-3.9.0/80-src-makefile.postcfg-build \
+ 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/gnutls-2.12.21/01-openssl-wincrypt.patch
copy-news:
diff --git a/configure.ac b/configure.ac
index db51bd8..22d2003 100644
--- a/configure.ac
+++ b/configure.ac
@@ -367,13 +367,9 @@ 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])
-GPG4WIN_SPKG([notification_plugin], [claws-mail])
GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
GPG4WIN_SPKG([vcalendar], [curl claws-mail])
GPG4WIN_SPKG([rssyl], [curl claws-mail])
-GPG4WIN_SPKG([tnef_parse], [claws-mail])
-GPG4WIN_SPKG([attachwarner], [claws-mail])
-GPG4WIN_SPKG([bsfilter_plugin], [claws-mail])
GPG4WIN_IPKG([compendium])
# Qt related stuff.
diff --git a/include/config.nsi.in b/include/config.nsi.in
index 74302ec..712b1b5 100644
--- a/include/config.nsi.in
+++ b/include/config.nsi.in
@@ -146,10 +146,6 @@
!define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
!define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
- at HAVE_PKG_NOTIFICATION_PLUGIN@
-!define gpg4win_pkg_notification_plugin @gpg4win_pkg_notification_plugin@
-!define gpg4win_pkg_notification_plugin_version @gpg4win_pkg_notification_plugin_version@
-
@HAVE_PKG_GTKHTML2_VIEWER@
!define gpg4win_pkg_gtkhtml2_viewer @gpg4win_pkg_gtkhtml2_viewer@
!define gpg4win_pkg_gtkhtml2_viewer_version @gpg4win_pkg_gtkhtml2_viewer_version@
@@ -162,18 +158,6 @@
!define gpg4win_pkg_rssyl @gpg4win_pkg_rssyl@
!define gpg4win_pkg_rssyl_version @gpg4win_pkg_rssyl_version@
- at HAVE_PKG_TNEF_PARSE@
-!define gpg4win_pkg_tnef_parse @gpg4win_pkg_tnef_parse@
-!define gpg4win_pkg_tnef_parse_version @gpg4win_pkg_tnef_parse_version@
-
- at HAVE_PKG_ATTACHWARNER@
-!define gpg4win_pkg_attachwarner @gpg4win_pkg_attachwarner@
-!define gpg4win_pkg_attachwarner_version @gpg4win_pkg_attachwarner_version@
-
- at HAVE_PKG_BSFILTER_PLUGIN@
-!define gpg4win_pkg_bsfilter_plugin @gpg4win_pkg_bsfilter_plugin@
-!define gpg4win_pkg_bsfilter_plugin_version @gpg4win_pkg_bsfilter_plugin_version@
-
@HAVE_PKG_ZLIB@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
!define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
diff --git a/packages/packages.current b/packages/packages.current
index fe6d810..3f2831c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -141,28 +141,16 @@ chk 321f9cf0abfa1937401676ce60976d8779c39536
# (Kept on our own mirror due to Sourceforge peculiarities.)
server ftp://ftp.g10code.com/mirrors/claws
-file claws-mail-3.9.0.tar.gz
-chk 7730e0978c364bded838ce26a8f9cbd733a363a9
+# checked: 2013-05-10 wk
+file claws-mail-3.9.1.tar.bz2
+chk ec3a787b34b07983d938f7d353e3cfd85167122b
-#
-#file attachwarner-0.2.24cvs1.tar.gz
-#chk 616356ad9697e2698b294901e562897e9d0c40e1
-#
-#file bsfilter_plugin-1.0.8cvs1.tar.gz
-#chk 1577366fe46ad30d188c84a30c75fd2bcaafdb7e
-#
#file gtkhtml2_viewer-0.33.tar.gz
#chk b2a7047af55b2273e031e16806859458762d74a1
#
-#file notification_plugin-0.30.tar.gz
-#chk 2c6237b0dfbdb028e2d12b26ff2dc3430a96b47f
-#
#file rssyl-0.33.tar.gz
#chk aecf28d0901c8e670eabe1abcfeb362f1685cc75
#
-#file tnef_parse-0.3.13.tar.gz
-#chk 8d0de3c82048c5a9e7985786ddc624d2920ba8a1
-#
#file vcalendar-2.0.13.tar.gz
#chk 1e8171340dde04eda4468b72c23104233dd76bae
diff --git a/patches/claws-mail-3.9.0/01-w64-mingw32.patch b/patches/claws-mail-3.9.1/01-w64-mingw32.patch
similarity index 100%
rename from patches/claws-mail-3.9.0/01-w64-mingw32.patch
rename to patches/claws-mail-3.9.1/01-w64-mingw32.patch
diff --git a/patches/claws-mail-3.9.0/02-ldap-opt.patch b/patches/claws-mail-3.9.1/02-ldap-opt.patch
similarity index 100%
rename from patches/claws-mail-3.9.0/02-ldap-opt.patch
rename to patches/claws-mail-3.9.1/02-ldap-opt.patch
diff --git a/patches/claws-mail-3.9.0/03-all-crypto.patch b/patches/claws-mail-3.9.1/03-all-crypto.patch
similarity index 100%
rename from patches/claws-mail-3.9.0/03-all-crypto.patch
rename to patches/claws-mail-3.9.1/03-all-crypto.patch
diff --git a/patches/claws-mail-3.9.1/20-c416e89d.patch b/patches/claws-mail-3.9.1/20-c416e89d.patch
new file mode 100755
index 0000000..27da02a
--- /dev/null
+++ b/patches/claws-mail-3.9.1/20-c416e89d.patch
@@ -0,0 +1,25 @@
+#! /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
new file mode 100755
index 0000000..97866e9
--- /dev/null
+++ b/patches/claws-mail-3.9.1/21-66aa06c7.patch
@@ -0,0 +1,55 @@
+#! /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
new file mode 100755
index 0000000..06f6821
--- /dev/null
+++ b/patches/claws-mail-3.9.1/50-configure.patch
@@ -0,0 +1,41 @@
+#! /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
new file mode 100755
index 0000000..0e1d378
--- /dev/null
+++ b/patches/claws-mail-3.9.1/51-version-file.patch
@@ -0,0 +1,9 @@
+#! /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.0/80-src-makefile.postcfg-build b/patches/claws-mail-3.9.1/80-src-makefile.postcfg-build
similarity index 100%
rename from patches/claws-mail-3.9.0/80-src-makefile.postcfg-build
rename to patches/claws-mail-3.9.1/80-src-makefile.postcfg-build
diff --git a/src/Makefile.am b/src/Makefile.am
index a59caff..c98f536 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -296,11 +296,15 @@ 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-trayicon-plugin --disable-dbus \
- --disable-dillo-viewer-plugin \
- --disable-jpilot --disable-startup-notification --disable-ipv6 \
+ --enable-libetpan --disable-dbus --disable-valgrind --disable-ipv6 \
+ --disable-jpilot --disable-startup-notification \
--disable-spamassassin-plugin --disable-bogofilter-plugin \
- --disable-valgrind --disable-networkmanager-support
+ --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
diff --git a/src/inst-attachwarner.nsi b/src/inst-attachwarner.nsi
deleted file mode 100644
index ca17627..0000000
--- a/src/inst-attachwarner.nsi
+++ /dev/null
@@ -1,69 +0,0 @@
-# inst-attachwarner.nsi - Installer snippet for attachwarner. -*- 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}/attachwarner-${gpg4win_pkg_attachwarner_version}
-
-!ifdef DEBUG
-Section "attachwarner" SEC_attachwarner
-!else
-Section "-attachwarner" SEC_attachwarner
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_attachwarner}
-!else
-
- SetOutPath "$INSTDIR\lib\claws-mail\plugins"
- File ${prefix}/lib/claws-mail/plugins/attachwarner.dll
-
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
- File ${prefix}/share/locale/pl/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\id_ID\LC_MESSAGES"
- File ${prefix}/share/locale/id_ID/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
- File ${prefix}/share/locale/de/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/attachwarner.mo
- SetOutPath "$INSTDIR\share\locale\sr\LC_MESSAGES"
- File ${prefix}/share/locale/sr/LC_MESSAGES/attachwarner.mo
-!endif
-SectionEnd
diff --git a/src/inst-bsfilter_plugin.nsi b/src/inst-bsfilter_plugin.nsi
deleted file mode 100644
index 2cf8374..0000000
--- a/src/inst-bsfilter_plugin.nsi
+++ /dev/null
@@ -1,65 +0,0 @@
-# inst-bsfilter_plugin.nsi - Installer snippet for bsfilter_plugin. -*- 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}/bsfilter_plugin-${gpg4win_pkg_bsfilter_plugin_version}
-
-!ifdef DEBUG
-Section "bsfilter_plugin" SEC_bsfilter_plugin
-!else
-Section "-bsfilter_plugin" SEC_bsfilter_plugin
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_bsfilter_plugin}
-!else
-
- SetOutPath "$INSTDIR\lib\claws-mail\plugins"
- File ${prefix}/lib/claws-mail/plugins/bsfilter.dll
-
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\id_ID\LC_MESSAGES"
- File ${prefix}/share/locale/id_ID/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
- File ${prefix}/share/locale/nl/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/bsfilter_plugin.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/bsfilter_plugin.mo
-!endif
-SectionEnd
diff --git a/src/inst-claws-mail.nsi b/src/inst-claws-mail.nsi
index bd56e36..05ce231 100644
--- a/src/inst-claws-mail.nsi
+++ b/src/inst-claws-mail.nsi
@@ -56,6 +56,13 @@ LangString T_SetDefaultClient ${LANG_ENGLISH} \
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
SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
File ${prefix}/share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
diff --git a/src/inst-notification_plugin.nsi b/src/inst-notification_plugin.nsi
deleted file mode 100644
index c5c42b8..0000000
--- a/src/inst-notification_plugin.nsi
+++ /dev/null
@@ -1,67 +0,0 @@
-# inst-notification_plugin.nsi - Installer snippet for notification_plugin. -*- 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}/notification_plugin-${gpg4win_pkg_notification_plugin_version}
-
-!ifdef DEBUG
-Section "notification_plugin" SEC_notification_plugin
-!else
-Section "-notification_plugin" SEC_notification_plugin
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_notification_plugin}
-!else
-
- SetOutPath "$INSTDIR\lib\claws-mail\plugins"
- File ${prefix}/lib/claws-mail/plugins/notification_plugin.dll
-
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\id_ID\LC_MESSAGES"
- File ${prefix}/share/locale/id_ID/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- File ${prefix}/share/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
- File ${prefix}/share/locale/nl/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/notification_plugin.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/notification_plugin.mo
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 4befbc5..8cb290b 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -170,9 +170,6 @@
!ifdef HAVE_PKG_CLAWS_MAIL
!include "inst-claws-mail.nsi"
!endif
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
-!include "inst-notification_plugin.nsi"
-!endif
!ifdef HAVE_PKG_GTKHTML2_VIEWER
!include "inst-gtkhtml2_viewer.nsi"
!endif
@@ -182,15 +179,6 @@
!ifdef HAVE_PKG_RSSYL
!include "inst-rssyl.nsi"
!endif
-!ifdef HAVE_PKG_TNEF_PARSE
-!include "inst-tnef_parse.nsi"
-!endif
-!ifdef HAVE_PKG_ATTACHWARNER
-!include "inst-attachwarner.nsi"
-!endif
-!ifdef HAVE_PKG_BSFILTER_PLUGIN
-!include "inst-bsfilter_plugin.nsi"
-!endif
!ifdef HAVE_PKG_COMPENDIUM
!include "inst-compendium.nsi"
!endif
@@ -229,9 +217,6 @@
!ifdef HAVE_PKG_CLAWS_MAIL
!include "uninst-claws-mail.nsi"
!endif
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
-!include "uninst-notification_plugin.nsi"
-!endif
!ifdef HAVE_PKG_GTKHTML2_VIEWER
!include "uninst-gtkhtml2_viewer.nsi"
!endif
@@ -241,15 +226,6 @@
!ifdef HAVE_PKG_RSSYL
!include "uninst-rssyl.nsi"
!endif
-!ifdef HAVE_PKG_TNEF_PARSE
-!include "uninst-tnef_parse.nsi"
-!endif
-!ifdef HAVE_PKG_ATTACHWARNER
-!include "uninst-attachwarner.nsi"
-!endif
-!ifdef HAVE_PKG_BSFILTER_PLUGIN
-!include "uninst-bsfilter_plugin.nsi"
-!endif
!ifdef HAVE_PKG_PAPERKEY
!include "uninst-paperkey.nsi"
!endif
diff --git a/src/inst-tnef_parse.nsi b/src/inst-tnef_parse.nsi
deleted file mode 100644
index ab43072..0000000
--- a/src/inst-tnef_parse.nsi
+++ /dev/null
@@ -1,65 +0,0 @@
-# inst-tnef_parse.nsi - Installer snippet for tnef_parse. -*- 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}/tnef_parse-${gpg4win_pkg_tnef_parse_version}
-
-!ifdef DEBUG
-Section "tnef_parse" SEC_tnef_parse
-!else
-Section "-tnef_parse" SEC_tnef_parse
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File ${gpg4win_pkg_tnef_parse}
-!else
-
- SetOutPath "$INSTDIR\lib\claws-mail\plugins"
- File ${prefix}/lib/claws-mail/plugins/tnef_parse.dll
-
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\id_ID\LC_MESSAGES"
- File ${prefix}/share/locale/id_ID/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
- File ${prefix}/share/locale/nl/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/tnef_parse.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/tnef_parse.mo
-!endif
-SectionEnd
diff --git a/src/uninst-attachwarner.nsi b/src/uninst-attachwarner.nsi
deleted file mode 100644
index 0a9d479..0000000
--- a/src/uninst-attachwarner.nsi
+++ /dev/null
@@ -1,86 +0,0 @@
-# uninst-attachwarner.nsi - Installer snippet for attachwarner.-*- 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}/attachwarner-${gpg4win_pkg_attachwarner_version}
-
-
-; Uninstaller section.
-Section "-un.attachwarner"
-!ifdef SOURCES
- Push "${gpg4win_pkg_attachwarner}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\lib\claws-mail\plugins\attachwarner.dll"
- RMDir "$INSTDIR\lib\claws-mail\plugins"
- RMDir "$INSTDIR\lib\claws-mail"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\pt_BR"
- Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\pl\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\pl"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ja"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\fi\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fi"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\it"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\es"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\id"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\cs"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ru"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\sk\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\sk"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ca"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\hu"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\de"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fr"
- Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\attachwarner.mo"
- RMDir "$INSTDIR\share\locale\sr\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\sr"
- RMDir "$INSTDIR\share\locale"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-bsfilter_plugin.nsi b/src/uninst-bsfilter_plugin.nsi
deleted file mode 100644
index 3049312..0000000
--- a/src/uninst-bsfilter_plugin.nsi
+++ /dev/null
@@ -1,80 +0,0 @@
-# uninst-bsfilter_plugin.nsi - Installer snippet for bsfilter_plugin.-*- 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}/bsfilter_plugin-${gpg4win_pkg_bsfilter_plugin_version}
-
-
-; Uninstaller section.
-Section "-un.bsfilter_plugin"
-!ifdef SOURCES
- Push "${gpg4win_pkg_bsfilter_plugin}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
- RMDir "$INSTDIR\lib\claws-mail\plugins"
- RMDir "$INSTDIR\lib\claws-mail"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\pt_BR"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ja"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\fi\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fi"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\it"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\es"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\id"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\nl\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\nl"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\cs"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ru"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\sk\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\sk"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ca"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\hu"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\bsfilter_plugin.mo"
- RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fr"
- RMDir "$INSTDIR\share\locale"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-claws-mail.nsi b/src/uninst-claws-mail.nsi
index 8f0e945..0791fb1 100644
--- a/src/uninst-claws-mail.nsi
+++ b/src/uninst-claws-mail.nsi
@@ -1,18 +1,18 @@
# uninst-claws-mail.nsi - Installer snippet. -*- 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
@@ -46,6 +46,14 @@ Section "-un.claws-mail"
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"
+
RMDir "$INSTDIR\lib\claws-mail\plugins"
RMDir "$INSTDIR\lib\claws-mail"
RMDir "$INSTDIR\share\claws-mail"
diff --git a/src/uninst-notification_plugin.nsi b/src/uninst-notification_plugin.nsi
deleted file mode 100644
index 3a3a32c..0000000
--- a/src/uninst-notification_plugin.nsi
+++ /dev/null
@@ -1,83 +0,0 @@
-# uninst-notification_plugin.nsi - Installer snippet for notification_plugin.-*- 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}/notification_plugin-${gpg4win_pkg_notification_plugin_version}
-
-
-; Uninstaller section.
-Section "-un.notification_plugin"
-!ifdef SOURCES
- Push "${gpg4win_pkg_notification_plugin}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\lib\claws-mail\plugins\notification_plugin.dll"
- RMDir "$INSTDIR\lib\claws-mail\plugins"
- RMDir "$INSTDIR\lib\claws-mail"
- RMDir "$INSTDIR\lib"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\pt_BR"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ja"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\fi\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fi"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\it"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\es"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\id"
- Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\zh_CN"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\nl\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\nl"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\cs"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ru"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\sk\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\sk"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ca"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\hu"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\notification_plugin.mo"
- RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fr"
- RMDir "$INSTDIR\share\locale"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-tnef_parse.nsi b/src/uninst-tnef_parse.nsi
deleted file mode 100644
index 090272a..0000000
--- a/src/uninst-tnef_parse.nsi
+++ /dev/null
@@ -1,80 +0,0 @@
-# uninst-tnef_parse.nsi - Installer snippet for tnef_parse.-*- 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}/tnef_parse-${gpg4win_pkg_tnef_parse_version}
-
-
-; Uninstaller section.
-Section "-un.tnef_parse"
-!ifdef SOURCES
- Push "${gpg4win_pkg_tnef_parse}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\lib\claws-mail\plugins\tnef_parse.dll"
- RMDir "$INSTDIR\lib\claws-mail\plugins"
- RMDir "$INSTDIR\lib\claws-mail"
- RMDir "$INSTDIR\lib"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\pt_BR"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ja"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\fi\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fi"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\it"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\es"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\id"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\nl\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\nl"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\cs"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ru"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\sk\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\sk"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\ca"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\hu"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\tnef_parse.mo"
- RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
- RMDir "$INSTDIR\share\locale\fr"
- RMDir "$INSTDIR\share\locale"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 12 ++-
configure.ac | 4 -
include/config.nsi.in | 16 ----
packages/packages.current | 18 +----
.../01-w64-mingw32.patch | 0
.../02-ldap-opt.patch | 0
.../03-all-crypto.patch | 0
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 ++
.../80-src-makefile.postcfg-build | 0
src/Makefile.am | 12 ++-
src/inst-attachwarner.nsi | 69 ----------------
src/inst-bsfilter_plugin.nsi | 65 ---------------
src/inst-claws-mail.nsi | 7 ++
src/inst-notification_plugin.nsi | 67 ---------------
src/inst-sections.nsi | 24 ------
src/inst-tnef_parse.nsi | 65 ---------------
src/uninst-attachwarner.nsi | 86 --------------------
src/uninst-bsfilter_plugin.nsi | 80 ------------------
src/uninst-claws-mail.nsi | 16 +++-
src/uninst-notification_plugin.nsi | 83 -------------------
src/uninst-tnef_parse.nsi | 80 ------------------
24 files changed, 168 insertions(+), 666 deletions(-)
rename patches/{claws-mail-3.9.0 => claws-mail-3.9.1}/01-w64-mingw32.patch (100%)
rename patches/{claws-mail-3.9.0 => claws-mail-3.9.1}/02-ldap-opt.patch (100%)
rename patches/{claws-mail-3.9.0 => claws-mail-3.9.1}/03-all-crypto.patch (100%)
create mode 100755 patches/claws-mail-3.9.1/20-c416e89d.patch
create mode 100755 patches/claws-mail-3.9.1/21-66aa06c7.patch
create mode 100755 patches/claws-mail-3.9.1/50-configure.patch
create mode 100755 patches/claws-mail-3.9.1/51-version-file.patch
rename patches/{claws-mail-3.9.0 => claws-mail-3.9.1}/80-src-makefile.postcfg-build (100%)
delete mode 100644 src/inst-attachwarner.nsi
delete mode 100644 src/inst-bsfilter_plugin.nsi
delete mode 100644 src/inst-notification_plugin.nsi
delete mode 100644 src/inst-tnef_parse.nsi
delete mode 100644 src/uninst-attachwarner.nsi
delete mode 100644 src/uninst-bsfilter_plugin.nsi
delete mode 100644 src/uninst-notification_plugin.nsi
delete mode 100644 src/uninst-tnef_parse.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list