CVS commit: pkgsrc/security/qgpgme

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/qgpgme
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Sun, 4 Feb 2024 09:23:44 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Feb  4 09:23:44 UTC 2024

Modified Files:
        pkgsrc/security/qgpgme: Makefile PLIST distinfo
        pkgsrc/security/qgpgme/patches: patch-lang_qt_src_Makefile.in

Log Message:
qgpgme: update to 1.23.2

sync with gpgme, and fix building shared library


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/qgpgme/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/qgpgme/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/qgpgme/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/qgpgme/Makefile
diff -u pkgsrc/security/qgpgme/Makefile:1.29 pkgsrc/security/qgpgme/Makefile:1.30
--- pkgsrc/security/qgpgme/Makefile:1.29        Sun Nov 12 13:23:27 2023
+++ pkgsrc/security/qgpgme/Makefile     Sun Feb  4 09:23:44 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2023/11/12 13:23:27 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2024/02/04 09:23:44 markd Exp $
 
-DISTNAME=      gpgme-1.18.0
-PKGNAME=       qgpgme-1.18.0
-PKGREVISION=   8
+DISTNAME=      gpgme-1.23.2
+PKGNAME=       qgpgme-1.23.2
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/qgpgme/PLIST
diff -u pkgsrc/security/qgpgme/PLIST:1.3 pkgsrc/security/qgpgme/PLIST:1.4
--- pkgsrc/security/qgpgme/PLIST:1.3    Thu Sep 29 00:11:59 2022
+++ pkgsrc/security/qgpgme/PLIST        Sun Feb  4 09:23:44 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/09/29 00:11:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/02/04 09:23:44 markd Exp $
 include/QGpgME/AbstractImportJob
 include/QGpgME/AddExistingSubkeyJob
 include/QGpgME/AddUserIDJob
@@ -10,12 +10,15 @@ include/QGpgME/DN
 include/QGpgME/DataProvider
 include/QGpgME/Debug
 include/QGpgME/DecryptJob
+include/QGpgME/DecryptVerifyArchiveJob
 include/QGpgME/DecryptVerifyJob
 include/QGpgME/DefaultKeyGenerationJob
 include/QGpgME/DeleteJob
 include/QGpgME/DownloadJob
+include/QGpgME/EncryptArchiveJob
 include/QGpgME/EncryptJob
 include/QGpgME/ExportJob
+include/QGpgME/FileListDataProvider
 include/QGpgME/GpgCardJob
 include/QGpgME/HierarchicalKeyKistJob
 include/QGpgME/ImportFromKeyserverJob
@@ -33,6 +36,8 @@ include/QGpgME/ReceiveKeysJob
 include/QGpgME/RefreshKeysJob
 include/QGpgME/RevokeKeyJob
 include/QGpgME/SetPrimaryUserIDJob
+include/QGpgME/SignArchiveJob
+include/QGpgME/SignEncryptArchiveJob
 include/QGpgME/SignEncryptJob
 include/QGpgME/SignJob
 include/QGpgME/SignKeyJob
@@ -42,6 +47,7 @@ include/QGpgME/VerifyDetachedJob
 include/QGpgME/VerifyOpaqueJob
 include/QGpgME/WKDLookupJob
 include/QGpgME/WKDLookupResult
+include/QGpgME/WKDRefreshJob
 include/QGpgME/WKSPublishJob
 include/qgpgme/abstractimportjob.h
 include/qgpgme/addexistingsubkeyjob.h
@@ -53,13 +59,16 @@ include/qgpgme/cryptoconfig.h
 include/qgpgme/dataprovider.h
 include/qgpgme/debug.h
 include/qgpgme/decryptjob.h
+include/qgpgme/decryptverifyarchivejob.h
 include/qgpgme/decryptverifyjob.h
 include/qgpgme/defaultkeygenerationjob.h
 include/qgpgme/deletejob.h
 include/qgpgme/dn.h
 include/qgpgme/downloadjob.h
+include/qgpgme/encryptarchivejob.h
 include/qgpgme/encryptjob.h
 include/qgpgme/exportjob.h
+include/qgpgme/filelistdataprovider.h
 include/qgpgme/gpgcardjob.h
 include/qgpgme/hierarchicalkeylistjob.h
 include/qgpgme/importfromkeyserverjob.h
@@ -79,6 +88,8 @@ include/qgpgme/receivekeysjob.h
 include/qgpgme/refreshkeysjob.h
 include/qgpgme/revokekeyjob.h
 include/qgpgme/setprimaryuseridjob.h
+include/qgpgme/signarchivejob.h
+include/qgpgme/signencryptarchivejob.h
 include/qgpgme/signencryptjob.h
 include/qgpgme/signjob.h
 include/qgpgme/signkeyjob.h
@@ -88,6 +99,7 @@ include/qgpgme/verifydetachedjob.h
 include/qgpgme/verifyopaquejob.h
 include/qgpgme/wkdlookupjob.h
 include/qgpgme/wkdlookupresult.h
+include/qgpgme/wkdrefreshjob.h
 include/qgpgme/wkspublishjob.h
 lib/cmake/QGpgme/QGpgmeConfig.cmake
 lib/cmake/QGpgme/QGpgmeConfigVersion.cmake

