Thu Mar 18 06:44:45 2021 UTC ()
qgpgme: update to 1.15.1

to match gpgme.


(markd)
diff -r1.16 -r1.17 pkgsrc/security/qgpgme/Makefile
diff -r1.1 -r1.2 pkgsrc/security/qgpgme/PLIST
diff -r1.1 -r1.2 pkgsrc/security/qgpgme/distinfo
diff -r1.1 -r1.2 pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in
cvs diff -r1.16 -r1.17 pkgsrc/security/qgpgme/Makefile (expand / switch to unified diff)

--- pkgsrc/security/qgpgme/Makefile 2021/02/02 12:05:48 1.16
+++ pkgsrc/security/qgpgme/Makefile 2021/03/18 06:44:45 1.17
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.16 2021/02/02 12:05:48 ryoon Exp $ 1# $NetBSD: Makefile,v 1.17 2021/03/18 06:44:45 markd Exp $
2 2
3DISTNAME= gpgme-1.10.0 3DISTNAME= gpgme-1.15.1
4PKGNAME= qgpgme-1.10.0 4PKGNAME= qgpgme-1.15.1
5PKGREVISION= 13 
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ 6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gnupg.org/related_software/gpgme/ 10HOMEPAGE= https://www.gnupg.org/related_software/gpgme/
12COMMENT= Qt bindings for GPGme 11COMMENT= Qt bindings for GPGme
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15USE_TOOLS+= pkg-config gmake 14USE_TOOLS+= pkg-config gmake
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18 17
cvs diff -r1.1 -r1.2 pkgsrc/security/qgpgme/PLIST (expand / switch to unified diff)

--- pkgsrc/security/qgpgme/PLIST 2018/01/31 11:36:14 1.1
+++ pkgsrc/security/qgpgme/PLIST 2021/03/18 06:44:45 1.2
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1@comment $NetBSD: PLIST,v 1.1 2018/01/31 11:36:14 markd Exp $ 1@comment $NetBSD: PLIST,v 1.2 2021/03/18 06:44:45 markd Exp $
2include/QGpgME/AbstractImportJob 2include/QGpgME/AbstractImportJob
3include/QGpgME/AddUserIDJob 3include/QGpgME/AddUserIDJob
4include/QGpgME/ChangeExpiryJob 4include/QGpgME/ChangeExpiryJob
5include/QGpgME/ChangeOwnerTrustJob 5include/QGpgME/ChangeOwnerTrustJob
6include/QGpgME/ChangePasswdJob 6include/QGpgME/ChangePasswdJob
7include/QGpgME/CryptoConfig 7include/QGpgME/CryptoConfig
8include/QGpgME/DN 8include/QGpgME/DN
9include/QGpgME/DataProvider 9include/QGpgME/DataProvider
 10include/QGpgME/Debug
10include/QGpgME/DecryptJob 11include/QGpgME/DecryptJob
11include/QGpgME/DecryptVerifyJob 12include/QGpgME/DecryptVerifyJob
12include/QGpgME/DefaultKeyGenerationJob 13include/QGpgME/DefaultKeyGenerationJob
13include/QGpgME/DeleteJob 14include/QGpgME/DeleteJob
14include/QGpgME/DownloadJob 15include/QGpgME/DownloadJob
15include/QGpgME/EncryptJob 16include/QGpgME/EncryptJob
16include/QGpgME/ExportJob 17include/QGpgME/ExportJob
 18include/QGpgME/GpgCardJob
