[git] GPGME - branch, master, updated. gpgme-1.6.0-222-gfd87c46
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jul 12 11:49:28 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 fd87c4679c4bfe19390fa2047dff23bb213a4b18 (commit)
via 86ab2ee2d603111d24500b8d64a9a1dd82f8bdc0 (commit)
via b03c48cfb06faae7d7033a0532f319cbcf13f18a (commit)
via 362b8cdf4e0d5cd54ec2b325508dcdefac686f2c (commit)
from ce662891373eba6cce1cf8df516cb2370970737e (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 fd87c4679c4bfe19390fa2047dff23bb213a4b18
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 11:47:33 2016 +0200
Qt: Install CamelCase forward includes
* lang/qt/src/Makefile.am (camelcase_headers): New. Create and install
CamelCase headers.
--
For Qt Libraries it is a common pattern that headers are installed
additionally under their Namespace / Class Name so that automated
inclusion works once a class is used in code. This was also
done for QGpgME headers when they lived in Libkleo so this increases
compatibility.
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 3f5025c..ae316ba 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -35,6 +35,7 @@ qgpgme_sources = \
qgpgmeverifyopaquejob.cpp threadedjobmixin.cpp \
gpgme_backend_debug.cpp
+# If you add one here make sure that you also add one in camelcase
qgpgme_headers= \
adduseridjob.h \
changeexpiryjob.h \
@@ -66,6 +67,36 @@ qgpgme_headers= \
listallkeysjob.h \
verifydetachedjob.h
+camelcase_headers= \
+ AddUserIDJob \
+ ChangeExpiryJob \
+ ChangeOwnerTrustJob \
+ ChangePasswdJob \
+ DataProvider \
+ DecryptJob \
+ DecryptVerifyJob \
+ DownloadJob \
+ EncryptJob \
+ ExportJob \
+ HierarchicalKeyKistJob \
+ Job \
+ MultiDeleteJob \
+ Protocol \
+ QGpgMENewCryptoConfig \
+ SignJob \
+ SignKeyJob \
+ SignEncryptJob \
+ VerifyOpaqueJob \
+ RefreshKeysJob \
+ CryptoConfig \
+ DeleteJob \
+ ImportFromKeyserverJob \
+ ImportJob \
+ KeyGenerationJob \
+ KeyListJob \
+ ListAllKeysJob \
+ VerifyDetachedJob
+
private_qgpgme_headers = \
qgpgme_export.h \
abstractimportjob.h \
@@ -148,6 +179,8 @@ qgpgme_moc_sources = \
qgpgmeincludedir = $(includedir)/qgpgme
qgpgmeinclude_HEADERS = $(qgpgme_headers)
+camelcaseincludedir = $(includedir)/QGpgME
+camelcaseinclude_HEADERS = $(camelcase_headers)
nodist_include_HEADERS = qgpgme_version.h
libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
@@ -171,6 +204,11 @@ QGpgmeConfig.cmake: QGpgmeConfig.cmake.in
sed -e 's|[@]libsuffix@|$(libsuffix)|g' < "$@" > "$@".2
mv "$@".2 "$@"
+$(camelcase_headers): Makefile.am
+ echo -n "#include \"qgpgme/" > "$@"
+ echo -n "$@" | tr '[:upper:]' '[:lower:]' >> "$@"
+ echo ".h\"" >> "$@"
+
install-cmake-files: QGpgmeConfig.cmake QGpgmeConfigVersion.cmake
-$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
$(INSTALL) QGpgmeConfig.cmake \
@@ -187,9 +225,9 @@ install-data-local: install-cmake-files
uninstall-local: uninstall-cmake-files
-BUILT_SOURCES = $(qgpgme_moc_sources)
+BUILT_SOURCES = $(qgpgme_moc_sources) $(camelcase_headers)
-CLEANFILES = $(qgpgme_moc_sources) QGpgmeConfig.cmake
+CLEANFILES = $(qgpgme_moc_sources) $(camelcase_headers) QGpgmeConfig.cmake
nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
commit 86ab2ee2d603111d24500b8d64a9a1dd82f8bdc0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 11:47:04 2016 +0200
Qt: Export VerifyDetachedJob
* lang/qt/src/verifydetachedjob.h (VerifyDetachedJob): Export it.
diff --git a/lang/qt/src/verifydetachedjob.h b/lang/qt/src/verifydetachedjob.h
index fc5bc69..0cb92e6 100644
--- a/lang/qt/src/verifydetachedjob.h
+++ b/lang/qt/src/verifydetachedjob.h
@@ -63,7 +63,7 @@ namespace QGpgME
After result() is emitted, the VerifyDetachedJob will schedule
it's own destruction by calling QObject::deleteLater().
*/
-class VerifyDetachedJob : public Job
+class QGPGME_EXPORT VerifyDetachedJob : public Job
{
Q_OBJECT
protected:
commit b03c48cfb06faae7d7033a0532f319cbcf13f18a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 11:09:44 2016 +0200
Qt/Cpp: Add version headers
* lang/cpp/src/gpgmepp_version.h.in,
lang/qt/src/qgpgme_version.h.in: New. Version information.
* lang/qt/src/Makefile.am, lang/cpp/src/Makefile.am: Add them.
* configure.ac: Configure them.
--
The version headers are common practice in KDE Frameworks and
were installed for KF5Gpgmepp and Libkleo respectively.
diff --git a/configure.ac b/configure.ac
index 335a33a..52ba87f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -768,10 +768,12 @@ AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in)
AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfigVersion.cmake)
+AC_CONFIG_FILES(lang/cpp/src/gpgmepp_version.h)
AC_CONFIG_FILES(lang/qt/Makefile lang/qt/src/Makefile)
AC_CONFIG_FILES(lang/qt/src/QGpgmeConfig.cmake.in)
AC_CONFIG_FILES(lang/qt/src/QGpgmeConfigVersion.cmake)
AC_CONFIG_FILES(lang/qt/tests/Makefile)
+AC_CONFIG_FILES(lang/qt/src/qgpgme_version.h)
AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([lang/qt/doc/Doxyfile])])
AC_CONFIG_FILES(lang/qt/doc/Makefile)
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index e9deca9..188585a 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -18,7 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA
-EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeppConfigVersion.cmake.in
+EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeppConfigVersion.cmake.in \
+ gpgmepp_version.h.in
lib_LTLIBRARIES = libgpgmepp.la
@@ -56,6 +57,7 @@ interface_headers= \
gpgmeppincludedir = $(includedir)/gpgme++
gpgmeppinclude_HEADERS = $(gpgmepp_headers)
nobase_gpgmeppinclude_HEADERS = $(interface_headers)
+nodist_include_HEADERS = gpgmepp_version.h
libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
$(interface_headers) $(private_gpgmepp_headers)
diff --git a/lang/cpp/src/gpgmepp_version.h.in b/lang/cpp/src/gpgmepp_version.h.in
new file mode 100644
index 0000000..3c33a30
--- /dev/null
+++ b/lang/cpp/src/gpgmepp_version.h.in
@@ -0,0 +1,32 @@
+/*gpgmepp_version.h - Version macros for gpgmepp
+ Copyright (C) 2016, Intevation GmbH
+
+ This file is part of GPGME++.
+
+ GPGME++ is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GPGME++ 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 Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with GPGME++; see the file COPYING.LIB. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+
+#ifndef GPGMEPP_VERSION_H
+#define GPGMEPP_VERSION_H
+
+#define GPGMEPP_VERSION_STRING "@LIBGPGMEPP_LT_CURRENT at .@LIBGPGMEPP_LT_AGE at .@LIBGPGMEPP_LT_REVISION@"
+#define GPGMEPP_VERSION_MAJOR @LIBGPGMEPP_LT_CURRENT@
+#define GPGMEPP_VERSION_MINOR @LIBGPGMEPP_LT_AGE@
+#define GPGMEPP_VERSION_PATCH @LIBGPGMEPP_LT_REVISION@
+#define GPGMEPP_VERSION ((@LIBGPGMEPP_LT_CURRENT@<<16)|(@LIBGPGMEPP_LT_AGE@<<8)|(@LIBGPGMEPP_LT_REVISION@))
+
+#endif
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 187bc7f..3f5025c 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -19,7 +19,7 @@
# 02111-1307, USA
lib_LTLIBRARIES = libqgpgme.la
EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \
- gpgme_backend_debug.h
+ gpgme_backend_debug.h qgpgme_version.h.in
qgpgme_sources = \
dataprovider.cpp job.cpp qgpgmeadduseridjob.cpp \
@@ -148,6 +148,7 @@ qgpgme_moc_sources = \
qgpgmeincludedir = $(includedir)/qgpgme
qgpgmeinclude_HEADERS = $(qgpgme_headers)
+nodist_include_HEADERS = qgpgme_version.h
libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
diff --git a/lang/qt/src/qgpgme_version.h.in b/lang/qt/src/qgpgme_version.h.in
new file mode 100644
index 0000000..9fbe965
--- /dev/null
+++ b/lang/qt/src/qgpgme_version.h.in
@@ -0,0 +1,32 @@
+/*qgpgme_version.h - Version macros for qgpgme
+ Copyright (C) 2016, Intevation GmbH
+
+ This file is part of GPGME++.
+
+ GPGME++ is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GPGME++ 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 Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with GPGME++; see the file COPYING.LIB. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+
+#ifndef QGPGME_VERSION_H
+#define QGPGME_VERSION_H
+
+#define QGPGME_VERSION_STRING "@LIBQGPGME_LT_CURRENT at .@LIBQGPGME_LT_AGE at .@LIBQGPGME_LT_REVISION@"
+#define QGPGME_VERSION_MAJOR @LIBQGPGME_LT_CURRENT@
+#define QGPGME_VERSION_MINOR @LIBQGPGME_LT_AGE@
+#define QGPGME_VERSION_PATCH @LIBQGPGME_LT_REVISION@
+#define QGPGME_VERSION ((@LIBQGPGME_LT_CURRENT@<<16)|(@LIBQGPGME_LT_AGE@<<8)|(@LIBQGPGME_LT_REVISION@))
+
+#endif
commit 362b8cdf4e0d5cd54ec2b325508dcdefac686f2c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 11:08:42 2016 +0200
Qt/Cpp: Add license blurb to export headers
* lang/cpp/src/gpgmepp_export.h,
lang/qt/src/qgpgme_export.h: Add license blurb.
diff --git a/lang/cpp/src/gpgmepp_export.h b/lang/cpp/src/gpgmepp_export.h
index c24bda0..d660310 100644
--- a/lang/cpp/src/gpgmepp_export.h
+++ b/lang/cpp/src/gpgmepp_export.h
@@ -1,3 +1,23 @@
+/*gpgmepp_export.h - Export macros for gpgmepp
+ Copyright (C) 2016, Intevation GmbH
+
+ This file is part of GPGME++.
+
+ GPGME++ is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GPGME++ 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 Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with GPGME++; see the file COPYING.LIB. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
#ifndef GPGMEPP_EXPORT_H
#define GPGMEPP_EXPORT_H
diff --git a/lang/qt/src/qgpgme_export.h b/lang/qt/src/qgpgme_export.h
index 40630d5..ceb3888 100644
--- a/lang/qt/src/qgpgme_export.h
+++ b/lang/qt/src/qgpgme_export.h
@@ -1,3 +1,23 @@
+/*qgpgme_export.h - Export macros for qgpgme
+ Copyright (C) 2016, Intevation GmbH
+
+ This file is part of GPGME++.
+
+ GPGME++ is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GPGME++ 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 Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with GPGME++; see the file COPYING.LIB. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
#ifndef QGPGME_EXPORT_H
#define QGPGME_EXPORT_H
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +
lang/cpp/src/Makefile.am | 4 +-
lang/cpp/src/gpgmepp_export.h | 20 ++++++++++
.../progressprovider.h => gpgmepp_version.h.in} | 28 +++++---------
lang/qt/src/Makefile.am | 45 ++++++++++++++++++++--
lang/qt/src/qgpgme_export.h | 20 ++++++++++
.../src/data_p.h => qt/src/qgpgme_version.h.in} | 28 +++++---------
lang/qt/src/verifydetachedjob.h | 2 +-
8 files changed, 108 insertions(+), 41 deletions(-)
copy lang/cpp/src/{interfaces/progressprovider.h => gpgmepp_version.h.in} (60%)
copy lang/{cpp/src/data_p.h => qt/src/qgpgme_version.h.in} (61%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list