Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgconf: update to 1.4.2

Browse Source
This commit is contained in:
Tom G. Christensen
2018-04-16 19:02:21 +02:00
parent 8aeeaeb055
commit 7095eb8e98
7 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch Normal file
View File

@@ -0,0 +1,26 @@
--- pkgconf-pkgconf-1.4.2/libpkgconf/stdinc.h.stdint_h 2018-04-12 21:52:14.297482000 +0200
+++ pkgconf-pkgconf-1.4.2/libpkgconf/stdinc.h 2018-04-12 21:55:03.149282000 +0200
@@ -24,7 +24,9 @@
#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
--- pkgconf-pkgconf-1.4.2/getopt_long.h.stdint_h 2018-02-12 07:37:03.000000000 +0100
+++ pkgconf-pkgconf-1.4.2/getopt_long.h 2018-04-12 21:52:14.367487000 +0200
@@ -33,7 +33,11 @@
#ifndef _GETOPT_LONG_H_
#define _GETOPT_LONG_H_
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
/*
* GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.

15
pkgconf/src/pkgconf-include-order.patch
View File

@@ -1,15 +0,0 @@
--- pkgconf-0.9.12-56-g7e6fa32/libpkgconf/bsdstubs.c.orig 2016-01-21 17:16:39.000000000 +0100
+++ pkgconf-0.9.12-56-g7e6fa32/libpkgconf/bsdstubs.c 2016-03-05 18:10:11.010001000 +0100
@@ -17,11 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <libpkgconf/config.h>
#include <sys/types.h>
#include <string.h>
-
#include <libpkgconf/bsdstubs.h>
-#include <libpkgconf/config.h>
#ifndef HAVE_STRLCPY

28
pkgconf/src/pkgconf-stdint_h.patch
View File

@@ -1,28 +0,0 @@
--- pkgconf-0.9.12-56-g7e6fa32/libpkgconf/stdinc.h.orig 2016-01-21 17:16:39.000000000 +0100
+++ pkgconf-0.9.12-56-g7e6fa32/libpkgconf/stdinc.h 2016-03-05 17:27:34.870004000 +0100
@@ -27,7 +27,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
--- pkgconf-0.9.12-56-g7e6fa32/getopt_long.h.orig 2016-01-21 17:16:39.000000000 +0100
+++ pkgconf-0.9.12-56-g7e6fa32/getopt_long.h 2016-03-05 17:28:49.420018000 +0100
@@ -33,7 +33,11 @@
#ifndef _GETOPT_LONG_H_
#define _GETOPT_LONG_H_
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
/*
* GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.