[Gpg4win-commits] r1417 - in trunk: . include packages patches patches/pthreads-w32-2-8-0-release src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue May 11 14:27:40 CEST 2010
Author: marcus
Date: 2010-05-11 14:27:38 +0200 (Tue, 11 May 2010)
New Revision: 1417
Added:
trunk/patches/pthreads-w32-2-8-0-release/
trunk/patches/pthreads-w32-2-8-0-release/01-make.patch
Removed:
trunk/patches/pthreads-w32-2-7-0-release/
trunk/patches/winpt/
trunk/src/inst-eudoragpg.nsi
trunk/src/inst-gpgee.nsi
trunk/src/inst-jpeg.nsi
trunk/src/inst-winpt.nsi
trunk/src/uninst-eudoragpg.nsi
trunk/src/uninst-gpgee.nsi
trunk/src/uninst-jpeg.nsi
trunk/src/uninst-winpt.nsi
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-crypt.nsi
trunk/src/inst-regex.nsi
trunk/src/inst-sections.nsi
trunk/src/installer.nsi
trunk/src/uninst-claws-mail.nsi
trunk/src/uninst-crypt.nsi
trunk/src/uninst-regex.nsi
Log:
2010-05-11 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Remove libjpeg, it's not used in gtk+
anymore (which now uses W32 native GDI+ interface), and claws
relies on gtk+ for jpeg rendering. Note that if you ever need to
reintroduce it: The upstream libjpeg v8a cross-builds fine.
Convert crypt and regex to source versions (source gotten from
MingW-SYS project).
Update libgsasl, libtasn1, gnutls, pthreads-w32
* configure.ac: Remove jpeg, winpt. Update regex and crypt.
* Makefile.am: Remove patches/winpt/01-gpg-path.patch. Update
pthreads-w32 patch.
* include/config.nsi.in: Remove winpt, eudoragpg and jpeg. Update
crypt and regex.
* patches/pthreads-w32-2-8-0-release/01-make.patch: File removed.
* patches/winpt/01-gpg-path.patch: File removed.
* src/Makefile.am (EXTRA_DIST): Remove inst-eudoragpg.nsi,
uninst-eudoragpg.nsi, inst-gpgee.nsi, uninst-gpgee.nsi,
inst-jpeg.nsi, uninst-jpeg.nsi, inst-winpt.nsi, uninst-winpt.nsi.
(gpg4win_spkgs): Remove libgsasl, add regex.
(gpg4win_mpkgs): Add crypt.
(gpg4win_bpkgs): Remove jpeg, gpgee, crypt, regex.
(gpg4win_pkg_crypt_make, gpg4win_pkg_crypt_make_args_inst): New.
(gpg4win_pkg_libgpg_error_configure): Add --enable-static.
(gpg4win_pkg_winpt_configure): Removed.
* src/inst-eudoragpg.nsi, src/uninst-eudoragpg.nsi,
src/inst-gpgee.nsi, src/uninst-gpgee.nsi, src/inst-jpeg.nsi,
src/uninst-jpeg.nsi, src/inst-winpt.nsi, src/uninst-winpt.nsi:
Files removed.
* src/installer.nsi: Remove check for gpgee.dll.
* src/uninst-crypt.nsi: Update source path.
* src/inst-crypt.nsi: Update source path.
* src/uninst-regex.nsi: Update source path, update dll name.
* src/inst-regex.nsi: Update source path, update dll name.
* src/uninst-claws-mail.nsi: Delete jpeg62.dll.
* src/inst-sections.nsi: Remove support for jpeg, winpt, eudoragpg.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/ChangeLog 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,3 +1,39 @@
+2010-05-11 Marcus Brinkmann <marcus at g10code.de>
+
+ * packages/packages.current: Remove libjpeg, it's not used in gtk+
+ anymore (which now uses W32 native GDI+ interface), and claws
+ relies on gtk+ for jpeg rendering. Note that if you ever need to
+ reintroduce it: The upstream libjpeg v8a cross-builds fine.
+ Convert crypt and regex to source versions (source gotten from
+ MingW-SYS project).
+ Update libgsasl, libtasn1, gnutls, pthreads-w32
+ * configure.ac: Remove jpeg, winpt. Update regex and crypt.
+ * Makefile.am: Remove patches/winpt/01-gpg-path.patch. Update
+ pthreads-w32 patch.
+ * include/config.nsi.in: Remove winpt, eudoragpg and jpeg. Update
+ crypt and regex.
+ * patches/pthreads-w32-2-8-0-release/01-make.patch: File removed.
+ * src/Makefile.am (EXTRA_DIST): Remove inst-eudoragpg.nsi,
+ uninst-eudoragpg.nsi, inst-gpgee.nsi, uninst-gpgee.nsi,
+ inst-jpeg.nsi, uninst-jpeg.nsi, inst-winpt.nsi, uninst-winpt.nsi.
+ (gpg4win_spkgs): Remove libgsasl, add regex.
+ (gpg4win_mpkgs): Add crypt.
+ (gpg4win_bpkgs): Remove jpeg, gpgee, crypt, regex.
+ (gpg4win_pkg_crypt_make, gpg4win_pkg_crypt_make_args_inst): New.
+ (gpg4win_pkg_libgpg_error_configure): Add --enable-static.
+ (gpg4win_pkg_winpt_configure): Removed.
+ * src/inst-eudoragpg.nsi, src/uninst-eudoragpg.nsi,
+ src/inst-gpgee.nsi, src/uninst-gpgee.nsi, src/inst-jpeg.nsi,
+ src/uninst-jpeg.nsi, src/inst-winpt.nsi, src/uninst-winpt.nsi:
+ Files removed.
+ * src/installer.nsi: Remove check for gpgee.dll.
+ * src/uninst-crypt.nsi: Update source path.
+ * src/inst-crypt.nsi: Update source path.
+ * src/uninst-regex.nsi: Update source path, update dll name.
+ * src/inst-regex.nsi: Update source path, update dll name.
+ * src/uninst-claws-mail.nsi: Delete jpeg62.dll.
+ * src/inst-sections.nsi: Remove support for jpeg, winpt, eudoragpg.
+
2010-05-04 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Update to glib 2.24.0, atk 1.30.0,
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/Makefile.am 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,4 +1,4 @@
-# Makefile.am - Installer for GnuPG 4 Windows Makefile.
+ # Makefile.am - Installer for GnuPG 4 Windows Makefile.
# Copyright (C) 2005, 2008 g10 Code GmbH
#
# This file is part of GPG4Win.
@@ -23,7 +23,7 @@
SUBDIRS = po packages include doc src
EXTRA_DIST = autogen.sh README.SVN ONEWS \
- patches/pthreads-w32-2-7-0-release/01-make.patch \
+ patches/pthreads-w32-2-8-0-release/01-make.patch \
patches/glib-2.12.12/01-giowin32.patch \
patches/glib-2.12.12/02-gspawn-w32.patch \
patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
@@ -38,7 +38,6 @@
patches/gpgme-1.2.0/03-w32-socket.patch \
patches/gpgme-1.2.0/04-check-agent.patch \
patches/gpgme-1.2.0/05-is-socket.patch \
- patches/winpt/01-gpg-path.patch \
patches/gpgex/01-no-checksums.patch \
patches/gpgex-0.9.5/01-default-no-suffix.patch \
patches/gnupg2/01-version.patch.in \
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/configure.ac 2010-05-11 12:27:38 UTC (rev 1417)
@@ -196,9 +196,6 @@
GPG4WIN_BPKG_GNU([gettext], [libiconv])
GPG4WIN_SPKG([zlib])
-GPG4WIN_BPKG_GNUWIN32_LIB([crypt])
-GPG4WIN_BPKG_GNUWIN32([regex])
-GPG4WIN_BPKG_GNUWIN32([jpeg])
GPG4WIN_BPKG_GNUWIN32([bsfilter])
GPG4WIN_BPKG_GTK([pkgconfig])
@@ -233,13 +230,14 @@
GPG4WIN_SPKG([scute], [libgpg-error libassuan])
GPG4WIN_SPKG([paperkey])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
-GPG4WIN_SPKG([winpt], [gpgme gnupg2])
GPG4WIN_SPKG([libgsasl])
GPG4WIN_SPKG([libtasn1])
GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 libgcrypt])
GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
GPG4WIN_SPKG([libxml2], [zlib])
-GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
+GPG4WIN_SPKG([regex])
+GPG4WIN_SPKG([crypt])
+GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng 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-05-11 09:34:59 UTC (rev 1416)
+++ trunk/include/config.nsi.in 2010-05-11 12:27:38 UTC (rev 1417)
@@ -104,10 +104,6 @@
!define gpg4win_pkg_gpa @gpg4win_pkg_gpa@
!define gpg4win_pkg_gpa_version @gpg4win_pkg_gpa_version@
- at HAVE_PKG_WINPT@
-!define gpg4win_pkg_winpt @gpg4win_pkg_winpt@
-!define gpg4win_pkg_winpt_version @gpg4win_pkg_winpt_version@
-
@HAVE_PKG_LIBGSASL@
!define gpg4win_pkg_libgsasl @gpg4win_pkg_libgsasl@
!define gpg4win_pkg_libgsasl_version @gpg4win_pkg_libgsasl_version@
@@ -138,6 +134,14 @@
!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@
+
@HAVE_PKG_CLAWS_MAIL@
!define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
!define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
@@ -170,24 +174,10 @@
!define gpg4win_pkg_bsfilter_plugin @gpg4win_pkg_bsfilter_plugin@
!define gpg4win_pkg_bsfilter_plugin_version @gpg4win_pkg_bsfilter_plugin_version@
-#@HAVE_PKG_EUDORAGPG@
-#!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
-#!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
-
@HAVE_PKG_ZLIB@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
!define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
- at HAVE_PKG_CRYPT@
-!define gpg4win_pkg_crypt @gpg4win_pkg_crypt@
-!define gpg4win_pkg_crypt_version @gpg4win_pkg_crypt_version@
-!define gpg4win_pkg_crypt_src @gpg4win_pkg_crypt_src@
-
- at HAVE_PKG_REGEX@
-!define gpg4win_pkg_regex @gpg4win_pkg_regex@
-!define gpg4win_pkg_regex_version @gpg4win_pkg_regex_version@
-!define gpg4win_pkg_regex_src @gpg4win_pkg_regex_src@
-
@HAVE_PKG_PTHREADS_W32@
!define gpg4win_pkg_pthreads_w32 @gpg4win_pkg_pthreads_w32@
!define gpg4win_pkg_pthreads_w32_version @gpg4win_pkg_pthreads_w32_version@
@@ -200,12 +190,6 @@
!define gpg4win_pkg_libpng @gpg4win_pkg_libpng@
!define gpg4win_pkg_libpng_version @gpg4win_pkg_libpng_version@
- at HAVE_PKG_JPEG@
-!define gpg4win_pkg_jpeg @gpg4win_pkg_jpeg@
-!define gpg4win_pkg_jpeg_version @gpg4win_pkg_jpeg_version@
-!define gpg4win_pkg_jpeg_dev @gpg4win_pkg_jpeg_dev@
-!define gpg4win_pkg_jpeg_src @gpg4win_pkg_jpeg_src@
-
@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-05-11 09:34:59 UTC (rev 1416)
+++ trunk/packages/packages.current 2010-05-11 12:27:38 UTC (rev 1417)
@@ -34,47 +34,22 @@
chk 8e8b93fa5eb80df1afe5422309dca42964562d7e
-# Gnuwin32 packages orginally hosted at sf.net but mirrored at g10code
-# for easier download.
-server ftp://ftp.g10code.com/mirrors/gnuwin32
-
-file jpeg-6b-4-bin.zip
-chk d6309212c783cffe8ea9d2c7c8913b69709796fe
-file jpeg-6b-4-lib.zip
-chk 858cbedcefcc265e5eec35a5c7a20bcde3de4399
-file jpeg-6b-4-src.zip
-chk fb46e04938e28bc1ecea1e7bb8b92414129faf96
-
-file crypt-2.2.5-lib.zip
-chk 77482f40ce2c65c0e1b807a07049f53823861266
-file crypt-2.2.5-src.zip
-chk 91c4c5e2790bc19909b03d6eaaf5d6c205b65f07
-
-file regex-0.12-bin.zip
-chk 13000b102f2e0ce5142ce0b5081820337c24da7d
-file regex-0.12-lib.zip
-chk 37e5aa61bdf26cd182ebc6169528c86f165c7e09
-file regex-0.12-src.zip
-chk b9faae10efae552f23c213891a3ed8187cb7d017
-
#
# GNU TLS and support libraries
#
-server ftp://alpha.gnu.org/gnu/gsasl
+server ftp://ftp.gnu.org/pub/gnu
-file libgsasl-0.2.29.tar.gz
-chk 188c9a18db481f968cadb7c77a5a24f4cbf3d03d
+file gsasl/libgsasl-1.4.4.tar.gz
+chk d32d29a5c599b2d54f214fc5747559bc890f24de
-server ftp://ftp.gnu.org/pub/gnu/gnutls
+file gnutls/libtasn1-2.2.tar.gz
+chk d6e0d449cf2da04c93f498d2cf4415f572611b46
-file libtasn1-1.7.tar.gz
-chk 2d7bfe0d84f38a5450d8bab511eb1ec4036f18ec
+file gnutls/gnutls-2.8.6.tar.bz2
+chk bff911d4fd7389aa6698a644b3748eb2d23715bc
-file gnutls-2.6.3.tar.bz2
-chk f9b6a1d6135ef0a57a5cdd9fcb3e82bc62a27dcd
-
#
# libetpan for claws
#
@@ -101,15 +76,31 @@
chk 750b2bcd4ee3bf8595baf97e1881f1a57b1ef363
#
+# 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/scratch
+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/scratch
+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
-server http://www.claws-mail.org/win32
+
file bsfilter-1.0.16-lib.tar.gz
chk c7fa5ec9c70c75b7b1bc852bac8eb0a5ec9e01ea
-server http://www.claws-mail.org/win32
+
file bsfilter-1.0.16-src.tar.gz
chk fe718884dd7ca0652613a2cb5c302ac6323605d8
@@ -119,34 +110,28 @@
# (Kept on our own mirror due to Sourceforge peculiarities.)
server http://www.claws-mail.org/win32
+
file claws-mail-3.7.6.tar.bz2
chk 9c695df08b125e8f1d343882975415315a454acc
-server http://www.claws-mail.org/win32
file attachwarner-0.2.19.tar.gz
chk 14289b0906bb780712cedd9863b65885b0213465
-server http://www.claws-mail.org/win32
file bsfilter_plugin-1.0.4.tar.gz
chk 0f8cbd7dce78f024423885eccade497c7f46d8b0
-server http://www.claws-mail.org/win32
file gtkhtml2_viewer-0.27cvs1.tar.gz
chk dab46ed8032a2f0b5605c3baf635a804fe567eac
-server http://www.claws-mail.org/win32
file notification_plugin-0.25cvs2.tar.gz
chk 85fe535667d947c2fefcca4cd65421c6dae4e870
-server http://www.claws-mail.org/win32
file rssyl-0.27cvs1.tar.gz
chk 27f1a319b5828310b254a7f909792fdedff8aa5c
-server http://www.claws-mail.org/win32
file tnef_parse-0.3.8.tar.gz
chk f99f5c08a99430fa63ccf4095137df5a0f6e566d
-server http://www.claws-mail.org/win32
file vcalendar-2.0.8.tar.gz
chk 7717d49701a143a4dc8674865f9ef960d2fe7cbf
@@ -155,10 +140,9 @@
#
server ftp://sources.redhat.com/pub
-file pthreads-win32/pthreads-w32-2-7-0-release.tar.gz
-chk e9f66acde58136ab67e2167412773f727cd13a9d
+file pthreads-win32/pthreads-w32-2-8-0-release.tar.gz
+chk da8371cb20e8e238f96a1d0651212f154d84a9ac
-
#
# GLIB
#
@@ -180,6 +164,7 @@
name atk-1.30.0.zip
file atk_1.30.0-1_win32.zip
chk 542d772614266b7d18fa72b53ecd5abc82f938e3
+
name atk-dev-1.30.0.zip
file atk-dev_1.30.0-1_win32.zip
chk 75913d22b51afe28c8a3057f6bf4b5b1aa2bf17d
@@ -266,9 +251,11 @@
chk f69cb48311d60664bac7cf68351c175c7a214ae6
server http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16
+
name gtk+-2.16.6.zip
file gtk+_2.16.6-2_win32.zip
chk 012853e6de814ebda0cc4459f9eed8ae680e6d17
+
name gtk+-dev-2.16.6.zip
file gtk+-dev_2.16.6-2_win32.zip
chk 9f1bf652660076df7f70a855efc7eecbd1e8fced
@@ -281,6 +268,7 @@
name pkgconfig-0.23.tar.gz
file pkg-config-0.23.tar.gz
chk b59dddd6b5320bd74c0f74b3339618a327096b2a
+
name pkgconfig-0.23.zip
file pkg-config_0.23-3_win32.zip
chk d063e705812e1ee7feb8f35d51b3cad04ca13b0d
@@ -294,42 +282,6 @@
chk 7a3488f5844068d67074f2507dd8a7ed9c69ff04
#
-# WinPT
-#
-server http://wald.intevation.org/frs/download.php
-
-#file 265/winpt-1.0.0.tar.bz2
-#chk 7a3589a0ce3a81e3b94547ffdd76bf53d51e919f
-#file 272/winpt-1.0.1.tar.bz2
-#chk 574b7766701aaaef6e388d8b3ad68a171c9c071f
-
-# No more WinPT - at least for now
-#file 312/winpt-1.2.0.tar.bz2
-#chk 050f93a0d74385ce90e8934e49c11f171d495c5a
-
-
-#
-# GPGee
-#
-# 2007-09-11: Replaced by gpgex.
-#
-# Note that the -bin package has been repackaged from the
-# -noinstaller package using these commands:
-# mkdir gpgee-tmp
-# unzip ../GPGee-1.2.3-noinstaller.zip
-# gpg --verify GPGee.zip.asc
-# unzip GPGee.zip
-# rm GPGee/uninst.exe
-# zip ../GPGee-1.2.3-bin.zip GPGee/*
-# server ftp://ftp.gnupg.org/gcrypt/gpgee
-#
-#file GPGee-1.3.1-noinstaller.zip
-#chk 6e44bbf61776e0a6c8714a514fa39489e94c0179
-#file GPGee-1.3.1-source.zip
-#chk b04fa9ea81fc77844c7aa2e3eda042d819d8e9f1
-
-
-#
# GpgOL
#
#server ftp://ftp.g10code.com/g10code/gpgol
Added: trunk/patches/pthreads-w32-2-8-0-release/01-make.patch
===================================================================
--- trunk/patches/pthreads-w32-2-8-0-release/01-make.patch 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/patches/pthreads-w32-2-8-0-release/01-make.patch 2010-05-11 12:27:38 UTC (rev 1417)
@@ -0,0 +1,34 @@
+#! /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
Property changes on: trunk/patches/pthreads-w32-2-8-0-release/01-make.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/Makefile.am 2010-05-11 12:27:38 UTC (rev 1417)
@@ -45,19 +45,16 @@
inst-bsfilter_plugin.nsi uninst-bsfilter_plugin.nsi \
inst-crypt.nsi uninst-crypt.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
- inst-eudoragpg.nsi uninst-eudoragpg.nsi \
inst-gettext.nsi uninst-gettext.nsi \
inst-glib.nsi uninst-glib.nsi \
inst-gnupg2.nsi uninst-gnupg2.nsi \
inst-gpa.nsi uninst-gpa.nsi \
- inst-gpgee.nsi uninst-gpgee.nsi \
inst-gpgme.nsi uninst-gpgme.nsi \
inst-scute.nsi uninst-scute.nsi \
inst-paperkey.nsi uninst-paperkey.nsi \
inst-gpgol.nsi uninst-gpgol.nsi \
inst-gpgex.nsi uninst-gpgex.nsi \
inst-gtk+.nsi uninst-gtk+.nsi \
- inst-jpeg.nsi uninst-jpeg.nsi \
inst-libassuan.nsi uninst-libassuan.nsi \
inst-libgcrypt.nsi uninst-libgcrypt.nsi \
inst-libgpg-error.nsi uninst-libgpg-error.nsi \
@@ -76,7 +73,6 @@
inst-pthreads-w32.nsi uninst-pthreads-w32.nsi \
inst-regex.nsi uninst-regex.nsi \
inst-w32pth.nsi uninst-w32pth.nsi \
- inst-winpt.nsi uninst-winpt.nsi \
inst-zlib.nsi uninst-zlib.nsi \
inst-bsfilter.nsi uninst-bsfilter.nsi \
inst-qt.nsi uninst-qt.nsi \
@@ -101,11 +97,11 @@
# Supported source packages.
gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex libpng \
- gpa winpt libgsasl libtasn1 opencdk gnutls curl libxml2 \
+ gpa libgsasl libtasn1 opencdk gnutls curl libxml2 \
libetpan claws-mail notification_plugin gtkhtml2_viewer \
vcalendar rssyl gnupg2 pinentry libassuan libksba libgcrypt \
adns dirmngr w32pth scute paperkey tnef_parse attachwarner \
- bsfilter_plugin
+ bsfilter_plugin regex
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -153,7 +149,8 @@
#gpg4win_pkg_libgpg_error_configure = \
# --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
gpg4win_pkg_libgpg_error_configure = --silent \
- CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
+ CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
+ --enable-static
# We convert the PO files to UTF-8. FIXME: This should be done in
# libgpg-error proper.
@@ -235,9 +232,6 @@
--with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
-gpg4win_pkg_winpt_configure = --silent \
- --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
-
gpg4win_pkg_gnutls_configure = \
--disable-cxx \
--with-libtasn1-prefix=$(idir) \
@@ -294,7 +288,7 @@
gpg4win_pkg_paperkey_configure = --silent
# Supported make-only source packages.
-gpg4win_mpkgs = pthreads-w32 bzip2 zlib
+gpg4win_mpkgs = pthreads-w32 bzip2 zlib crypt
# Extra options for the make invocations for individual packages.
# make_flags is used for building, make_args_inst is used for installing.
@@ -310,6 +304,12 @@
gpg4win_pkg_bzip2_make_args_inst = \
PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
+gpg4win_pkg_crypt_make = \
+ CC=$(CC) AR=$(AR)
+
+gpg4win_pkg_crypt_make_args_inst = \
+ prefix=$$$${pkgidir}
+
gpg4win_pkg_zlib_make_args = -fwin32/Makefile.gcc PREFIX=i586-mingw32msvc- IMPLIB=libz.dll.a
gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
@@ -317,9 +317,8 @@
LIBRARY_PATH=$$$${pkgidir}/lib SHARED_MODE=1 IMPLIB=libz.dll.a
# Supported binary packages.
-gpg4win_bpkgs = libiconv gettext pkgconfig jpeg pango expat freetype fontconfig cairo \
- atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs \
- kleopatra bsfilter
+gpg4win_bpkgs = libiconv gettext pkgconfig pango expat freetype fontconfig cairo \
+ atk gtk+ qt kdesupport oxygen-icons kdelibs kleopatra bsfilter
# libiconv needs some special magic to generate a usable import
# library.
@@ -358,18 +357,10 @@
echo "libdir=\"$$$${pkgidir}/lib\"" >> lib/libz.la;)
endef
-# To make shure that we link against the static versions we need
+# 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
-
-# To make shure that we link against the static versions we need
-# remove the import libs from regex
-# FIXME: We need to shared version or libtool refuses to build the
-# claws plugin.
-#define gpg4win_pkg_regex_post_install
-#(cd $$$${pkgidir}/lib && rm libregex.dll.a libregex.lib)
+#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,
Modified: trunk/src/inst-crypt.nsi
===================================================================
--- trunk/src/inst-crypt.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-crypt.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -30,7 +30,7 @@
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_crypt_src}"
+ File "${gpg4win_pkg_crypt}"
!else
# Nothing to install as we link statically.
!endif
Deleted: trunk/src/inst-eudoragpg.nsi
===================================================================
--- trunk/src/inst-eudoragpg.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-eudoragpg.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,41 +0,0 @@
-# inst-eudoragpg.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}/eudoragpg-${gpg4win_pkg_eudoragpg_version}
-
-
-${MementoSection} "EudoraGPG" SEC_eudoragpg
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_eudoragpg}"
-!else
- #File ${prefix}/bin/eudoragpg.exe
-
- SetOutPath "$INSTDIR\share\eudoragpg"
- File "${prefix}/share/eudoragpg/eudoragpg.html"
-!endif
-${MementoSectionEnd}
-
-
-LangString DESC_SEC_eudoragpg ${LANG_ENGLISH} \
- "EudoraGPG is a plugin for the Eudora mail program"
Deleted: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-gpgee.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,72 +0,0 @@
-# inst-gpgee.nsi - Installer snippet for GPGee -*- 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}/gpgee-${gpg4win_pkg_gpgee_version}
-
-
-${MementoUnselectedSection} "GPGee" SEC_gpgee
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_gpgee_src}"
-!else
- # Try to unregister first
- UnRegDLL "$INSTDIR\GPGee.dll"
- Sleep 500
-
- ClearErrors
- SetOverwrite try
- File ${prefix}/GPGee/GPGee.dll
- SetOverwrite lastused
- ifErrors 0 +3
- File /oname=GPGee.dll.tmp ${prefix}/GPGee/GPGee.dll
- Rename /REBOOTOK GPGee.dll.tmp GPGee.dll
-
- ClearErrors
- SetOverwrite try
- File ${prefix}/GPGee/GPGee.DEU
- SetOverwrite lastused
- ifErrors 0 +3
- File /oname=GPGee.DEU.tmp ${prefix}/GPGee/GPGee.DEU
- Rename /REBOOTOK GPGee.DEU.tmp GPGee.DEU
-
- File ${prefix}/GPGee/GPGee.hlp
-
- # Register the DLL.
- RegDLL "$INSTDIR\GPGee.dll"
- ifErrors 0 +2
- MessageBox MB_OK "$(T_GPGee_RegFailed)"
-
- SetOutPath "$INSTDIR\share\gpgee"
- File ${prefix}/GPGee/gpl.txt
-
-!endif
-${MementoSectionEnd}
-
-LangString T_GPGee_RegFailed ${LANG_ENGLISH} \
- "Warning: Registration of the GPGee explorer extension failed."
-
-LangString DESC_SEC_gpgee ${LANG_ENGLISH} \
- "GPG Explorer Extensions"
-
-LangString DESC_Menu_gpgee_hlp ${LANG_ENGLISH} \
- "Show the online manual of GPGee"
Deleted: trunk/src/inst-jpeg.nsi
===================================================================
--- trunk/src/inst-jpeg.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-jpeg.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,47 +0,0 @@
-# inst-libpng.nsi - Installer snippet for jpeg. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2006 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}/jpeg-${gpg4win_pkg_jpeg_version}
-
-!ifdef DEBUG
-Section "jpeg" SEC_jpeg
-!else
-Section "-jpeg" SEC_jpeg
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_jpeg_src}"
-!else
- File ${prefix}/bin/jpeg62.dll
-!ifdef DEBUG
- # We install a couple of binaries that may be useful for testing.
- File ${prefix}/bin/cjpeg.exe
- File ${prefix}/bin/djpeg.exe
- File ${prefix}/bin/exifautotran
- File ${prefix}/bin/jpegexiforient.exe
- File ${prefix}/bin/jpegtran.exe
- File ${prefix}/bin/rdjpgcom.exe
- File ${prefix}/bin/wrjpgcom.exe
-!endif
-!endif
-SectionEnd
Modified: trunk/src/inst-regex.nsi
===================================================================
--- trunk/src/inst-regex.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-regex.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -30,8 +30,8 @@
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_regex_src}"
+ File "${gpg4win_pkg_regex}"
!else
- File ${prefix}/bin/regex.dll
+ File ${prefix}/bin/libregex-1.dll
!endif
SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-sections.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -35,9 +35,6 @@
!ifdef HAVE_PKG_CRYPT
!include "inst-crypt.nsi"
!endif
-!ifdef HAVE_PKG_JPEG
-!include "inst-jpeg.nsi"
-!endif
!ifdef HAVE_PKG_KDESUPPORT
!include "inst-kdesupport.nsi"
!endif
@@ -152,9 +149,6 @@
!ifdef HAVE_PKG_GPA
!include "inst-gpa.nsi"
!endif
-!ifdef HAVE_PKG_WINPT
-!include "inst-winpt.nsi"
-!endif
!ifdef HAVE_PKG_GPGOL
!include "inst-gpgol.nsi"
!endif
@@ -191,9 +185,6 @@
!ifdef HAVE_PKG_BSFILTER_PLUGIN
!include "inst-bsfilter_plugin.nsi"
!endif
-#!ifdef HAVE_PKG_EUDORAGPG
-#!include "inst-eudoragpg.nsi"
-#!endif
!ifdef HAVE_PKG_COMPENDIUM_DE
!include "inst-compendium_de.nsi"
!endif
@@ -229,9 +220,6 @@
!ifdef HAVE_PKG_COMPENDIUM_DE
!include "uninst-compendium_de.nsi"
!endif
-#!ifdef HAVE_PKG_EUDORAGPG
-#!include "uninst-eudoragpg.nsi"
-#!endif
!ifdef HAVE_PKG_CLAWS_MAIL
!include "uninst-claws-mail.nsi"
!endif
@@ -268,9 +256,6 @@
!ifdef HAVE_PKG_GPGOL
!include "uninst-gpgol.nsi"
!endif
-!ifdef HAVE_PKG_WINPT
-!include "uninst-winpt.nsi"
-!endif
!ifdef HAVE_PKG_GPA
!include "uninst-gpa.nsi"
!endif
@@ -395,9 +380,6 @@
!ifdef HAVE_PKG_KDESUPPORT
!include "uninst-kdesupport.nsi"
!endif
-!ifdef HAVE_PKG_JPEG
-!include "uninst-jpeg.nsi"
-!endif
!ifdef HAVE_PKG_CRYPT
!include "uninst-crypt.nsi"
!endif
@@ -504,17 +486,6 @@
calc_defaults_gpa_done:
!endif
-!ifdef HAVE_PKG_WINPT
- g4wihelp::config_fetch_bool "inst_winpt"
- StrCmp $R0 "1" 0 calc_defaults_winpt_not_one
- !insertmacro SelectSection ${SEC_winpt}
- Goto calc_defaults_winpt_done
- calc_defaults_winpt_not_one:
- StrCmp $R0 "0" 0 calc_defaults_winpt_done
- !insertmacro UnselectSection ${SEC_winpt}
-calc_defaults_winpt_done:
-!endif
-
!ifdef HAVE_PKG_CLAWS_MAIL
g4wihelp::config_fetch_bool "inst_claws_mail"
StrCmp $R0 "1" 0 calc_defaults_claws_mail_not_one
@@ -611,9 +582,6 @@
!ifdef HAVE_PKG_LIBPNG
!insertmacro UnselectSection ${SEC_libpng}
!endif
-!ifdef HAVE_PKG_JPEG
- !insertmacro UnselectSection ${SEC_jpeg}
-!endif
!ifdef HAVE_PKG_PKGCONFIG
!insertmacro UnselectSection ${SEC_pkgconfig}
!endif
@@ -814,13 +782,6 @@
skip_gnupg2:
!endif
-!ifdef HAVE_PKG_WINPT
- !insertmacro SectionFlagIsSet ${SEC_winpt} ${SF_SELECTED} have_winpt skip_winpt
- have_winpt:
- !insertmacro SelectSection ${SEC_gpgme}
- skip_winpt:
-!endif
-
!ifdef HAVE_PKG_GPA
!insertmacro SectionFlagIsSet ${SEC_gpa} ${SF_SELECTED} have_gpa skip_gpa
have_gpa:
@@ -842,7 +803,6 @@
!insertmacro SelectSection ${SEC_zlib}
!insertmacro SelectSection ${SEC_gtk_}
!insertmacro SelectSection ${SEC_libpng}
- !insertmacro SelectSection ${SEC_jpeg}
!insertmacro SelectSection ${SEC_glib}
!insertmacro SelectSection ${SEC_gpgme}
!insertmacro SelectSection ${SEC_pthreads_w32}
@@ -1085,7 +1045,6 @@
!endif
# Package "pkgconfig" has no dependencies.
- # Package "jpeg" has no dependencies.
!ifdef HAVE_PKG_LIBPNG
!insertmacro SectionFlagIsSet ${SEC_libpng} \
@@ -1179,14 +1138,6 @@
# Return
# no_gpa_avail:
#!endif
-#!ifdef HAVE_PKG_WINPT
-# SectionGetFlags ${SEC_winpt} $R0
-# IntOp $R0 $R0 & ${SF_SELECTED}
-# IntCmp $R0 ${SF_SELECTED} 0 no_winpt_avail
-# Exec "$INSTDIR\WinPT.exe --keymanager"
-# Return
-# no_winpt_avail:
-#!endif
# MessageBox MB_OK "$(T_NoKeyManager)"
#FunctionEnd
@@ -1212,15 +1163,9 @@
!ifdef HAVE_PKG_GPA
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpa} $(DESC_SEC_gpa)
!endif
-!ifdef HAVE_PKG_WINPT
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_winpt} $(DESC_SEC_winpt)
-!endif
!ifdef HAVE_PKG_CLAWS_MAIL
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_claws_mail} $(DESC_SEC_claws_mail)
!endif
-#!ifdef HAVE_PKG_EUDORAGPG
-# !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
-#!endif
!ifdef HAVE_PKG_KLEOPATRA
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_kleopatra} $(DESC_SEC_kleopatra)
!endif
@@ -1268,16 +1213,6 @@
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)"
-!ifdef HAVE_PKG_WINPT
- SectionGetFlags ${SEC_winpt} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_winpt_menu
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WinPT.lnk" \
- "$INSTDIR\WinPT.exe" \
- "" "$INSTDIR\WinPT.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_winpt)
- no_winpt_menu:
-!endif
-
!ifdef HAVE_PKG_GPA
SectionGetFlags ${SEC_gpa} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1314,16 +1249,6 @@
no_claws_mail_menu:
!endif
-#!ifdef HAVE_PKG_EUDORAGPG
-# SectionGetFlags ${SEC_eudoragpg} $R0
-# IntOp $R0 $R0 & ${SF_SELECTED}
-# IntCmp $R0 ${SF_SELECTED} 0 no_eudoragpg_menu
-# CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\EudoraGPG Plugin.lnk" \
-# "$INSTDIR\share\eudoragpg\eudoragpg.html" \
-# "" "" "" SW_SHOWNORMAL "" ""
-# no_eudoragpg_menu:
-#!endif
-
!ifdef HAVE_PKG_MAN_NOVICE_EN
SectionGetFlags ${SEC_man_novice_en} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1438,18 +1363,6 @@
CreateDirectory "$DESKTOP\$(DESC_Desktop_manuals)"
-!ifdef HAVE_PKG_WINPT
- SectionGetFlags ${SEC_winpt} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_winpt_desktop
- # Create link which directly starts the WinPT key manager
- CreateShortCut "$DESKTOP\WinPT.lnk" \
- "$INSTDIR\winpt.exe" \
- "--keymanager" "$INSTDIR\winpt.exe" "" \
- SW_SHOWNORMAL "" $(DESC_Menu_winpt)
- no_winpt_desktop:
-!endif
-
!ifdef HAVE_PKG_GPA
SectionGetFlags ${SEC_gpa} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1574,16 +1487,6 @@
Delete "$QUICKLAUNCH\GnuPG FAQ.lnk"
Delete "$QUICKLAUNCH\Gpg4Win README.lnk"
-!ifdef HAVE_PKG_WINPT
- SectionGetFlags ${SEC_winpt} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_winpt_quicklaunch
- CreateShortCut "$QUICKLAUNCH\WinPT.lnk" \
- "$INSTDIR\winpt.exe" \
- "" "$INSTDIR\winpt.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_winpt)
- no_winpt_quicklaunch:
-!endif
-
!ifdef HAVE_PKG_GPA
SectionGetFlags ${SEC_gpa} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
Deleted: trunk/src/inst-winpt.nsi
===================================================================
--- trunk/src/inst-winpt.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/inst-winpt.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,51 +0,0 @@
-# inst-winpt.nsi - Installer snippet for WinPT -*- 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}/winpt-${gpg4win_pkg_winpt_version}
-
-${MementoUnselectedSection} "WinPT" SEC_winpt
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_winpt}"
-!else
- File ${prefix}/bin/WinPT.exe
- File ${prefix}/bin/PTD.dll
- #File ${winptpath}/keyserver.conf
-
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
- File ${prefix}/share/locale/de/LC_MESSAGES/winpt.mo
-
- # Do not install the documentation until we have agreed on the filenames.
- #SetOutPath "$INSTDIR\share\winpt"
- #File ${prefix}/NEWS.txt
- #File ${prefix}/README.txt
-!endif
-${MementoSectionEnd}
-
-
-LangString DESC_SEC_winpt ${LANG_ENGLISH} \
- "Windows Privacy Tray"
-
-LangString DESC_Menu_winpt ${LANG_ENGLISH} \
- "Run the Windows Privacy Tray key management tool. \
- This is a versatile key management and encryption tool."
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/installer.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -435,7 +435,6 @@
IfFileExists $INSTDIR\winpt.exe print_warning
IfFileExists $INSTDIR\gpa.exe print_warning
IfFileExists $INSTDIR\gpgol.dll print_warning
- IfFileExists $INSTDIR\gpgee.dll print_warning
IfFileExists $INSTDIR\dirmngr.exe print_warning
Return
print_warning:
Modified: trunk/src/uninst-claws-mail.nsi
===================================================================
--- trunk/src/uninst-claws-mail.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-claws-mail.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -30,6 +30,10 @@
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"
Modified: trunk/src/uninst-crypt.nsi
===================================================================
--- trunk/src/uninst-crypt.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-crypt.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -27,7 +27,7 @@
; Uninstaller section.
Section "-un.crypt"
!ifdef SOURCES
- Push "${gpg4win_pkg_crypt_src}"
+ Push "${gpg4win_pkg_crypt}"
Call un.SourceDelete
!else
# Nothing to uninstall
Deleted: trunk/src/uninst-eudoragpg.nsi
===================================================================
--- trunk/src/uninst-eudoragpg.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-eudoragpg.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,40 +0,0 @@
-# uninst-eudoragpg.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}/eudoragpg-${gpg4win_pkg_eudoragpg_version}
-
-
-# Uninstaller section.
-Section "-un.eudoragpg"
-!ifdef SOURCES
- Push "${gpg4win_pkg_eudoragpg}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\eudoragpg.exe"
-
- Delete "$INSTDIR\share\eudoragpg\eudoragpg.html"
- RMDir "$INSTDIR\share\eudoragpg"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
Deleted: trunk/src/uninst-gpgee.nsi
===================================================================
--- trunk/src/uninst-gpgee.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-gpgee.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,45 +0,0 @@
-# uninst-gpgee.nsi - Installer snippet for GPGee. -*- 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}/gpgee-${gpg4win_pkg_gpgee_version}
-
-
-; Uninstaller section.
-Section "-un.gpgee"
-!ifdef SOURCES
- Push "${gpg4win_pkg_gpgee_src}"
- Call un.SourceDelete
-!else
-
- UnRegDLL "$INSTDIR\GPGee.dll"
-
- Delete /REBOOTOK "$INSTDIR\GPGee.dll"
- Delete /REBOOTOK "$INSTDIR\GPGee.DEU"
- Delete "$INSTDIR\GPGee.hlp"
-
- Delete "$INSTDIR\share\gpgee\gpl.txt"
- RMDir "$INSTDIR\share\gpgee"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
Deleted: trunk/src/uninst-jpeg.nsi
===================================================================
--- trunk/src/uninst-jpeg.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-jpeg.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,45 +0,0 @@
-# uninst-jpeg.nsi - Installer snippet for jpeg. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2006 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}/jpeg-${gpg4win_pkg_jpeg_version}
-
-
-; Uninstaller section.
-Section "-un.jpeg"
-!ifdef SOURCES
- Push "${gpg4win_pkg_jpeg_src}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\jpeg62.dll"
-!ifdef DEBUG
- Delete "$INSTDIR\cjpeg.exe"
- Delete "$INSTDIR\djpeg.exe"
- Delete "$INSTDIR\exifautotran"
- Delete "$INSTDIR\jpegexiforient.exe"
- Delete "$INSTDIR\jpegtran.exe"
- Delete "$INSTDIR\rdjpgcom.exe"
- Delete "$INSTDIR\wrjpgcom.exe"
-!endif
- RMDir "$INSTDIR"
-!endif
-SectionEnd
Modified: trunk/src/uninst-regex.nsi
===================================================================
--- trunk/src/uninst-regex.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-regex.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -27,11 +27,14 @@
; Uninstaller section.
Section "-un.regex"
!ifdef SOURCES
- Push "${gpg4win_pkg_regex_src}"
+ Push "${gpg4win_pkg_regex}"
Call un.SourceDelete
!else
+ # Old version.
Delete "$INSTDIR\regex.dll"
+ Delete "$INSTDIR\libregex-1.dll"
+
RMDir "$INSTDIR"
!endif
SectionEnd
Deleted: trunk/src/uninst-winpt.nsi
===================================================================
--- trunk/src/uninst-winpt.nsi 2010-05-11 09:34:59 UTC (rev 1416)
+++ trunk/src/uninst-winpt.nsi 2010-05-11 12:27:38 UTC (rev 1417)
@@ -1,46 +0,0 @@
-# uninst-winpt.nsi - Installer snippet for winpt. -*- 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}/winpt-${gpg4win_pkg_winpt_version}
-
-
-; Uninstaller section.
-Section "-un.winpt"
-!ifdef SOURCES
- Push "${gpg4win_pkg_winpt}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\WinPT.exe"
- Delete "$INSTDIR\PTD.dll"
-
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\winpt.mo"
- RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-
- Delete "$INSTDIR\share\winpt\keyserver.conf"
- Delete "$INSTDIR\share\winpt\NEWS-0.10.txt"
- Delete "$INSTDIR\share\winpt\README-0.10.txt"
- RMDir "$INSTDIR\share\winpt"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-!endif
-SectionEnd
More information about the Gpg4win-commits
mailing list