[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.1.2-3-gbc268f7
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jun 19 15:41:44 CEST 2018
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 bc268f757e84bf0018e59d8fbd87629b61dbdf12 (commit)
via cc0082d45e28d8cf06ffa0eca3765a9e6524091d (commit)
from 8df2986cbb08a3f78bf2de2699fc522499f6d9b1 (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 bc268f757e84bf0018e59d8fbd87629b61dbdf12
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jun 19 15:41:20 2018 +0200
Install gpgme-json
* src/inst-gpgme.nsi, src/uninst-gpgme.nsi: Install gpgme-json.
diff --git a/src/inst-gpgme.nsi b/src/inst-gpgme.nsi
index b0f72e0..23f9583 100644
--- a/src/inst-gpgme.nsi
+++ b/src/inst-gpgme.nsi
@@ -54,6 +54,7 @@ Section "-gpgme" SEC_gpgme
File "${prefix}/bin/libqgpgme-7.dll"
File "${prefix}/bin/libgpgmepp-6.dll"
File "${prefix}/libexec/gpgme-w32spawn.exe"
+ File "${prefix}/bin/gpgme-json.exe"
SetOutPath "$INSTDIR\lib"
File /oname=libgpgme.imp "${prefix}/lib/libgpgme.dll.a"
diff --git a/src/uninst-gpgme.nsi b/src/uninst-gpgme.nsi
index 76bbaa4..f76f724 100644
--- a/src/uninst-gpgme.nsi
+++ b/src/uninst-gpgme.nsi
@@ -35,6 +35,7 @@ Section "-un.gpgme"
Delete /REBOOTOK "$INSTDIR\bin\libqgpgme-7.dll"
Delete /REBOOTOK "$INSTDIR\bin\libgpgmepp-6.dll"
Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
+ Delete "$INSTDIR\bin\gpgme-json.exe"
Delete "$INSTDIR\lib\libgpgme.imp"
Delete "$INSTDIR\lib\libgpgme-glib.imp"
Delete "$INSTDIR\include\gpgme.h"
commit cc0082d45e28d8cf06ffa0eca3765a9e6524091d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jun 19 15:40:03 2018 +0200
Fix dist package
* Makefile.am (EXTRA_DIST): Add boost patch, sort patches again.
* src/Makefile.am (EXTRA_DIST): Add qtwinextras, add file-ext.ico.
--
The last source packages actually did not compile. Need to
change the release process to build the release from the dist
packages.
diff --git a/Makefile.am b/Makefile.am
index c08e2d4..9fc7ec3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,29 +27,29 @@ SUBDIRS = po packages doc src
EXTRA_DIST = autogen.sh README.GIT ONEWS \
doc/license-page doc/GPLv3 \
build-aux/git-log-footer build-aux/git-log-fix \
+ patches/boost/boost-1-fixes.patch \
+ patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
+ patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/glib-2.41.5/01-socket.patch \
patches/glib-2.41.5/02-formatsec.patch \
- patches/qtbase/relative-paths.patch \
- patches/qtbase/qtbase-mingw-fixes.patch \
- patches/qtbase/config-standardpaths.patch \
- patches/qtwinextras/support-xp.patch \
- patches/w32pth-2.0.5/workaround-broken-libtool.patch \
- patches/qttools/disable-most-tools.patch \
- patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
- patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
- patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
+ patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch \
+ patches/gpgol-2.1.1/0001-Disable-OL-2013-2016-resiliency-for-us.patch \
+ patches/gpgol-2.1.1/0001-Launch-Kleopatra-config-dialog-with-parent.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
- patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/kleopatra/fix-qt5.6-build.patch \
- patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
- patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch \
+ patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
+ patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
+ patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
patches/libgpg-error-1.29/0001-doc-Fix-yat2m-build-for-cross-compilation.patch \
- patches/gpgol-2.1.1/0001-Disable-OL-2013-2016-resiliency-for-us.patch \
- patches/gpgol-2.1.1/0001-Launch-Kleopatra-config-dialog-with-parent.patch
-
+ patches/qtbase/config-standardpaths.patch \
+ patches/qtbase/qtbase-mingw-fixes.patch \
+ patches/qtbase/relative-paths.patch \
+ patches/qttools/disable-most-tools.patch \
+ patches/qtwinextras/support-xp.patch \
+ patches/w32pth-2.0.5/workaround-broken-libtool.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/src/Makefile.am b/src/Makefile.am
index ec7e208..e3cca6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,6 +83,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-qtsvg.nsi uninst-qtsvg.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-qttranslations.nsi uninst-qttranslations.nsi \
+ inst-qtwinextras.nsi uninst-qtwinextras.nsi \
inst-boost.nsi uninst-boost.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
inst-gpg4win-tools.nsi uninst-gpg4win-tools.nsi \
@@ -91,7 +92,8 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
slideshow/slide1-gpgol.png \
slideshow/slide2-gpgex.png \
slideshow/slide3-kleopatra.png \
- slideshow/slide4-summary.png
+ slideshow/slide4-summary.png \
+ file-ext.ico
gpg4win_readme_ll = en de ar es fr ru pt
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 30 +++++++++++++++---------------
src/Makefile.am | 4 +++-
src/inst-gpgme.nsi | 1 +
src/uninst-gpgme.nsi | 1 +
4 files changed, 20 insertions(+), 16 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list