[Gpg4win-commits] [git] Gpg4win - branch, gpg4win-2, updated. gpg4win-2.3.0-10-g466a07c
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Mar 30 11:14:25 CEST 2016
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, gpg4win-2 has been updated
via 466a07c513387646c93093cbe75e53126e4c9e26 (commit)
via 599c632706aa3ac60d9b89d9288332ec951bb366 (commit)
via f08f24fa6cd516375865d802b26ace7883a5f36f (commit)
via bab8a873710c95282b0a5190cd6dd37066693ac1 (commit)
via ef443a5954bc04984480f1141e2ce30cf3be4ba3 (commit)
via 30c06ce00681ded3ce0d63badd556be38146e9ea (commit)
from 10b5159ba45de74d06b4f573f4fb03d3c75812ac (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 466a07c513387646c93093cbe75e53126e4c9e26
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 30 11:13:11 2016 +0200
Update libgpg-error to 1.21
--
(cherry picked from commit 6a01ff06da69f7cfd4cbd2d05ac2346ad2bf3e01)
diff --git a/packages/packages.current b/packages/packages.current
index 2055006..807b7b6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -309,10 +309,10 @@ chk 6e38be3377340a21a1f13ff84b5e6adce97cd1d4
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
-# last-changed: 2015-11-12
+# last-changed: 2016-03-30
# by: ah
-file libgpg-error/libgpg-error-1.20.tar.bz2
-chk 89c961f63469739fe816a56dcdd86c2e1897cace
+file libgpg-error/libgpg-error-1.21.tar.bz2
+chk ef1dfb2f8761f019091180596e9e638d8cc37513
# last changed: 2016-03-30
# by: ah
commit 599c632706aa3ac60d9b89d9288332ec951bb366
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 30 11:11:59 2016 +0200
Update libgcrypt to 1.6.5
--
diff --git a/packages/packages.current b/packages/packages.current
index 2155ceb..2055006 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -314,10 +314,10 @@ server ftp://ftp.gnupg.org/gcrypt
file libgpg-error/libgpg-error-1.20.tar.bz2
chk 89c961f63469739fe816a56dcdd86c2e1897cace
-# last changed: 2015-09-08
+# last changed: 2016-03-30
# by: ah
-file libgcrypt/libgcrypt-1.6.4.tar.bz2
-chk ed52add1ce635deeb2f5c6650e52667debd4ec70
+file libgcrypt/libgcrypt-1.6.5.tar.bz2
+chk c3a5a13e717f7b3e3895650afc1b6e0d3fe9c726
# last-changed: 2015-06-05
# by: ah
commit f08f24fa6cd516375865d802b26ace7883a5f36f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 30 11:07:47 2016 +0200
Update libassuan
--
diff --git a/packages/packages.current b/packages/packages.current
index a736153..2155ceb 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -324,10 +324,11 @@ chk ed52add1ce635deeb2f5c6650e52667debd4ec70
file libksba/libksba-1.3.3.tar.bz2
chk 86fe0436f3c8c394d32e142ee410a9f9560173fb
-# last-changed: 2015-11-12
+
+# last-changed: 2015-12-11
# by: ah
-file libassuan/libassuan-2.4.0.tar.bz2
-chk 8b00866b3b0386e996cc6bdcb902c727f0d190a5
+file libassuan/libassuan-2.4.2.tar.bz2
+chk ac1047f9764fd4a4db7dafe47640643164394db9
# last changed: 2015-09-08
# by: ah
commit bab8a873710c95282b0a5190cd6dd37066693ac1
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 16:19:04 2015 +0200
Update gettext
* packages/packages.current(gettext): Update.
--
The old version does not compile with jessie default autotools.
(cherry picked from commit b5b8449f45c2debf30138cce950c9bb03c9fce1f)
diff --git a/packages/packages.current b/packages/packages.current
index ee42e9d..a736153 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,12 +17,13 @@
#
server ftp://ftp.cs.tu-berlin.de/pub/gnu
-# checked: 2014-06-20 ah - updated
+# last-changed: 2015-08-25
+# by: ah
# verified with key: 4622 25C3 B46F 3487 9FC8 496C D605 848E D7E6 9871
-file gettext/gettext-0.19.1.tar.xz
-chk e0d425de1bd1a16993b262ff37eaf08abee8f953
+file gettext/gettext-0.19.5.tar.xz
+chk bfe50a885076a24d63b9d9b242a409cc16727d24
-# checked: 2014-06-20 ah
+# checked: 2015-08-25 ah
file libiconv/libiconv-1.14.tar.gz
chk be7d67e50d72ff067b2c0291311bc283add36965
commit ef443a5954bc04984480f1141e2ce30cf3be4ba3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 30 10:50:15 2016 +0200
Update Portuguese translation
* po/pt.po: Update.
--
Updated translation provided by Marco A.G. Pinto. Thanks.
Encoding changed from UTF-8 to windows-1252 by Andre Heinecke.
diff --git a/po/pt.po b/po/pt.po
index 21704a2..793dc14 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,4 +1,4 @@
-# Portuguese translations for gpg4win package.
+# Portuguese translations for Gpg4win package.
# Copyright (C) 2010 g10 Code GmbH
# This file is distributed under the same license as the gpg4win package.
#
@@ -6,16 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"PO-Revision-Date: 2010-08-04 11:55-0000\n"
+"PO-Revision-Date: 2016-01-31 19:58+0000\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=windows-1252\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: PORTUGAL\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.6\n"
msgctxt "T_AlreadyRunning"
msgid "An instance of this installer is already running."
@@ -39,7 +38,7 @@ msgstr ""
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
-msgstr "Esta é a versão do Gpg4Win ${VERSION}"
+msgstr "Esta é a versão do Gpg4win ${VERSION}"
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
@@ -51,7 +50,7 @@ msgstr "data de lan
msgctxt "T_WelcomeTitleGpg4winSrc"
msgid "Welcome to the installation of the Gpg4win sources"
-msgstr "Bem-vindo à instalação do código fonte de Gpg4win"
+msgstr "Bem-vindo à instalação do código-fonte de Gpg4win"
msgctxt "T_AboutGpg4winSrc"
msgid ""
@@ -61,9 +60,9 @@ msgid ""
"included with Gpg4win are Free Software."
msgstr ""
"O Gpg4win é um pacote de instalação Windows para encriptação de e-mails e "
-"ficheiros usando o componente core do GnuPG para Windows. Ambos os standards "
-"relevantes de criptografia são suportados, OpenPGP e S/MIME. O Gpg4win e o "
-"software incluído são Software Livre."
+"ficheiros usando o componente núcleo do GnuPG para Windows. Ambos os "
+"standards relevantes de criptografia são suportados, OpenPGP e S/MIME. O "
+"Gpg4win e o software incluído são Software Livre."
msgctxt "T_AboutGpg4winSrcVersion"
msgid "This is Gpg4win version ${VERSION}"
@@ -174,7 +173,7 @@ msgid ""
"to deinstall previous versions on major upgrades.\n"
"Do you want to continue installing Gpg4win ${VERSION} anyway?"
msgstr ""
-"Uma versão antiga $R1 já foi instalada. Recomenda-se vivamente desinstalar "
+"Uma versão antiga $R1 já está instalada. Recomenda-se vivamente desinstalar "
"versões anteriores em upgrades.\n"
"Queres continuar a instalar o Gpg4win ${VERSION} mesmo assim?"
@@ -185,18 +184,18 @@ msgid ""
"\n"
"Do you want to continue installing Gpg4win?"
msgstr ""
-"Uma versão do Gpg4Win já se encontra instalada neste sistema. Não existe "
+"Uma versão do Gpg4win já se encontra instalada neste sistema. Não há "
"problema em instalar e daí substituir esta Versão.\n"
"\n"
-"Queres continuar a instalar o Gpg4Win?"
+"Queres continuar a instalar o Gpg4win?"
msgctxt "T_FoundOldSeeManual"
msgid ""
"Please see the Gpg4win user manual to learn how to migrate existing keys "
"from other GnuPG based installations to Gpg4win."
msgstr ""
-"Por favor lê o manual de utilizador do Gpg4Win para aprenderes a migrar "
-"chaves existentes de outras instalações baseadas no GnuPG para o Gpg4Win."
+"Por favor lê o manual de utilizador do Gpg4win para aprenderes a migrar "
+"chaves existentes de outras instalações baseadas no GnuPG para o Gpg4win."
msgctxt "T_FoundOldGnuPP"
msgid ""
@@ -209,7 +208,7 @@ msgstr ""
"Uma instalação antiga de GnuPP (GNU Privacy Project) foi detectada. Este "
"software já não é suportado e deve ser removido.\n"
"\n"
-"Queres continuar a instalar o Gpg4Win e tratar da instalação antiga mais "
+"Queres continuar a instalar o Gpg4win e tratar da instalação antiga mais "
"tarde?"
msgctxt "T_FoundOldGnuPT"
@@ -220,9 +219,9 @@ msgid ""
"Do you want to continue installing Gpg4win?"
msgstr ""
"Uma instalação de GnuPT foi detectada. Isto poderá causar problemas se usado "
-"com o Gpg4Win.\n"
+"com o Gpg4win.\n"
"\n"
-"Queres continuar a instalar o Gpg4Win?"
+"Queres continuar a instalar o Gpg4win?"
msgctxt "T_FoundOldWinPTSF"
msgid ""
@@ -232,10 +231,10 @@ msgid ""
"Do you want to continue installing Gpg4win and take care of the old "
"installation later?"
msgstr ""
-"Uma instalação antiga do WinPT hospedado por Sourceforge foi detectada. Esse "
+"Uma instalação antiga do WinPT hospedado em Sourceforge foi detectada. Esse "
"software não é mais suportado e deve ser removido.\n"
"\n"
-"Queres continuar a instalar o Gpg4Win e tratar da instalação antiga mais "
+"Queres continuar a instalar o Gpg4win e tratar da instalação antiga mais "
"tarde?"
msgctxt "T_FoundOldGnuPack"
@@ -246,7 +245,7 @@ msgid ""
"The installation will be aborted now!"
msgstr ""
"Uma instalação do GnuPG-Pack foi detectada. Tens de desinstalá-la antes de "
-"prosseguir com a instalação do Gpg4Win.\n"
+"prosseguir com a instalação do Gpg4win.\n"
"\n"
"A instalação será agora abortada!"
@@ -266,7 +265,7 @@ msgctxt "T_AdminNeeded"
msgid ""
"Warning: Administrator permissions required for a successful installation"
msgstr ""
-"Aviso: São necessárias permissões de Administrador para uma instalação bem "
+"Aviso: São necessárias permissões de Administrador para uma instalação bem-"
"sucedida."
msgctxt "T_CloseOtherApps"
@@ -275,10 +274,10 @@ msgid ""
"should close Outlook and all Explorer windows. Gpg4win will try to install "
"anyway but a reboot will be required then."
msgstr ""
-"Por favor assegura-te que outras aplicações não estão a correr. Em "
-"particular deves fechar o Outlook e todas as janelas do Windows Explorer. De "
-"qualquer forma o Gpg4win tentará instalar mas depois será necessário "
-"reiniciar o sistema."
+"Por favor assegura-te que outras aplicações não estão a executar. Em "
+"particular deves fechar o Outlook e todas as janelas do Explorer. De "
+"qualquer forma o Gpg4win tentará instalar sendo depois necessário reiniciar "
+"o sistema."
msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
@@ -295,8 +294,21 @@ msgid ""
"\n"
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
+"Uma versão antiga do Claws Mail foi encontrada na tua directoria de "
+"instalação.\n"
+"Por favor, nota que o Claws Mail já não é distribuído com o Gpg4win e está "
+"agora disponível como um pacote independente.\n"
+"Deves desinstalar o Claws Mail agora e, se quiseres continuar a usá-lo, "
+"instalar uma versão actualizada a partir de:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Desinstalar o Claws Mail do Gpg4win agora?"
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr "Instalar o GnuPG"
+
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
@@ -310,11 +322,11 @@ msgstr "Executar a ferramenta de gest
msgctxt "DESC_Menu_gpg4win_readme"
msgid "General information on Gpg4win"
-msgstr "Informação geral sobre Gpg4Win"
+msgstr "Informação geral sobre o Gpg4win"
msgctxt "DESC_Menu_gpg4win_howtosmime"
msgid "Instruction to configure S/MIME"
-msgstr ""
+msgstr "Instruções para configurar o S/MIME"
msgctxt "DESC_Menu_gnupg_faq"
msgid "Show the Frequently Asked Questions document for GnuPG"
@@ -322,7 +334,7 @@ msgstr "Mostrar o documento das Perguntas Frequentes (FAQ) do GnuPG"
msgctxt "T_GpgEX_RegFailed"
msgid "Warning: Registration of the GpgEX plugin failed."
-msgstr "Aviso: O registo do plugin GpgEx falhou."
+msgstr "Aviso: O registo do plugin GpgEX falhou."
msgctxt "DESC_SEC_gpgex"
msgid "GnuPG Shell Extension"
@@ -330,7 +342,7 @@ msgstr "GnuPG Shell Extension"
msgctxt "T_GpgOL_RegFailed"
msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
-msgstr "Aviso: O registo do plugin GpgOL Outlook falhou."
+msgstr "Aviso: O registo do plugin GpgOL para Outlook falhou."
msgctxt "DESC_SEC_gpgol"
msgid "GnuPG for Outlook"
@@ -346,27 +358,27 @@ msgstr "Executar a ferramenta de gest
msgctxt "DESC_Name_compendium"
msgid "Gpg4win Compendium"
-msgstr "Gpg4win Compêndio"
+msgstr "Compêndio Gpg4win"
msgctxt "DESC_SEC_compendium"
msgid "The Gpg4win documentation (English and German)"
-msgstr "Gpg4win Compêndio (Inglês e Alemão)"
+msgstr "A documentação do Gpg4win (Inglês e Alemão)"
msgctxt "DESC_Name_compendium_de_pdf"
msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win Compêndio (pdf, Alemão)"
+msgstr "Compêndio Gpg4win (pdf, Alemão)"
msgctxt "DESC_Name_compendium_en_pdf"
msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win Compêndio (pdf, Inglês)"
+msgstr "Compêndio Gpg4win (pdf, Inglês)"
msgctxt "DESC_Name_compendium_de_html"
msgid "Gpg4win Compendium (html, German)"
-msgstr "Gpg4win Compêndio (html, Alemão)"
+msgstr "Compêndio Gpg4win (html, Alemão)"
msgctxt "DESC_Name_compendium_en_html"
msgid "Gpg4win Compendium (html, English)"
-msgstr "Gpg4win Compêndio (html, Inglês)"
+msgstr "Compêndio Gpg4win (html, Inglês)"
msgctxt "DESC_Menu_compendium_de_pdf"
msgid "Show the Gpg4win Compendium (pdf, German)"
commit 30c06ce00681ded3ce0d63badd556be38146e9ea
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 30 15:32:36 2015 +0100
Add 64bit version of GpgOL
* configure.ac: Mark gpgme and gpgol als SPKGEX. Clarify output.
* doc/README.de.txt, doc/README.en.txt: Note 64 support.
* packages/packages.current (gpgol): Update to beta for testing.
* src/Makefile.am: Mark gpgme and gpgol as expkgs. Add config opts.
* src/inst-gpgex.nsi: Undefine exprefix if necessary.
* src/inst-gpgol.nsi: Install 64 bit variant.
* src/uninst-gpgol.nsi: Uninstall 64 bit variant.
(cherry picked from commit edb5ba81a7cb4523d02ed8619f1ad157c09ff443)
diff --git a/configure.ac b/configure.ac
index 2050d8b..015be8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,6 +379,8 @@ GPG4WIN_SPKG([gettext], [libiconv])
GPG4WIN_SPKGEX([libgpg-error])
GPG4WIN_SPKGEX([libassuan], [libgpg-error])
GPG4WIN_SPKGEX([gpgex], [libassuan])
+GPG4WIN_SPKGEX([gpgme], [libgpg-error libassuan])
+GPG4WIN_SPKGEX([gpgol], [gpgme])
GPG4WIN_IPKG([compendium])
@@ -448,6 +450,6 @@ echo "
$PACKAGE_NAME-$PACKAGE_VERSION prepared for make
Revision: ${GIT_REVISION} (${GIT_REVISION_DEC})
- Platform: $host
- Additional gpgEx platform: ${GPGEX_ADD_HOST}
+ 32bit platform: $host
+ 64bit platform: ${GPGEX_ADD_HOST}
"
diff --git a/doc/README.de.txt b/doc/README.de.txt
index a8a3d12..e23691b 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -36,7 +36,7 @@ Gpg4win unterst
* Betriebssystem: Windows XP und neuere Versionen (für alle: 32/64 bit)
- * MS Outlook: 2003, 2007, 2010, 2013, 2016 (alle nur 32 bit!)
+ * MS Outlook: 2003, 2007, 2010, 2013, 2016 (2010 und spätere auch in 64bit)
2. Änderungen
diff --git a/doc/README.en.txt b/doc/README.en.txt
index db0392d..fec0f5b 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -34,7 +34,7 @@ Gpg4win supports these platforms:
* Operating System: Windows XP and later Versions (for all: 32/64 bit)
- * MS Outlook: 2003, 2007, 2010, 2013, 2016 (for all: only 32bit!)
+ * MS Outlook: 2003, 2007, 2010, 2013, 2016 (2010 and later also in 64bit)
2. Changes
diff --git a/packages/packages.current b/packages/packages.current
index 86f38ad..ee42e9d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -261,13 +261,12 @@ chk f5230890dc0be42fb5c58fbf793da253155de106
#
# GpgOL
#
-server ftp://ftp.g10code.com/g10code/gpgol
+server http://files.gpg4win.org/Beta/gpgol
-# last-changed: 2015-11-24
+# last-changed: 2015-11-30
# by: ah
-# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
-file gpgol-1.3.0.tar.bz2
-chk c569e7b223f7b5efcce38cc4a4445127744c0454
+file 1.3.1-beta7/gpgol-1.3.1-beta7.tar.bz2
+chk d50af4273def6c212b2872e094cb258f27f2dfc1
#
# GpgEX
diff --git a/src/Makefile.am b/src/Makefile.am
index d06a5ed..66a845e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,7 +100,8 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
adns dirmngr w32pth scute paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
-gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
+gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
+ gpgme
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -180,7 +181,6 @@ gpg4win_pkg_libgpg_error_configure = --silent \
--enable-static
gpg4win_pkg_libgpg_error_ex_configure = --silent \
- CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
--enable-static
# We convert the PO files to UTF-8. FIXME: This should be done in
@@ -252,12 +252,11 @@ gpg4win_pkg_gpgme_configure = --silent \
--with-gpg-error-prefix=$(idir) --enable-static \
`test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
--disable-w32-qt LDFLAGS=-L$(idir)/lib
-# `test -n "@HAVE_PKG_QT@" && echo "--disable-w32-qt"` \
-# QT4_CORE_CFLAGS=\"-DQT_LARGEFILE_SUPPORT -DQT_DLL \
-# -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT \
-# -I$(idir)/include/QtCore -I$(idir)/include \
-# -I$(idir)/mkspecs/win32-g++\" \
-# QT4_CORE_LIBS=\"-L$(idir)/lib -lQtCore4\"
+
+gpg4win_pkg_gpgme_ex_configure = --silent \
+ --with-gpg-error-prefix=$(ex_idir) --enable-static \
+ --with-libassuan-prefix=$(ex_idir) \
+ LDFLAGS=-L$(ex_idir)/lib
gpg4win_pkg_gpa_configure = --silent \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
@@ -268,6 +267,10 @@ gpg4win_pkg_gpgol_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
+gpg4win_pkg_gpgol_ex_configure = --silent \
+ --with-gpgme-prefix=$(ex_idir) --with-gpg-error-prefix=$(ex_idir) \
+ --with-libassuan-prefix=$(ex_idir)
+
gpg4win_pkg_gpgex_configure = --silent \
--with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
diff --git a/src/inst-gpgex.nsi b/src/inst-gpgex.nsi
index b486d1e..8eced8d 100644
--- a/src/inst-gpgex.nsi
+++ b/src/inst-gpgex.nsi
@@ -20,6 +20,9 @@
!ifdef prefix
!undef prefix
!endif
+!ifdef exprefix
+!undef exprefix
+!endif
!define prefix ${ipdir}/gpgex-${gpg4win_pkg_gpgex_version}
!define exprefix ${exipdir}/gpgex-${gpg4win_pkg_gpgex_version}
diff --git a/src/inst-gpgol.nsi b/src/inst-gpgol.nsi
index 184056f..d80dc59 100644
--- a/src/inst-gpgol.nsi
+++ b/src/inst-gpgol.nsi
@@ -20,8 +20,12 @@
!ifdef prefix
!undef prefix
!endif
+!ifdef exprefix
+!undef exprefix
+!endif
!define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
!define bdir ${bpdir}/gpgol-${gpg4win_pkg_gpgol_version}-build
+!define exprefix ${exipdir}/gpgol-${gpg4win_pkg_gpgol_version}
${MementoSection} "GpgOL" SEC_gpgol
@@ -64,7 +68,30 @@ ${MementoSection} "GpgOL" SEC_gpgol
SetOutPath "$INSTDIR\share\doc\gpgol"
File "${bdir}/doc/gpgol.pdf"
+${If} ${RunningX64}
+
+ # Install the 64 bit version of the dll.
+ SetOutPath "$INSTDIR\bin"
+ ClearErrors
+ SetOverwrite try
+ File ${exprefix}/bin/gpgol.dll
+ SetOverwrite lastused
+ ifErrors 0 do_reg64
+ File /oname=gpgol.dll.tmp ${exprefix}/bin/gpgol.dll
+ Rename /REBOOTOK gpgol.dll.tmp gpgol.dll
+
+ do_reg64:
+ # Register the DLL. We need to register both versions. However
+ # RegDLL can't be used for 64 bit and InstallLib seems to be a
+ # registry hack.
+ ClearErrors
+ ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgol.dll"'
+ ifErrors 0 +2
+ MessageBox MB_OK "$(T_GpgOL_RegFailed) (64 bit)"
+${EndIf}
+
!endif
+
${MementoSectionEnd}
diff --git a/src/uninst-gpgol.nsi b/src/uninst-gpgol.nsi
index 46216cd..0f6be8b 100644
--- a/src/uninst-gpgol.nsi
+++ b/src/uninst-gpgol.nsi
@@ -62,6 +62,11 @@ Section "-un.gpgol"
UnRegDLL "$INSTDIR\gpgol.dll"
Delete /REBOOTOK "$INSTDIR\gpgol.dll"
+
+${If} ${RunningX64}
+ ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgol.dll"'
+ Delete /REBOOTOK "$INSTDIR\bin\gpgol.dll"
+${EndIf}
RMDir "$INSTDIR"
!endif
SectionEnd
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 ++--
doc/README.de.txt | 2 +-
doc/README.en.txt | 2 +-
packages/packages.current | 37 ++++++++++----------
po/pt.po | 88 +++++++++++++++++++++++++++--------------------
src/Makefile.am | 19 +++++-----
src/inst-gpgex.nsi | 3 ++
src/inst-gpgol.nsi | 27 +++++++++++++++
src/uninst-gpgol.nsi | 5 +++
9 files changed, 121 insertions(+), 68 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list