17include/QGpgME/HierarchicalKeyKistJob 19include/QGpgME/HierarchicalKeyKistJob
18include/QGpgME/ImportFromKeyserverJob 20include/QGpgME/ImportFromKeyserverJob
19include/QGpgME/ImportJob 21include/QGpgME/ImportJob
20include/QGpgME/Job 22include/QGpgME/Job
21include/QGpgME/KeyForMailboxJob 23include/QGpgME/KeyForMailboxJob
22include/QGpgME/KeyGenerationJob 24include/QGpgME/KeyGenerationJob
23include/QGpgME/KeyListJob 25include/QGpgME/KeyListJob
24include/QGpgME/ListAllKeysJob 26include/QGpgME/ListAllKeysJob
25include/QGpgME/MultiDeleteJob 27include/QGpgME/MultiDeleteJob
26include/QGpgME/Protocol 28include/QGpgME/Protocol
27include/QGpgME/QGpgMENewCryptoConfig 29include/QGpgME/QGpgMENewCryptoConfig
28include/QGpgME/QuickJob 30include/QGpgME/QuickJob
29include/QGpgME/RefreshKeysJob 31include/QGpgME/RefreshKeysJob
@@ -32,34 +34,36 @@ include/QGpgME/SignJob @@ -32,34 +34,36 @@ include/QGpgME/SignJob
32include/QGpgME/SignKeyJob 34include/QGpgME/SignKeyJob
33include/QGpgME/SpecialJob 35include/QGpgME/SpecialJob
34include/QGpgME/TofuPolicyJob 36include/QGpgME/TofuPolicyJob
35include/QGpgME/VerifyDetachedJob 37include/QGpgME/VerifyDetachedJob
36include/QGpgME/VerifyOpaqueJob 38include/QGpgME/VerifyOpaqueJob
37include/QGpgME/WKSPublishJob 39include/QGpgME/WKSPublishJob
38include/qgpgme/abstractimportjob.h 40include/qgpgme/abstractimportjob.h
39include/qgpgme/adduseridjob.h 41include/qgpgme/adduseridjob.h
40include/qgpgme/changeexpiryjob.h 42include/qgpgme/changeexpiryjob.h
41include/qgpgme/changeownertrustjob.h 43include/qgpgme/changeownertrustjob.h
42include/qgpgme/changepasswdjob.h 44include/qgpgme/changepasswdjob.h
43include/qgpgme/cryptoconfig.h 45include/qgpgme/cryptoconfig.h
44include/qgpgme/dataprovider.h 46include/qgpgme/dataprovider.h
 47include/qgpgme/debug.h
45include/qgpgme/decryptjob.h 48include/qgpgme/decryptjob.h
46include/qgpgme/decryptverifyjob.h 49include/qgpgme/decryptverifyjob.h
47include/qgpgme/defaultkeygenerationjob.h 50include/qgpgme/defaultkeygenerationjob.h
48include/qgpgme/deletejob.h 51include/qgpgme/deletejob.h
49include/qgpgme/dn.h 52include/qgpgme/dn.h
50include/qgpgme/downloadjob.h 53include/qgpgme/downloadjob.h
51include/qgpgme/encryptjob.h 54include/qgpgme/encryptjob.h
52include/qgpgme/exportjob.h 55include/qgpgme/exportjob.h
 56include/qgpgme/gpgcardjob.h
53include/qgpgme/hierarchicalkeylistjob.h 57include/qgpgme/hierarchicalkeylistjob.h
54include/qgpgme/importfromkeyserverjob.h 58include/qgpgme/importfromkeyserverjob.h
55include/qgpgme/importjob.h 59include/qgpgme/importjob.h
56include/qgpgme/job.h 60include/qgpgme/job.h
57include/qgpgme/keyformailboxjob.h 61include/qgpgme/keyformailboxjob.h
58include/qgpgme/keygenerationjob.h 62include/qgpgme/keygenerationjob.h
59include/qgpgme/keylistjob.h 63include/qgpgme/keylistjob.h
60include/qgpgme/listallkeysjob.h 64include/qgpgme/listallkeysjob.h
61include/qgpgme/multideletejob.h 65include/qgpgme/multideletejob.h
62include/qgpgme/protocol.h 66include/qgpgme/protocol.h
63include/qgpgme/qgpgme_export.h 67include/qgpgme/qgpgme_export.h
64include/qgpgme/qgpgme_version.h 68include/qgpgme/qgpgme_version.h
65include/qgpgme/qgpgmenewcryptoconfig.h 69include/qgpgme/qgpgmenewcryptoconfig.h
cvs diff -r1.1 -r1.2 pkgsrc/security/qgpgme/distinfo (expand / switch to unified diff)

