[rpms/gdb] gdb-17.2-rebase-f44: More tweaks to gdb-6.6-buildid-locate-rpm.patch

[rpms/gdb] gdb-17.2-rebase-f44: More tweaks to gdb-6.6-buildid-locate-rpm.patch

[Kevin Buettner]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 8d8fb49148c9741066d80ab308c4575fa96f9bab
            Author : Kevin Buettner <kevinb@redhat.com>
            Date   : 2023-01-23T20:12:05-07:00
            Stats  : +7/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/8d8fb49148c9741066d80ab308c4575fa96f9bab?branch=gdb-17.2-rebase-f44

            Log:
            More tweaks to gdb-6.6-buildid-locate-rpm.patch

...in which rpmTag is replaced with rpmDbiTagVal.

---
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 <kevinb@redhat.com>
+- More tweaks to gdb-6.6-buildid-locate-rpm.patch, in which rpmTag
+  is replaced with rpmDbiTagVal.
+
 * Mon Jan 23 2023 Keith Seitz <keiths@redhat.com> - 12.1-14
   From Sergey Mende:
 - Backport upstream patch "gdb: call check_typedef at beginning of