[packages/rpm/dev-5.4.17] - updated fix-missing-types-in-headers patch (few parts obsolete, more new needed)

qboosh qboosh at pld-linux.org
Mon Apr 13 14:45:55 CEST 2020 

commit be77a1618dd7c954b6ea9ce98dc03ed28483da7b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 13 14:45:54 2020 +0200

    - updated fix-missing-types-in-headers patch (few parts obsolete, more new needed)

 rpm-fix-missing-types-in-headers.patch | 117 +++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 48 deletions(-)
---
diff --git a/rpm-fix-missing-types-in-headers.patch b/rpm-fix-missing-types-in-headers.patch
index ea484ef..49b2d38 100644
--- a/rpm-fix-missing-types-in-headers.patch
+++ b/rpm-fix-missing-types-in-headers.patch
@@ -1,15 +1,14 @@
-diff -ur rpm-5.4.10.orig/rpmio/argv.h rpm-5.4.10/rpmio/argv.h
---- rpm-5.4.10.orig/rpmio/argv.h	2012-09-09 13:54:22.000000000 +0200
-+++ rpm-5.4.10/rpmio/argv.h	2012-09-09 14:43:55.765933246 +0200
-@@ -1,6 +1,8 @@
- #ifndef _H_ARGV_
- #define	_H_ARGV_
+--- rpm-5.4.17/rpmio/argv.h.orig	2020-04-13 14:14:51.946707720 +0200
++++ rpm-5.4.17/rpmio/argv.h	2020-04-13 14:15:05.303302028 +0200
+@@ -6,6 +6,8 @@
+  */
+ #include <stdio.h>
  
-+#include <stdio.h>	/* XXX FILE * typedef */
++#include <rpmutil.h>
 +
- /** \ingroup rpmio
-  * \file rpmio/argv.h
-  */
+ typedef	const char * ARGstr_t;
+ typedef ARGstr_t * ARGV_t;
+ 
 diff -ur rpm-5.4.10.orig/rpmdb/pkgio.h rpm-5.4.10/rpmdb/pkgio.h
 --- rpm-5.4.10.orig/rpmdb/pkgio.h	2012-09-09 13:54:22.000000000 +0200
 +++ rpm-5.4.10/rpmdb/pkgio.h	2012-09-09 14:49:38.112587836 +0200
@@ -117,17 +116,18 @@ diff -ur rpm-5.4.10.orig/lib/rpmds.h rpm-5.4.10/lib/rpmds.h
  #define	_RPMNS_INTERNAL
  #include <rpmns.h>
  #include <rpmps.h>
-diff -ur rpm-5.4.10.orig/rpmdb/rpmevr.h rpm-5.4.10/rpmdb/rpmevr.h
---- rpm-5.4.10.orig/rpmdb/rpmevr.h	2012-09-09 13:54:22.000000000 +0200
-+++ rpm-5.4.10/rpmdb/rpmevr.h	2012-09-09 14:39:25.295942787 +0200
-@@ -1,6 +1,8 @@
+--- rpm-5.4.17/rpmdb/rpmevr.h.orig	2020-04-13 14:19:17.478602544 +0200
++++ rpm-5.4.17/rpmdb/rpmevr.h	2020-04-13 14:19:44.988453510 +0200
+@@ -1,6 +1,10 @@
  #ifndef H_RPMEVR
  #define H_RPMEVR
  
 +#include <stdint.h>	/* XXX unint32_t typedef */
++
++#include <rpmutil.h>
 +
  /** \ingroup rpmds
-  * \file lib/rpmevr.h
+  * \file rpmdb/rpmevr.h
   * Structure(s) and routine(s) used for EVR parsing and comparison.
 diff -ur rpm-5.4.10.orig/lib/rpmfi.h rpm-5.4.10/lib/rpmfi.h
 --- rpm-5.4.10.orig/lib/rpmfi.h	2012-09-09 13:54:23.000000000 +0200
@@ -173,19 +173,29 @@ diff -ur rpm-5.4.10.orig/rpmio/rpmiotypes.h rpm-5.4.10/rpmio/rpmiotypes.h
  /** \ingroup rpmio
   * \file rpmio/rpmiotypes.h
   */
