[git] GPGME - branch, master, updated. gpgme-1.7.0-45-g2538c12

by Andre Heinecke cvs at cvs.gnupg.org
Thu Oct 13 09:15:56 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 Made Easy".

The branch, master has been updated
       via  2538c12fa0728f4113f83f69f8c8ec9efb163872 (commit)
       via  a3cf30f89418c8a6bc9456533d95ba7fc2a33a4c (commit)
      from  5f64018af89e07dd0494775d6dfc82564536d6e0 (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 2538c12fa0728f4113f83f69f8c8ec9efb163872
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 13 09:13:50 2016 +0200

    qt: Install SpecialJob
    
    * lang/qt/src/Makefile.am: Install SpecialJob
    * NEWS: mention it.
    
    --
    SpecialJob was and is public API. So it needs to be installed.

diff --git a/NEWS b/NEWS
index ebe2dd9..a34d37c 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Noteworthy changes in version 1.7.1 (unreleased) [C26/A15/R_]
  WksPublishJob::startRecieve     REMOVED.
  MultiDeleteJob                  NEW.
  AbstractImportJob               NEW.
+ SpecialJob                      NEW.
 
  * cpp Interface changes relative to the 1.7.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index e09e0d9..8c27e67 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -57,6 +57,7 @@ qgpgme_headers= \
     protocol.h \
     qgpgme_export.h \
     qgpgmenewcryptoconfig.h \
+    specialjob.h \
     signjob.h \
     signkeyjob.h \
     signencryptjob.h \
@@ -91,6 +92,7 @@ camelcase_headers= \
     MultiDeleteJob \
     Protocol \
     QGpgMENewCryptoConfig \
+    SpecialJob \
     SignJob \
     SignKeyJob \
     SignEncryptJob \
@@ -138,7 +140,6 @@ private_qgpgme_headers = \
     qgpgmekeyformailboxjob.h \
     qgpgmewkspublishjob.h \
     qgpgmetofupolicyjob.h \
-    specialjob.h \
     threadedjobmixin.h
 
 qgpgme_moc_sources = \

commit a3cf30f89418c8a6bc9456533d95ba7fc2a33a4c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Oct 13 09:07:36 2016 +0200

    qt, cpp: Fix expected targets in Config files
    
    * lang/cpp/src/GpgmeppConfig.cmake.in.in,
    lang/qt/src/QGpgmeConfig.cmake.in.in: Remove KF5 variants.

diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index ca11deb..73f5eaa 100644
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -37,7 +37,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_targetsDefined)
 set(_targetsNotDefined)
 set(_expectedTargets)
-foreach(_expectedTarget KF5::Gpgmepp Gpgmepp)
+foreach(_expectedTarget Gpgmepp)
   list(APPEND _expectedTargets ${_expectedTarget})
   if(NOT TARGET ${_expectedTarget})
     list(APPEND _targetsNotDefined ${_expectedTarget})
diff --git a/lang/qt/src/QGpgmeConfig.cmake.in.in b/lang/qt/src/QGpgmeConfig.cmake.in.in
index 9063408..5b6c188 100644
--- a/lang/qt/src/QGpgmeConfig.cmake.in.in
+++ b/lang/qt/src/QGpgmeConfig.cmake.in.in
@@ -37,7 +37,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_targetsDefined)
 set(_targetsNotDefined)
 set(_expectedTargets)
-foreach(_expectedTarget QGpgme KF5::QGpgme)
+foreach(_expectedTarget QGpgme)
   list(APPEND _expectedTargets ${_expectedTarget})
   if(NOT TARGET ${_expectedTarget})
     list(APPEND _targetsNotDefined ${_expectedTarget})

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                   | 1 +
 lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
 lang/qt/src/Makefile.am                | 3 ++-
 lang/qt/src/QGpgmeConfig.cmake.in.in   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org




More information about the Gnupg-commits mailing list