Index: pkgsrc/security/qgpgme/distinfo
diff -u pkgsrc/security/qgpgme/distinfo:1.5 pkgsrc/security/qgpgme/distinfo:1.6
--- pkgsrc/security/qgpgme/distinfo:1.5 Thu Sep 29 00:11:59 2022
+++ pkgsrc/security/qgpgme/distinfo     Sun Feb  4 09:23:44 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2022/09/29 00:11:59 markd Exp $
+$NetBSD: distinfo,v 1.6 2024/02/04 09:23:44 markd Exp $
 
-BLAKE2s (gpgme-1.18.0.tar.bz2) = 48a1a66cca2fbe838112932507f11119039c07e2150da2d4fb392cb6ff21c5c4
-SHA512 (gpgme-1.18.0.tar.bz2) = c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
-Size (gpgme-1.18.0.tar.bz2) = 1762323 bytes
-SHA1 (patch-lang_qt_src_Makefile.in) = b9b0e54c65f6b446607cb9e3512b05f0fb7ac356
+BLAKE2s (gpgme-1.23.2.tar.bz2) = 0a78553b4c97fcdb976fbd2e09023cf9ed4454369157823716866a5eb41ee451
+SHA512 (gpgme-1.23.2.tar.bz2) = 6cfcd07e81a93de240582de5a46545420cee93d1f27fe20ea2c983780fdd3036b69fdba073cf549d68a20791e189bf4b3cdde14a43f912d2ab9ef3414c83ac75
+Size (gpgme-1.23.2.tar.bz2) = 1836904 bytes
+SHA1 (patch-lang_qt_src_Makefile.in) = abf91c449143ab8bb4003aabf4d888614ab83241

Index: pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in
diff -u pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in:1.3 pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in:1.4
--- pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in:1.3    Thu Sep 29 00:11:59 2022
+++ pkgsrc/security/qgpgme/patches/patch-lang_qt_src_Makefile.in        Sun Feb  4 09:23:44 2024
@@ -1,25 +1,31 @@
-$NetBSD: patch-lang_qt_src_Makefile.in,v 1.3 2022/09/29 00:11:59 markd Exp $
+$NetBSD: patch-lang_qt_src_Makefile.in,v 1.4 2024/02/04 09:23:44 markd Exp $
 
 Use installed libraries
+remove "-no-undefined" flag as it stops shared library being built.
 
---- lang/qt/src/Makefile.in.orig       2022-08-10 13:12:50.000000000 +0000
+--- lang/qt/src/Makefile.in.orig       2023-11-28 15:45:03.000000000 +0000
 +++ lang/qt/src/Makefile.in
-@@ -144,8 +144,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -169,9 +169,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
        "$(DESTDIR)$(qgpgmeincludedir)" \
        "$(DESTDIR)$(qgpgmeincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
--libqgpgme_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
--      ../../../src/libgpgme.la
-+libqgpgme_la_DEPENDENCIES =
- am__objects_1 = dataprovider.lo debug.lo job.lo multideletejob.lo \
-       qgpgmeadduseridjob.lo qgpgmeaddexistingsubkeyjob.lo \
-       qgpgmebackend.lo qgpgmechangeexpiryjob.lo \
-@@ -774,7 +773,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s
-               -DBUILDING_QGPGME -Wsuggest-override \
-               -Wzero-as-null-pointer-constant
+-@WANT_QT5_TRUE@libqgpgme_la_DEPENDENCIES =  \
+-@WANT_QT5_TRUE@       ../../cpp/src/libgpgmepp.la \
+-@WANT_QT5_TRUE@       ../../../src/libgpgme.la
++@WANT_QT5_TRUE@libqgpgme_la_DEPENDENCIES = 
+ am__libqgpgme_la_SOURCES_DIST = cleaner.cpp dataprovider.cpp debug.cpp \
+       decryptverifyarchivejob.cpp encryptarchivejob.cpp \
+       filelistdataprovider.cpp job.cpp multideletejob.cpp \
+@@ -1006,10 +1004,10 @@ nodist_qgpgmeinclude_HEADERS = qgpgme_ve
+ @WANT_QT6_TRUE@              -Wzero-as-null-pointer-constant
  
--libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
-+libqgpgme_la_LIBADD = -lgpgmepp -lgpgme \
-                        @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ @GPGME_QT_LIBS@
+ @WANT_QT5_TRUE@libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
+-@WANT_QT5_TRUE@libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
++@WANT_QT5_TRUE@libqgpgme_la_LIBADD = -lgpgmepp -lgpgme \
+ @WANT_QT5_TRUE@                      @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ @GPGME_QT5_LIBS@
  
- libqgpgme_la_LDFLAGS = -no-undefined -version-info \
+-@WANT_QT5_TRUE@libqgpgme_la_LDFLAGS = -no-undefined -version-info \
++@WANT_QT5_TRUE@libqgpgme_la_LDFLAGS = -version-info \
+ @WANT_QT5_TRUE@                       @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
+ 
+ @WANT_QT6_TRUE@libqgpgmeqt6_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index