-diff -ur rpm-5.4.10.orig/rpmio/rpmmacro.h rpm-5.4.10/rpmio/rpmmacro.h
---- rpm-5.4.10.orig/rpmio/rpmmacro.h	2012-09-09 13:54:22.000000000 +0200
-+++ rpm-5.4.10/rpmio/rpmmacro.h	2012-09-09 14:29:08.622631207 +0200
-@@ -1,6 +1,9 @@
- #ifndef _H_MACRO_
- #define	_H_MACRO_
+--- rpm-5.4.17/rpmio/rpmlog.h.orig	2014-09-29 20:26:48.000000000 +0200
++++ rpm-5.4.17/rpmio/rpmlog.h	2020-04-13 14:23:46.470478623 +0200
+@@ -9,6 +9,8 @@
+ #include <stdio.h>
+ #include <stdarg.h>
  
-+#include <stdio.h>	/* XXX FILE * typedef */
-+#include <sys/types.h>	/* XXX size_t typedef */
++#include <rpmutil.h>
 +
- /** \ingroup rpmio
+ /**
+  * RPM Log levels.
+  * priorities/facilities are encoded into a single 32-bit quantity, where the
+--- rpm-5.4.17/rpmio/rpmmacro.h.orig	2020-04-13 14:24:16.920313662 +0200
++++ rpm-5.4.17/rpmio/rpmmacro.h	2020-04-13 14:25:41.766520678 +0200
+@@ -5,6 +5,9 @@
   * \file rpmio/rpmmacro.h
   */
+ #include <stdio.h>
++#include <sys/types.h>	/* XXX size_t typedef */
++
++#include <rpmutil.h>    /* RPM_GNUC_... defs */
+ 
+ typedef /*@abstract@*/ struct MacroEntry_s * MacroEntry;
+ typedef /*@abstract@*/ struct MacroContext_s * MacroContext;
 diff -ur rpm-5.4.10.orig/rpmdb/rpmns.h rpm-5.4.10/rpmdb/rpmns.h
 --- rpm-5.4.10.orig/rpmdb/rpmns.h	2012-09-09 13:54:22.000000000 +0200
 +++ rpm-5.4.10/rpmdb/rpmns.h	2012-09-09 15:33:08.021691772 +0200
@@ -199,6 +209,16 @@ diff -ur rpm-5.4.10.orig/rpmdb/rpmns.h rpm-5.4.10/rpmdb/rpmns.h
  /** \ingroup rpmds
   * \file lib/rpmns.h
   * Structure(s) and routine(s) used for classifying and parsing names.
+--- rpm-5.4.17/rpmio/rpmpgp.h.orig	2016-04-13 22:03:07.000000000 +0200
++++ rpm-5.4.17/rpmio/rpmpgp.h	2020-04-13 14:27:48.049169879 +0200
+@@ -10,6 +10,7 @@
+  *	Copyright (C) The Internet Society (1998).  All Rights Reserved.
+  */
+ 
++#include <stdint.h>
+ #include <string.h>
+ #include <popt.h>
+ #include <rpmiotypes.h>
 diff -ur rpm-5.4.10.orig/lib/rpmps.h rpm-5.4.10/lib/rpmps.h
 --- rpm-5.4.10.orig/lib/rpmps.h	2012-09-09 13:54:23.000000000 +0200
 +++ rpm-5.4.10/lib/rpmps.h	2012-09-09 14:47:02.782593316 +0200
@@ -242,30 +262,17 @@ diff -ur rpm-5.4.10.orig/build/rpmspec.h rpm-5.4.10/build/rpmspec.h
  
  /** \ingroup rpmbuild
   */
