gpgme 1.9.0 master
authorYaakov Selkowitz <yselkowi@redhat.com>
Fri, 30 Jun 2017 20:46:53 +0000 (15:46 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Fri, 30 Jun 2017 20:46:53 +0000 (15:46 -0500)
.gitmodules [new file with mode: 0644]
1.4.2-without-libassuan.patch [deleted file]
1.9.0-libsuffix.patch [new file with mode: 0644]
1.9.0-qgpgme-qt5.patch [new file with mode: 0644]
fedora [new submodule]
gpgme.cygport

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..0e3f3fb
--- /dev/null
@@ -0,0 +1,3 @@
+[submodule "fedora"]
+       path = fedora
+       url = https://src.fedoraproject.org/git/rpms/gpgme.git
diff --git a/1.4.2-without-libassuan.patch b/1.4.2-without-libassuan.patch
deleted file mode 100644 (file)
index 93fb9f8..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
---- origsrc/gpgme-1.4.2/configure.ac   2013-05-28 04:08:35.000000000 -0500
-+++ src/gpgme-1.4.2/configure.ac       2013-08-05 22:46:13.901736500 -0500
-@@ -984,7 +984,7 @@ if test "$have_gpg_error" = "no"; then
- *** (at least version $NEED_GPG_ERROR_VERSION is required.)
- ***]])
- fi
--if test "$have_libassuan" = "no"; then
-+if test "$have_libassuan" = "no" && test "$GPGSM" != no; then
-    die=yes
-    AC_MSG_NOTICE([[
- ***
---- origsrc/gpgme-1.4.2/src/Makefile.am        2013-05-23 13:17:20.000000000 -0500
-+++ src/gpgme-1.4.2/src/Makefile.am    2013-08-05 22:55:09.161351600 -0500
-@@ -73,7 +73,7 @@ gpgsm_components =
- endif
- if HAVE_ASSUAN
--assuan_components = assuan-support.c engine-assuan.c
-+assuan_components = assuan-support.c engine-assuan.c opassuan.c
- else
- assuan_components =
- endif
-@@ -112,7 +112,7 @@ main_sources =                                                             \
-       sign.c passphrase.c progress.c                                  \
-       key.c keylist.c trust-item.c trustlist.c                        \
-       import.c export.c genkey.c delete.c edit.c getauditlog.c        \
--      opassuan.c passwd.c                                             \
-+      passwd.c                                                        \
-       engine.h engine-backend.h engine.c engine-gpg.c status-table.c  \
-       $(gpgsm_components) $(assuan_components) $(gpgconf_components)  \
-       $(uiserver_components)                                          \
-@@ -223,8 +223,10 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LI
-       @GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
- endif
-+if HAVE_ASSUAN
- noinst_PROGRAMS = gpgme-tool
- gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
-+endif
- install-data-local: install-def-file
diff --git a/1.9.0-libsuffix.patch b/1.9.0-libsuffix.patch
new file mode 100644 (file)
index 0000000..73f5026
--- /dev/null
@@ -0,0 +1,48 @@
+--- origsrc/gpgme-1.9.0/lang/cpp/src/GpgmeppConfig.cmake.in.in 2017-06-28 17:06:25.698865500 -0500
++++ src/gpgme-1.9.0/lang/cpp/src/GpgmeppConfig.cmake.in.in     2017-06-28 17:11:14.177111600 -0500
+@@ -63,8 +63,9 @@ add_library(Gpgmepp SHARED IMPORTED)
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so"
+-  IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@"
++  IMPORTED_IMPLIB "@resolved_libdir@/libgpgmepp@libsuffix@"
++  IMPORTED_LOCATION "/usr/bin/cyggpgmepp-6.dll"
+ )
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+--- origsrc/gpgme-1.9.0/lang/cpp/src/Makefile.am       2017-03-09 02:01:10.000000000 -0600
++++ src/gpgme-1.9.0/lang/cpp/src/Makefile.am   2017-06-28 17:10:31.135427300 -0500
+@@ -74,7 +74,7 @@ libgpgmepp_la_LDFLAGS = -no-undefined -v
+ if HAVE_MACOS_SYSTEM
+ libsuffix=.dylib
+ else
+-libsuffix=.so
++libsuffix=.dll.a
+ endif
+ if HAVE_W32_SYSTEM
+--- origsrc/gpgme-1.9.0/lang/qt/src/Makefile.am        2017-03-09 02:01:10.000000000 -0600
++++ src/gpgme-1.9.0/lang/qt/src/Makefile.am    2017-06-28 17:07:54.407139600 -0500
+@@ -223,7 +223,7 @@
+ if HAVE_MACOS_SYSTEM
+ libsuffix=.dylib
+ else
+-libsuffix=.so
++libsuffix=.dll.a
+ endif
+ if HAVE_W32_SYSTEM
+--- origsrc/gpgme-1.9.0/lang/qt/src/QGpgmeConfig.cmake.in.in   2017-06-28 17:13:30.844853700 -0500
++++ src/gpgme-1.9.0/lang/qt/src/QGpgmeConfig.cmake.in.in       2017-06-28 18:05:35.444601800 -0500
+@@ -64,7 +64,8 @@ add_library(QGpgme SHARED IMPORTED)
+ set_target_properties(QGpgme PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
+   INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
+-  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme-qt5@libsuffix@"
++  IMPORTED_IMPLIB "@resolved_libdir@/libqgpgme-qt5@libsuffix@"
++  IMPORTED_LOCATION "/usr/bin/cygqgpgme-qt5-7.dll"
+ )
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
diff --git a/1.9.0-qgpgme-qt5.patch b/1.9.0-qgpgme-qt5.patch
new file mode 100644 (file)
index 0000000..0961c58
--- /dev/null
@@ -0,0 +1,81 @@
+--- origsrc/gpgme-1.9.0/lang/qt/src/Makefile.am        2017-03-09 02:01:10.000000000 -0600
++++ src/gpgme-1.9.0/lang/qt/src/Makefile.am    2017-06-28 17:07:54.407139600 -0500
+@@ -17,7 +17,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA
+-lib_LTLIBRARIES = libqgpgme.la
++lib_LTLIBRARIES = libqgpgme-qt5.la
+ EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \
+              gpgme_backend_debug.h qgpgme_version.h.in \
+              QGpgmeConfig.cmake.in.in
+@@ -209,15 +209,15 @@ camelcaseincludedir = $(includedir)/QGpg
+ camelcaseinclude_HEADERS = $(camelcase_headers)
+ nodist_qgpgmeinclude_HEADERS = qgpgme_version.h
+-libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
++libqgpgme_qt5_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
+ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
+               @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
+               -DBUILDING_QGPGME
+-libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
++libqgpgme_qt5_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
+                        @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@
+-libqgpgme_la_LDFLAGS = -no-undefined -version-info \
++libqgpgme_qt5_la_LDFLAGS = -no-undefined -version-info \
+     @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
+ if HAVE_MACOS_SYSTEM
+@@ -265,7 +265,7 @@ CLEANFILES = $(qgpgme_moc_sources) $(cam
+              qgpgme_version.h QGpgmeConfig.cmake.in \
+              QGpgmeConfigVersion.cmake
+-nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
++nodist_libqgpgme_qt5_la_SOURCES = $(qgpgme_moc_sources)
+ .h.moc:
+       $(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+--- origsrc/gpgme-1.9.0/lang/qt/src/QGpgmeConfig-w32.cmake.in.in       2016-11-16 03:17:20.000000000 -0600
++++ src/gpgme-1.9.0/lang/qt/src/QGpgmeConfig-w32.cmake.in.in   2017-06-28 17:09:16.155051600 -0500
+@@ -62,14 +62,14 @@ unset(_expectedTargets)
+ add_library(QGpgme SHARED IMPORTED)
+ set_target_properties(QGpgme PROPERTIES
+-  IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libqgpgme.dll.a"
++  IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libqgpgme-qt5.dll.a"
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
+   INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
+-  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme-7.dll"
++  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme-qt5-7.dll"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS QGgpme )
+-list(APPEND _IMPORT_CHECK_FILES_FOR_Qgpgme "@resolved_libdir@/libqgpgme.dll.a" "@resolved_bindir@/libqgpgme-7.dll" )
++list(APPEND _IMPORT_CHECK_FILES_FOR_Qgpgme "@resolved_libdir@/libqgpgme-qt5.dll.a" "@resolved_bindir@/libqgpgme-qt5-7.dll" )
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+   message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+--- origsrc/gpgme-1.9.0/lang/qt/src/QGpgmeConfig.cmake.in.in   2017-03-09 02:01:10.000000000 -0600
++++ src/gpgme-1.9.0/lang/qt/src/QGpgmeConfig.cmake.in.in       2017-06-28 17:09:28.547360700 -0500
+@@ -64,7 +64,7 @@ add_library(QGpgme SHARED IMPORTED)
+ set_target_properties(QGpgme PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
+   INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
+-  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@"
++  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme-qt5@libsuffix@"
+ )
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+--- origsrc/gpgme-1.9.0/lang/qt/tests/Makefile.am      2017-03-09 02:01:10.000000000 -0600
++++ src/gpgme-1.9.0/lang/qt/tests/Makefile.am  2017-06-28 17:08:22.839008800 -0500
+@@ -33,7 +33,7 @@ moc_files = t-keylist.moc t-keylocate.mo
+ AM_LDFLAGS = -no-install
+-LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
++LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme-qt5.la \
+         ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
+         @GPGME_QTTEST_LIBS@ -lstdc++
diff --git a/fedora b/fedora
new file mode 160000 (submodule)
index 0000000..80cb2f5
--- /dev/null
+++ b/fedora
@@ -0,0 +1 @@
+Subproject commit 80cb2f5e13b902e63785d307e0cffbe0d773a76c
index 25d60f719b5962f15cdff76d1b1dfdef074b46fe..106fd7ac05568896daf2123185864168269be4e5 100644 (file)
@@ -1,5 +1,7 @@
+inherit python2 python3 qt5
+
 NAME="gpgme"
-VERSION=1.4.4
+VERSION=1.9.0
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="GnuPG cryptography support library"
@@ -11,20 +13,56 @@ signature verification and key management."
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2
          ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2.sig"
-PATCH_URI="1.4.2-without-libassuan.patch"
+PATCH_URI="
+       fedora/0001-qt-pass-fmt-to-gpgrt_asprintf.patch
+       fedora/0001-don-t-add-extra-libraries-for-linking.patch
+       fedora/0001-fix-stupid-ax_python_devel.patch
+       1.9.0-qgpgme-qt5.patch
+       1.9.0-libsuffix.patch
+"
 
-PKG_NAMES="libgpgme11 libgpgme-devel"
+PKG_NAMES="libgpgme11 libgpgme-devel libgpgmepp6 libgpgmepp-devel
+          libqgpgme-qt5_7 libqgpgme-qt5-devel python2-gpg python3-gpg"
 libgpgme11_REQUIRES="gnupg"
-libgpgme11_CONTENTS="usr/bin/*-11.dll usr/share/doc/"
-libgpgme_devel_CONTENTS="usr/bin/*-config usr/include/ usr/lib/
-                         usr/share/aclocal/ usr/share/common-lisp/ usr/share/info/"
+libgpgme11_CONTENTS="
+       usr/bin/cyggpgme-11.dll
+       usr/share/doc/
+"
+libgpgme_devel_REQUIRES="libgpg-error-devel"
+libgpgme_devel_CONTENTS="
+       usr/bin/gpgme-config
+       usr/bin/gpgme-tool.exe
+       usr/include/gpgme.h
+       usr/lib/libgpgme.dll.a
+       usr/share/aclocal/gpgme.m4
+       usr/share/common-lisp/source/gpgme/
+       usr/share/info/gpgme.info*
+"
+libgpgmepp6_SUMMARY="GPGME C++ bindings"
+libgpgmepp6_CONTENTS="usr/bin/cyggpgmepp-6.dll"
+libgpgmepp_devel_SUMMARY=${libgpgmepp6_SUMMARY}
+libgpgmepp_devel_REQUIRES="libgpg-error-devel"
+libgpgmepp_devel_CONTENTS="
+       usr/include/gpgme++/
+       usr/lib/cmake/Gpgmepp/
+       usr/lib/libgpgmepp.dll.a
+"
+libqgpgme_qt5_7_SUMMARY="GPGME Qt5 bindings"
+libqgpgme_qt5_7_CONTENTS="usr/bin/cygqgpgme-qt5-7.dll"
+libqgpgme_qt5_devel_SUMMARY=${libqgpgme_qt7_SUMMARY}
+libqgpgme_qt5_devel_REQUIRES="libgpgmepp-devel libQt5Core-devel"
+# case-sensitive directories :-(
+libqgpgme_qt5_devel_CONTENTS="
+       usr/include/QGpgME/
+       usr/include/qgpgme/
+       usr/lib/cmake/QGpgme/
+       usr/lib/libqgpgme-qt5.dll.a
+"
+python2_gpg_SUMMARY="GPGME Python 2 bindings"
+python2_gpg_CONTENTS="${PYTHON2_SITELIB#/}/gpg*"
+python3_gpg_SUMMARY="GPGME Python 3 bindings"
+python3_gpg_CONTENTS="${PYTHON3_SITELIB#/}/gpg*"
 
 DISTCLEANFILES="m4/libtool.m4"
 
-CYGCONF_ARGS="
-  --with-gpg=/usr/bin/gpg
-  --without-gpgsm
-  --without-gpgconf
-  --without-g13
-"
 MAKEOPTS+=" no_undefined=-no-undefined"
This page took 0.051449 seconds and 5 git commands to generate.