--- pkgsrc/security/qgpgme/distinfo 2018/01/31 11:36:14 1.1
+++ pkgsrc/security/qgpgme/distinfo 2021/03/18 06:44:45 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2018/01/31 11:36:14 markd Exp $ 1$NetBSD: distinfo,v 1.2 2021/03/18 06:44:45 markd Exp $
2 2
3SHA1 (gpgme-1.10.0.tar.bz2) = 77d3390887da25ed70b7ac04392360efbdca501f 3SHA1 (gpgme-1.15.1.tar.bz2) = 5ae07a303fcf9cec490dabdfbc6e0f3b8f6dd5a0
4RMD160 (gpgme-1.10.0.tar.bz2) = 9e6d0cef086b47f697a17384082f0c9f2f95c412 4RMD160 (gpgme-1.15.1.tar.bz2) = 16eb8809be0482f3f52c591d3235f0c169be8de0
5SHA512 (gpgme-1.10.0.tar.bz2) = 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5 5SHA512 (gpgme-1.15.1.tar.bz2) = 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
6Size (gpgme-1.10.0.tar.bz2) = 1370162 bytes 6Size (gpgme-1.15.1.tar.bz2) = 1699349 bytes
7SHA1 (patch-lang_qt_src_Makefile.in) = 1487a7d404241f9cbf8771716da934f783847e5c 7SHA1 (patch-lang_qt_src_Makefile.in) = 943f3466322a30c8de2c23bdf0dda3bda4fd0e9f
cvs diff -r1.1 -r1.2 pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in 2018/01/31 11:36:14 1.1
+++ pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in 2021/03/18 06:44:45 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-lang_qt_src_Makefile.in,v 1.1 2018/01/31 11:36:14 markd Exp $ 1$NetBSD: patch-lang_qt_src_Makefile.in,v 1.2 2021/03/18 06:44:45 markd Exp $
2 2
3Use installed libraries 3Use installed libraries
4 4
5--- lang/qt/src/Makefile.in.orig 2017-12-12 11:56:08.000000000 +0000 5--- lang/qt/src/Makefile.in.orig 2021-01-08 17:21:11.000000000 +0000
6+++ lang/qt/src/Makefile.in 6+++ lang/qt/src/Makefile.in
7@@ -138,8 +138,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 7@@ -143,8 +143,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
8 "$(DESTDIR)$(qgpgmeincludedir)" \ 8 "$(DESTDIR)$(qgpgmeincludedir)" \
9 "$(DESTDIR)$(qgpgmeincludedir)" 9 "$(DESTDIR)$(qgpgmeincludedir)"
10 LTLIBRARIES = $(lib_LTLIBRARIES) 10 LTLIBRARIES = $(lib_LTLIBRARIES)
11-libqgpgme_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \ 11-libqgpgme_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
12- ../../../src/libgpgme.la 12- ../../../src/libgpgme.la
13+libqgpgme_la_DEPENDENCIES =  13+libqgpgme_la_DEPENDENCIES =
14 am__objects_1 = dataprovider.lo job.lo multideletejob.lo \ 14 am__objects_1 = dataprovider.lo debug.lo job.lo multideletejob.lo \
15 qgpgmeadduseridjob.lo qgpgmebackend.lo \ 15 qgpgmeadduseridjob.lo qgpgmebackend.lo \
16 qgpgmechangeexpiryjob.lo qgpgmechangeownertrustjob.lo \ 16 qgpgmechangeexpiryjob.lo qgpgmechangeownertrustjob.lo \
17@@ -667,7 +666,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s 17@@ -727,7 +726,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s
18 @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ 18 -DBUILDING_QGPGME -Wsuggest-override \
19 -DBUILDING_QGPGME 19 -Wzero-as-null-pointer-constant
20  20
21-libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \ 21-libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
22+libqgpgme_la_LIBADD = -lgpgmepp -lgpgme \ 22+libqgpgme_la_LIBADD = -lgpgmepp -lgpgme \
23 @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@ 23 @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@
24  24
25 libqgpgme_la_LDFLAGS = -no-undefined -version-info \ 25 libqgpgme_la_LDFLAGS = -no-undefined -version-info \