From 8d8fb49148c9741066d80ab308c4575fa96f9bab Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Mon, 23 Jan 2023 20:12:05 -0700 Subject: [PATCH] More tweaks to gdb-6.6-buildid-locate-rpm.patch ...in which rpmTag is replaced with rpmDbiTagVal. --- gdb-6.6-buildid-locate.patch | 6 +++--- gdb.spec | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch index afe4e58..424681c 100644 --- a/gdb-6.6-buildid-locate.patch +++ b/gdb-6.6-buildid-locate.patch @@ -787,10 +787,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c + static rpmts (*rpmtsCreate_p) (void); + extern rpmts rpmtsFree(rpmts ts); + static rpmts (*rpmtsFree_p) (rpmts ts); -+ extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, ++ extern rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmDbiTagVal rpmtag, + const void * keyp, size_t keylen); + static rpmdbMatchIterator (*rpmtsInitIterator_p) (const rpmts ts, -+ rpmTag rpmtag, ++ rpmDbiTagVal rpmtag, + const void *keyp, + size_t keylen); +#else /* !DLOPEN_LIBRPM */ @@ -845,7 +845,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c + && (rpmdbNextIterator_p = (Header (*) (rpmdbMatchIterator mi)) dlsym (h, "rpmdbNextIterator")) + && (rpmtsCreate_p = (rpmts (*) (void)) dlsym (h, "rpmtsCreate")) + && (rpmtsFree_p = (rpmts (*) (rpmts ts)) dlsym (h, "rpmtsFree")) -+ && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmTag rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator")))) ++ && (rpmtsInitIterator_p = (rpmdbMatchIterator (*) (const rpmts ts, rpmDbiTagVal rpmtag, const void *keyp, size_t keylen)) dlsym (h, "rpmtsInitIterator")))) + { + warning (_("Opened library \"%s\" is incompatible (%s), " + "missing debuginfos notifications will not be displayed"), diff --git a/gdb.spec b/gdb.spec index b2093bd..dd5edff 100644 --- a/gdb.spec +++ b/gdb.spec @@ -1190,6 +1190,10 @@ fi %endif %changelog +* Mon Jan 23 2023 Kevin Buettner +- More tweaks to gdb-6.6-buildid-locate-rpm.patch, in which rpmTag + is replaced with rpmDbiTagVal. + * Mon Jan 23 2023 Keith Seitz - 12.1-14 From Sergey Mende: - Backport upstream patch "gdb: call check_typedef at beginning of