File gpgme2.patch of Package kdepimlibs4
diff -Pdpru kdepimlibs-4.14.10.orig/gpgme++/context.cpp kdepimlibs-4.14.10/gpgme++/context.cpp
--- kdepimlibs-4.14.10.orig/gpgme++/context.cpp 2015-06-24 15:43:14.000000000 +0300
+++ kdepimlibs-4.14.10/gpgme++/context.cpp 2025-07-24 22:37:36.627420528 +0300
@@ -741,17 +741,20 @@ namespace GpgME {
Error Context::startTrustItemListing( const char * pattern, int maxLevel ) {
d->lastop = Private::TrustList;
- return Error( d->lasterr = gpgme_op_trustlist_start( d->ctx, pattern, maxLevel ) );
+ d->lasterr = GPG_ERR_NOT_SUPPORTED;
+ return Error(d->lasterr);
}
TrustItem Context::nextTrustItem( Error & e ) {
- gpgme_trust_item_t ti = 0;
- e = Error( d->lasterr = gpgme_op_trustlist_next( d->ctx, &ti ) );
- return TrustItem( ti );
+ gpgme_trust_item_t ti = nullptr;
+ d->lasterr = GPG_ERR_NOT_SUPPORTED;
+ e = Error(d->lasterr);
+ return TrustItem(ti);
}
Error Context::endTrustItemListing() {
- return Error( d->lasterr = gpgme_op_trustlist_end( d->ctx ) );
+ d->lasterr = GPG_ERR_NOT_SUPPORTED;
+ return Error(d->lasterr);
}
#ifdef HAVE_GPGME_ASSUAN_ENGINE
diff -Pdpru kdepimlibs-4.14.10.orig/gpgme++/eventloopinteractor.cpp kdepimlibs-4.14.10/gpgme++/eventloopinteractor.cpp
--- kdepimlibs-4.14.10.orig/gpgme++/eventloopinteractor.cpp 2015-06-24 15:43:14.000000000 +0300
+++ kdepimlibs-4.14.10/gpgme++/eventloopinteractor.cpp 2025-07-24 22:57:59.560379206 +0300
@@ -140,13 +140,6 @@ namespace GpgME {
instance()->nextKeyEvent( ctx, Key( key, false ) );
}
break;
- case GPGME_EVENT_NEXT_TRUSTITEM:
- {
- gpgme_trust_item_t item = static_cast<gpgme_trust_item_t>( type_data );
- instance()->nextTrustItemEvent( ctx, TrustItem( item ) );
- gpgme_trust_item_unref( item );
- }
- break;
default: // warn
;
}
diff -Pdpru kdepimlibs-4.14.10.orig/gpgme++/trustitem.cpp kdepimlibs-4.14.10/gpgme++/trustitem.cpp
--- kdepimlibs-4.14.10.orig/gpgme++/trustitem.cpp 2015-06-24 15:43:14.000000000 +0300
+++ kdepimlibs-4.14.10/gpgme++/trustitem.cpp 2025-07-24 23:06:54.096291301 +0300
@@ -32,73 +32,52 @@ namespace GpgME {
class TrustItem::Private {
public:
- Private( gpgme_trust_item_t aItem )
- : item( aItem )
- {
- }
-
- gpgme_trust_item_t item;
+ Private() {}
};
- TrustItem::TrustItem( gpgme_trust_item_t item ) {
- d = new Private( item );
- if ( d->item ) {
- gpgme_trust_item_ref( d->item );
- }
+ TrustItem::TrustItem( gpgme_trust_item_t /*item*/ ) {
+ d = new Private();
}
- TrustItem::TrustItem( const TrustItem & other ) {
- d = new Private( other.d->item );
- if ( d->item ) {
- gpgme_trust_item_ref( d->item );
- }
+ TrustItem::TrustItem( const TrustItem & /*other*/ ) {
+ d = new Private();
}
TrustItem::~TrustItem() {
- if ( d->item ) {
- gpgme_trust_item_unref( d->item );
- }
delete d; d = 0;
}
bool TrustItem::isNull() const {
- return !d || !d->item;
+ return true; // always null because trust items are unsupported now
}
gpgme_trust_item_t TrustItem::impl() const {
- return d->item;
+ return nullptr;
}
const char * TrustItem::keyID() const {
- return d->item ? d->item->keyid : 0 ;
+ return nullptr;
}
const char * TrustItem::userID() const {
- return d->item ? d->item->name : 0 ;
+ return nullptr;
}
const char * TrustItem::ownerTrustAsString() const {
- return d->item ? d->item->owner_trust : 0 ;
+ return nullptr;
}
const char * TrustItem::validityAsString() const {
- return d->item ? d->item->validity : 0 ;
+ return nullptr;
}
int TrustItem::trustLevel() const {
- return d->item ? d->item->level : 0 ;
+ return 0;
}
TrustItem::Type TrustItem::type() const {
- if ( !d->item ) {
- return Unknown;
- } else {
- return
- d->item->type == 1 ? Key :
- d->item->type == 2 ? UserID :
- Unknown ;
- }
+ return Unknown;
}
} // namespace GpgME