-diff -ur rpm-5.4.10.orig/rpmio/rpmsw.h rpm-5.4.10/rpmio/rpmsw.h
---- rpm-5.4.10.orig/rpmio/rpmsw.h	2012-09-09 13:54:22.000000000 +0200
-+++ rpm-5.4.10/rpmio/rpmsw.h	2012-09-09 15:35:35.208353246 +0200
-@@ -1,6 +1,9 @@
- #ifndef	H_RPMSW
- #define	H_RPMSW
+--- rpm-5.4.17/rpmio/rpmsw.h.orig	2020-04-13 14:28:48.212177281 +0200
++++ rpm-5.4.17/rpmio/rpmsw.h	2020-04-13 14:29:04.432089411 +0200
+@@ -8,6 +8,8 @@
+ #include <sys/time.h>
+ #include <stdio.h>
  
-+#include <stdio.h>	/* XXX FILE * typedef */
-+#include <sys/time.h>	/* XXX struct timeval typedef */
++#include <rpmutil.h>
 +
  /** \ingroup rpmio
-  * \file rpmio/rpmsw.h
   */
-diff -ur rpm-5.4.10.orig/rpmdb/rpmtag.h rpm-5.4.10/rpmdb/rpmtag.h
---- rpm-5.4.10.orig/rpmdb/rpmtag.h	2012-09-09 13:54:22.000000000 +0200
-+++ rpm-5.4.10/rpmdb/rpmtag.h	2012-09-09 14:26:15.429303984 +0200
-@@ -5,6 +5,7 @@
-  * \file rpmdb/rpmtag.h
-  */
- 
-+#include <stdint.h>	/* XXX unint32_t typedef */
- #include <rpmiotypes.h>
- #include <rpmsw.h>
- 
+ typedef unsigned long int rpmtime_t;
 diff -ur rpm-5.4.10.orig/lib/rpmte.h rpm-5.4.10/lib/rpmte.h
 --- rpm-5.4.10.orig/lib/rpmte.h	2012-09-09 13:54:23.000000000 +0200
 +++ rpm-5.4.10/lib/rpmte.h	2012-09-09 15:32:00.408360824 +0200
@@ -303,14 +310,28 @@ diff -ur rpm-5.4.10.orig/lib/rpmts.h rpm-5.4.10/lib/rpmts.h
  #if defined(_RPMTS_INTERNAL)
  #include <rpmbag.h>
  #endif
-diff -ur rpm-5.4.10.orig/lib/rpmversion.h rpm-5.4.10/lib/rpmversion.h
---- rpm-5.4.10.orig/lib/rpmversion.h	2012-09-09 13:54:23.000000000 +0200
-+++ rpm-5.4.10/lib/rpmversion.h	2012-09-09 14:29:18.352630865 +0200
-@@ -1,6 +1,8 @@
+--- rpm-5.4.17/lib/rpmversion.h.in.orig	2014-09-28 21:31:08.000000000 +0200
++++ rpm-5.4.17/lib/rpmversion.h.in	2020-04-13 14:33:11.987414955 +0200
+@@ -1,6 +1,10 @@
  #ifndef __RPMVERSION_H__
  #define __RPMVERSION_H__
  
 +#include <stdint.h>	/* XXX unint32_t typedef */
++
++#include <rpmutil.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+--- rpm-5.4.17/lib/rpmversion.h.orig	2020-04-13 14:32:31.937631923 +0200
++++ rpm-5.4.17/lib/rpmversion.h	2020-04-13 14:32:50.270865937 +0200
+@@ -1,6 +1,10 @@
+ #ifndef __RPMVERSION_H__
+ #define __RPMVERSION_H__
+ 
++#include <stdint.h>	/* XXX unint32_t typedef */
++
++#include <rpmutil.h>
 +
  #ifdef __cplusplus
  extern "C" {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/be77a1618dd7c954b6ea9ce98dc03ed28483da7b

More information about the pld-cvs-commit mailing list