[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-166-g37f2030
by Andre Heinecke
cvs at cvs.gnupg.org
Tue May 7 13:08:31 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 37f20300a6da9c45efd07bdc359e114709eea600 (commit)
via ef8f95627e9d005c0666c9a880b2dcfbcb452ebd (commit)
via fd40f3a514ea4e7a1dcc64b2c36179abae3354e1 (commit)
from dcde4b23f4f9fe535f44df0c6042156a5493314a (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 37f20300a6da9c45efd07bdc359e114709eea600
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 7 10:49:32 2013 +0000
Add runtime libaries neccessary with mingw-w64
GpgOL and GpgEx need the mingw runtime in the system path
so they are added to pub now.
* configure.ac: Add options for libgcc-sjlj-1 and libstdc++-6
* src/inst-gpg4win.nsi, src/uninst-gpg4win.nsi: Handle
the runtime libraries.
diff --git a/configure.ac b/configure.ac
index b9c8c19..d7b0439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,6 +227,49 @@ AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
[build-aux/gitlog-to-changelog])
AC_PROG_INSTALL
+# GpgOL and GpgEx need the runtime libaries
+# The default path should probably be more generic
+libgcc_dll=no
+AC_ARG_WITH([libgcc_s_sjlj-dll],
+ AC_HELP_STRING([--with-libgcc_s_sjlj-1-dll=FILE],
+ [use the libgcc_s_sjlj-1 DLL]),
+ [libgcc_dll=$withval])
+if test "$libgcc_dll" = "no"; then
+ file="/usr/lib/gcc/$host/4.6/libgcc_s_sjlj-1.dll"
+ if test -r "$file"; then
+ libgcc_dll="$file"
+ fi
+fi
+if test "$libgcc_dll" = "no"; then
+ missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
+fi
+
+if test -r "$libgcc_dll"; then
+ cp $libstdcpp_dll src/libstdc++-6.dll
+else
+ missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
+fi
+
+libstdcpp_dll=no
+AC_ARG_WITH([libstdcpp_s_sjlj-dll],
+ AC_HELP_STRING([--with-libstdc++-6-dll=FILE],
+ [use the libstdc++-6 DLL]),
+ [libstdcpp_dll=$withval])
+if test "$libstdcpp_dll" = "no"; then
+ file="/usr/lib/gcc/$host/4.6/libstdc++-6.dll"
+ if test -r "$file"; then
+ libstdcpp_dll="$file"
+ fi
+fi
+if test "$libstdcpp_dll" = "no"; then
+ missing_tools="libstdc++-6.dll $missing_tools"
+fi
+if test -r "$libstdcpp_dll"; then
+ cp $libgcc_dll src/libgcc_s_sjlj-1.dll
+else
+ missing_tools="libstdc++-6.dll $missing_tools"
+fi
+
missing_tools=
for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
DVIPDF CONVERT SHA1SUM MSGFMT ; do
diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index cf92f6a..f761735 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -79,6 +79,11 @@ Section "-gpg4win" SEC_gpg4win
File "${BUILD_DIR}/sha256sum.exe"
File "${BUILD_DIR}/md5sum.exe"
+ SetOutPath "$INSTDIR\pub"
+ # Install the mingw runtime libaries
+ File "${BUILD_DIR}/libstdc++-6.dll"
+ File "${BUILD_DIR}/libgcc_s_sjlj-1.dll"
+
!endif
SectionEnd
diff --git a/src/uninst-gpg4win.nsi b/src/uninst-gpg4win.nsi
index b662db1..9982956 100644
--- a/src/uninst-gpg4win.nsi
+++ b/src/uninst-gpg4win.nsi
@@ -35,6 +35,10 @@ Section "-un.gpg4win"
Delete "$INSTDIR\sha256sum.exe"
Delete "$INSTDIR\md5sum.exe"
+ # Delete the runtime libarries
+ Delete "$INSTDIR\pub\libstdc++-6.dll"
+ Delete "$INSTDIR\pub\libgcc_s_sjlj-1.dll"
+
# Delete standard stuff.
Delete "$INSTDIR\share\gpg4win\README.*.txt"
commit ef8f95627e9d005c0666c9a880b2dcfbcb452ebd
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 7 10:45:54 2013 +0000
Fix localization and help installation
This adds a kdeglobals configuration with the language setting
to workaround a bug in KDE/4.10 libs.
* src/Makefile.am: Change help link replacement to fit
installation
* src/inst-kleopatra.nsi: Move some files and install kdeglobals
depending on language setting
* src/uninst-kleopatra.nsi: Fix some paths and add some more
diff --git a/src/Makefile.am b/src/Makefile.am
index c4ae59a..a59caff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -490,11 +490,13 @@ define gpg4win_pkg_gnutls_post_install
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
-# We don't use khelpcenter in kleopatra so remove the help links
+# We don't use khelpcenter in kleopatra so remove the help links and
+# point to the correct common folder
define gpg4win_pkg_kleopatra_post_install
(for i in de en ; do \
(cd $$$${pkgidir}/share/doc/HTML/$$$${i}; \
- perl -pi -e 's/help:\///g' `find . -name \*.html`); \
+ perl -pi -e 's/help:\///g' `find . -name \*.html`; \
+ perl -pi -e 's at common/@../../common/@g' `find . -name \*.html`); \
done)
endef
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 26fb73f..fea2979 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -115,7 +115,8 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
File ${prefix}/share/config/libkleopatrarc
- # TODO
+ # TODO Can't mix localized and en commons when we install
+ # more then one kde langanuage
SetOutPath "$INSTDIR\share\doc\HTML\common"
File ${prefix}/share/doc/HTML/en/common/1.png
@@ -165,13 +166,13 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
File ${prefix}/share/doc/HTML/en/common/x11-license.html
File ${prefix}/share/doc/HTML/en/common/xml.dcl
- SetOutPath "$INSTDIR\share\doc\HTML\de\kleopatra"
-
File ${prefix}/share/doc/HTML/de/common/fdl-translated.html
File ${prefix}/share/doc/HTML/de/common/gpl-translated.html
File ${prefix}/share/doc/HTML/de/common/kde-localised.css
File ${prefix}/share/doc/HTML/de/common/lgpl-translated.html
+ SetOutPath "$INSTDIR\share\doc\HTML\de\kleopatra"
+
File ${prefix}/share/doc/HTML/de/kleopatra/admin-archive-definitions.html
File ${prefix}/share/doc/HTML/de/kleopatra/admin-checksum-definitions.html
File ${prefix}/share/doc/HTML/de/kleopatra/admin-key-filters.html
@@ -414,6 +415,22 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
+ # In KDE 4.10 the locale detection in kdelibs is broken so we
+ # install a kdeglobals with the language setting chosen in the
+ # installer
+ push $1
+ FileOpen $1 "$INSTDIR\share\config\kdeglobals" "w"
+ FileWrite $1 '[Locale] $\r$\n'
+ StrCmp $LANGUAGE "1031" german_locale 0
+ FileWrite $1 'Country=en $\r$\n'
+ FileWrite $1 'Language=$LANGUAGE $\r$\n'
+ Goto kdeglobals_done
+german_locale:
+ FileWrite $1 'Country=de $\r$\n'
+ FileWrite $1 'Language=de $\r$\n'
+kdeglobals_done:
+ FileClose $1
+ pop $1
!endif
${MementoSectionEnd}
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 9b70a0e..acb2208 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -120,63 +120,64 @@ Section "-un.kleopatra"
Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-checksum-definitions.html"
Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-archive-definitions.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\xml.dcl"
- Delete "$INSTDIR\share\doc\HTML\en\common\x11-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\top.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\common\top-right.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\top-right.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\common\top-middle.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\top-left.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\top-left.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\common\top-kde.jpg"
- Delete "$INSTDIR\share\doc\HTML\en\common\tabs.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\qpl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\print.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\mainheader.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\mainfooter.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\lgpl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\lgpl-license"
- Delete "$INSTDIR\share\doc\HTML\en\common\kde_logo_bg.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\kde_logo.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\kde.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\kde-localised.css.template"
- Delete "$INSTDIR\share\doc\HTML\en\common\kde-docs.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\kde-default.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\header.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\gpl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\gpl-license"
- Delete "$INSTDIR\share\doc\HTML\en\common\footer.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\flat.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\fdl-notice.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\fdl-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\fdl-license"
- Delete "$INSTDIR\share\doc\HTML\en\common\favicon.ico"
- Delete "$INSTDIR\share\doc\HTML\en\common\doxygen.css"
- Delete "$INSTDIR\share\doc\HTML\en\common\bsd-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\bottom-right.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\bottom-middle.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\bottom-left.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\block_title_top.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\block_title_mid.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\block_title_bottom.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\artistic-license.html"
- Delete "$INSTDIR\share\doc\HTML\en\common\9.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\8.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\7.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\6.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\5.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\4.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\3.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\2.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\10.png"
- Delete "$INSTDIR\share\doc\HTML\en\common\1.png"
- Delete "$INSTDIR\share\doc\HTML\de\\common\\fdl-translated.html"
- Delete "$INSTDIR\share\doc\HTML\de\\common\\gpl-translated.html"
- Delete "$INSTDIR\share\doc\HTML\de\\common\\lgpl-translated.html"
- Delete "$INSTDIR\share\doc\HTML\de\\common\\kde-localised.css"
+ Delete "$INSTDIR\share\doc\HTML\common\xml.dcl"
+ Delete "$INSTDIR\share\doc\HTML\common\x11-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\top.jpg"
+ Delete "$INSTDIR\share\doc\HTML\common\top-right.png"
+ Delete "$INSTDIR\share\doc\HTML\common\top-right.jpg"
+ Delete "$INSTDIR\share\doc\HTML\common\top-middle.png"
+ Delete "$INSTDIR\share\doc\HTML\common\top-left.png"
+ Delete "$INSTDIR\share\doc\HTML\common\top-left.jpg"
+ Delete "$INSTDIR\share\doc\HTML\common\top-kde.jpg"
+ Delete "$INSTDIR\share\doc\HTML\common\tabs.css"
+ Delete "$INSTDIR\share\doc\HTML\common\qpl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\print.css"
+ Delete "$INSTDIR\share\doc\HTML\common\mainheader.html"
+ Delete "$INSTDIR\share\doc\HTML\common\mainfooter.html"
+ Delete "$INSTDIR\share\doc\HTML\common\lgpl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\lgpl-license"
+ Delete "$INSTDIR\share\doc\HTML\common\kde_logo_bg.png"
+ Delete "$INSTDIR\share\doc\HTML\common\kde_logo.png"
+ Delete "$INSTDIR\share\doc\HTML\common\kde.css"
+ Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css.template"
+ Delete "$INSTDIR\share\doc\HTML\common\kde-docs.css"
+ Delete "$INSTDIR\share\doc\HTML\common\kde-default.css"
+ Delete "$INSTDIR\share\doc\HTML\common\header.html"
+ Delete "$INSTDIR\share\doc\HTML\common\gpl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\gpl-license"
+ Delete "$INSTDIR\share\doc\HTML\common\footer.html"
+ Delete "$INSTDIR\share\doc\HTML\common\flat.css"
+ Delete "$INSTDIR\share\doc\HTML\common\fdl-notice.html"
+ Delete "$INSTDIR\share\doc\HTML\common\fdl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\fdl-license"
+ Delete "$INSTDIR\share\doc\HTML\common\favicon.ico"
+ Delete "$INSTDIR\share\doc\HTML\common\doxygen.css"
+ Delete "$INSTDIR\share\doc\HTML\common\bsd-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\bottom-right.png"
+ Delete "$INSTDIR\share\doc\HTML\common\bottom-middle.png"
+ Delete "$INSTDIR\share\doc\HTML\common\bottom-left.png"
+ Delete "$INSTDIR\share\doc\HTML\common\block_title_top.png"
+ Delete "$INSTDIR\share\doc\HTML\common\block_title_mid.png"
+ Delete "$INSTDIR\share\doc\HTML\common\block_title_bottom.png"
+ Delete "$INSTDIR\share\doc\HTML\common\artistic-license.html"
+ Delete "$INSTDIR\share\doc\HTML\common\9.png"
+ Delete "$INSTDIR\share\doc\HTML\common\8.png"
+ Delete "$INSTDIR\share\doc\HTML\common\7.png"
+ Delete "$INSTDIR\share\doc\HTML\common\6.png"
+ Delete "$INSTDIR\share\doc\HTML\common\5.png"
+ Delete "$INSTDIR\share\doc\HTML\common\4.png"
+ Delete "$INSTDIR\share\doc\HTML\common\3.png"
+ Delete "$INSTDIR\share\doc\HTML\common\2.png"
+ Delete "$INSTDIR\share\doc\HTML\common\10.png"
+ Delete "$INSTDIR\share\doc\HTML\common\1.png"
+ Delete "$INSTDIR\share\doc\HTML\common\fdl-translated.html"
+ Delete "$INSTDIR\share\doc\HTML\common\gpl-translated.html"
+ Delete "$INSTDIR\share\doc\HTML\common\lgpl-translated.html"
+ Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css"
Delete "$INSTDIR\share\config\libkleopatrarc"
- Delete "$INSTDIR\share\apps\xdg\menus\applications.menu"
+ Delete "$INSTDIR\share\config\kdeglobals"
+ Delete "$INSTDIR\share\xdg\menus\applications.menu"
Delete "$INSTDIR\share\apps\libkleopatra\pics\smartcard.xpm"
Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
Delete "$INSTDIR\share\apps\libkleopatra\pics\key_ok.png"
@@ -210,7 +211,7 @@ Section "-un.kleopatra"
Delete "$INSTDIR\libdbusmenu-qt.dll"
Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
Delete "$INSTDIR\libgpgme++.dll"
- Delete "$INSTDIR\libinitl.dll"
+ Delete "$INSTDIR\libintl.dll"
Delete "$INSTDIR\libkcmutils.dll"
Delete "$INSTDIR\libkdeui.dll"
Delete "$INSTDIR\libkdewin.dll"
@@ -372,29 +373,28 @@ Section "-un.kleopatra"
RMDir "$INSTDIR\share\kde4\services"
RMDir "$INSTDIR\share\kde4"
- RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
- RMDir "$INSTDIR\share\icons\oxygen\scalable"
- RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"
- RMDir "$INSTDIR\share\icons\oxygen\64x64"
- RMDir "$INSTDIR\share\icons\oxygen\48x48\apps"
- RMDir "$INSTDIR\share\icons\oxygen\48x48"
- RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
- RMDir "$INSTDIR\share\icons\oxygen\32x32"
- RMDir "$INSTDIR\share\icons\oxygen\256x256\apps"
- RMDir "$INSTDIR\share\icons\oxygen\256x256"
- RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
- RMDir "$INSTDIR\share\icons\oxygen\22x22"
- RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
- RMDir "$INSTDIR\share\icons\oxygen\16x16"
- RMDir "$INSTDIR\share\icons\oxygen\128x128\apps"
- RMDir "$INSTDIR\share\icons\oxygen\128x128"
- RMDir "$INSTDIR\share\icons\oxygen"
+ RMDir "$INSTDIR\share\icons\hicolor\scalable\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\scalable"
+ RMDir "$INSTDIR\share\icons\hicolor\64x64\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\64x64"
+ RMDir "$INSTDIR\share\icons\hicolor\48x48\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\48x48"
+ RMDir "$INSTDIR\share\icons\hicolor\32x32\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\32x32"
+ RMDir "$INSTDIR\share\icons\hicolor\256x256\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\256x256"
+ RMDir "$INSTDIR\share\icons\hicolor\22x22\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\22x22"
+ RMDir "$INSTDIR\share\icons\hicolor\16x16\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\16x16"
+ RMDir "$INSTDIR\share\icons\hicolor\128x128\apps"
+ RMDir "$INSTDIR\share\icons\hicolor\128x128"
+ RMDir "$INSTDIR\share\icons\hicolor"
RMDir "$INSTDIR\share\icons"
RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
- RMDir "$INSTDIR\share\doc\HTML\en\common"
RMDir "$INSTDIR\share\doc\HTML\en"
+ RMDir "$INSTDIR\share\doc\HTML\common"
RMDir "$INSTDIR\share\doc\HTML\de\kleopatra"
- RMDir "$INSTDIR\share\doc\HTML\de\common"
RMDir "$INSTDIR\share\doc\HTML\de"
RMDir "$INSTDIR\share\doc\HTML"
RMDir "$INSTDIR\share\doc"
commit fd40f3a514ea4e7a1dcc64b2c36179abae3354e1
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 7 10:42:06 2013 +0000
Add path paths also into our environment
This is necessary as we need PATH to include /pub
when we register gpgex and gpgol.
* src/g4wihelp.c (path_add): Set path environemnt variable
after adding
diff --git a/src/g4wihelp.c b/src/g4wihelp.c
index 83363e3..204256d 100644
--- a/src/g4wihelp.c
+++ b/src/g4wihelp.c
@@ -1058,6 +1058,7 @@ path_add (HWND hwndParent, int string_size, char *variables,
RegSetValueEx (key_handle, "Path", 0, REG_EXPAND_SZ,
path_new, path_new_size);
RegCloseKey (key_handle);
+ SetEnvironmentVariable("PATH", path_new);
free (path_new);
/* MessageBox (g_hwndParent, "XXX 9", 0, MB_OK); */
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 43 +++++++++++++
src/Makefile.am | 6 +-
src/g4wihelp.c | 1 +
src/inst-gpg4win.nsi | 5 ++
src/inst-kleopatra.nsi | 23 ++++++-
src/uninst-gpg4win.nsi | 4 +
src/uninst-kleopatra.nsi | 150 +++++++++++++++++++++++-----------------------
7 files changed, 152 insertions(+), 80 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list