[Gpg4win-commits] r1596 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Dec 15 17:18:50 CET 2010
Author: colinleroy
Date: 2010-12-15 17:18:50 +0100 (Wed, 15 Dec 2010)
New Revision: 1596
Added:
trunk/src/inst-enchant.nsi
trunk/src/uninst-enchant.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2010-12-15 Colin Leroy <colin at colino.net>
* include/config.nsi.in, src/inst-enchant.nsi, src/Makefile.am,
src/uninst-enchant.nsi, src/inst-sections.nsi, configure.ac,
packages/packages.current: Add Enchant support for Claws Mail,
and update Claws Mail.
Dictionaries will have to be installed by the user.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/ChangeLog 2010-12-15 16:18:50 UTC (rev 1596)
@@ -1,5 +1,13 @@
2010-12-15 Colin Leroy <colin at colino.net>
+ * include/config.nsi.in, src/inst-enchant.nsi, src/Makefile.am,
+ src/uninst-enchant.nsi, src/inst-sections.nsi, configure.ac,
+ packages/packages.current: Add Enchant support for Claws Mail,
+ and update Claws Mail.
+ Dictionaries will have to be installed by the user.
+
+2010-12-15 Colin Leroy <colin at colino.net>
+
* src/inst-pinentry.nsi: Fix NSIS builds without QT.
2010-12-15 Marcus Brinkmann <marcus at g10code.com>
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/configure.ac 2010-12-15 16:18:50 UTC (rev 1596)
@@ -217,6 +217,7 @@
GPG4WIN_BPKG_GTK_DEV([fontconfig], [pkgconfig zlib expat])
GPG4WIN_BPKG_GTK_DEV([gtk+], [libiconv gettext pkgconfig atk pango glib cairo])
GPG4WIN_SPKG([libpng], [pkgconfig])
+GPG4WIN_SPKG([enchant], [pkgconfig glib])
GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
@@ -244,7 +245,7 @@
GPG4WIN_SPKG([libxml2], [zlib])
GPG4WIN_SPKG([regex])
GPG4WIN_SPKG([crypt])
-GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng glib dnl
+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])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/include/config.nsi.in 2010-12-15 16:18:50 UTC (rev 1596)
@@ -190,6 +190,10 @@
!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@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/packages/packages.current 2010-12-15 16:18:50 UTC (rev 1596)
@@ -105,35 +105,43 @@
chk fe718884dd7ca0652613a2cb5c302ac6323605d8
#
+# Enchant for Claws
+#
+
+server http://www.abisource.com/downloads/enchant/1.6.0
+file enchant-1.6.0.tar.gz
+chk 321f9cf0abfa1937401676ce60976d8779c39536
+
+#
# Claws
#
# (Kept on our own mirror due to Sourceforge peculiarities.)
server http://www.claws-mail.org/win32
-file claws-mail-3.7.7cvs3.tar.bz2
-chk f8136a708db5162431f68657d8f06298287a383f
+file claws-mail-3.7.8cvs2.tar.bz2
+chk c695c0ffa1be7c8da281f79868482a84a0f1bef5
-file attachwarner-0.2.20.tar.gz
-chk 0613beb2c54b21c055c451b46ef4671eb18209de
+file attachwarner-0.2.20cvs1.tar.gz
+chk aa9313595f7365b7e0b54d121e00004fd2ba7b71
file bsfilter_plugin-1.0.5.tar.gz
-chk 6fbc4e86806b3ea4e228320a26c7b5e05b899c2c
+chk d90b5c34cfc0046e69c312e3266b4b19f18c2aa0
-file gtkhtml2_viewer-0.28cvs1.tar.gz
-chk 898a210e0bad982f5ae7796bf979ef231f20ada1
+file gtkhtml2_viewer-0.29.tar.gz
+chk 006cc5aed36f3dc7ff97f6331f432cdf4b919b9f
file notification_plugin-0.26.tar.gz
-chk b416b778b6d3f10b2cdcc5a6998a92178bb0ffa2
+chk dd7b752199a684700d3c5951a0eaa884db76c0c0
-file rssyl-0.28cvs1.tar.gz
-chk a119f5f238cceb0f1e53beed3c7a2fc14fd2ee28
+file rssyl-0.29.tar.gz
+chk 964df1f1aadb6b2f20dae3bd4d309b31aaed53f5
file tnef_parse-0.3.9.tar.gz
-chk 75050436df49b69fb0cad2c776c8687fac15d403
+chk 3395731753819f20a9f4b7e6374e3458eaba7b76
file vcalendar-2.0.9.tar.gz
-chk 1aafc38752e40970aa05a949891219c0a26f0639
+chk 941df624ea50d116a1ec245831945cf55c80a3d1
#
# Pthreads for Windows.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/src/Makefile.am 2010-12-15 16:18:50 UTC (rev 1596)
@@ -62,6 +62,7 @@
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 \
@@ -96,7 +97,7 @@
gpgwrap.exe gpgwrap-2.exe kleowrap.exe $(foosum_exe)
# Supported source packages.
-gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex libpng \
+gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex libpng enchant \
gpa libgsasl libtasn1 opencdk gnutls curl libxml2 \
libetpan claws-mail notification_plugin gtkhtml2_viewer \
vcalendar rssyl gnupg2 pinentry libassuan libksba libgcrypt \
@@ -176,6 +177,8 @@
gpg4win_pkg_libpng_configure = 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) \
@@ -247,16 +250,13 @@
gpg4win_pkg_libetpan_configure = --with-gnutls \
CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
-# --disable-aspell can be removed from svn917 on and later.
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-aspell --disable-enchant \
- --disable-trayicon-plugin --disable-dbus \
- --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
+ --enable-libetpan --disable-trayicon-plugin --disable-dbus \
+ --disable-dillo-viewer-plugin \
--disable-jpilot --disable-startup-notification --disable-ipv6 \
- --disable-mathml-viewer-plugin --disable-clamav-plugin \
--disable-spamassassin-plugin --disable-bogofilter-plugin \
--disable-valgrind --disable-networkmanager-support
@@ -413,7 +413,12 @@
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_libiconv_post_install
(cp $(srcdir)/libiconv.def $$$${pkgidir}/lib; \
cd $$$${pkgidir}/lib; \
Added: trunk/src/inst-enchant.nsi
===================================================================
--- trunk/src/inst-enchant.nsi 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/src/inst-enchant.nsi 2010-12-15 16:18:50 UTC (rev 1596)
@@ -0,0 +1,40 @@
+# 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
+!endif
+SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/src/inst-sections.nsi 2010-12-15 16:18:50 UTC (rev 1596)
@@ -77,6 +77,9 @@
!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
@@ -329,6 +332,9 @@
!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
@@ -583,6 +589,9 @@
!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
@@ -804,6 +813,7 @@
!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}
@@ -1055,6 +1065,14 @@
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.
Added: trunk/src/uninst-enchant.nsi
===================================================================
--- trunk/src/uninst-enchant.nsi 2010-12-15 16:05:27 UTC (rev 1595)
+++ trunk/src/uninst-enchant.nsi 2010-12-15 16:18:50 UTC (rev 1596)
@@ -0,0 +1,41 @@
+# 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"
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list