diff --git a/pkgconf/build.sh b/pkgconf/build.sh index 1ece56a..eb740a8 100755 --- a/pkgconf/build.sh +++ b/pkgconf/build.sh @@ -6,12 +6,14 @@ ########################################################### # Check the following 4 variables before running the script topdir=pkgconf -version=1.4.2 +version=1.6.0 pkgver=1 source[0]=https://github.com/pkgconf/pkgconf/archive/$topdir-$version.tar.gz # If there are no patches, simply comment this -patch[0]=pkgconf-1.4.2-no-stdint_h.patch -patch[1]=pkgconf-dist-doc.patch +patch[0]=0001-Fix-building-without-stdint.h.patch +patch[1]=0002-Use-u-instead-of-zu-for-compatibility.patch +patch[2]=0003-Install-NEWS-and-COPYING-files.patch +patch[3]=0004-Re-add-sys-stat.h-to-stdinc.h.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions diff --git a/pkgconf/meta/ChangeLog b/pkgconf/meta/ChangeLog index fd6794b..9e36583 100644 --- a/pkgconf/meta/ChangeLog +++ b/pkgconf/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Sun Mar 24 2019 Tom G. Christensen - 1.6.0-1 +- Update to 1.6.0 + * Fri Apr 13 2018 Tom G. Christensen - 1.4.2-1 - Update to 1.4.2 diff --git a/pkgconf/meta/pkgdef b/pkgconf/meta/pkgdef index 18f495d..463a312 100644 --- a/pkgconf/meta/pkgdef +++ b/pkgconf/meta/pkgdef @@ -11,6 +11,7 @@ $_bindir/pkgconf $_libdir/libpkgconf.so.* $_mandir/man1/pkgconf.1* $_mandir/man5/pc.5* +$_mandir/man5/pkgconf-personality.5* [pkgconf-devel] pkgname="${pkgprefix}pkcfd" diff --git a/pkgconf/src/0001-Fix-building-without-stdint.h.patch b/pkgconf/src/0001-Fix-building-without-stdint.h.patch new file mode 100644 index 0000000..d65d4fc --- /dev/null +++ b/pkgconf/src/0001-Fix-building-without-stdint.h.patch @@ -0,0 +1,43 @@ +From e450c37f0420a7ee92c3d03b4b4a9b54069f39f4 Mon Sep 17 00:00:00 2001 +From: "Tom G. Christensen" +Date: Sat, 23 Mar 2019 20:48:25 +0100 +Subject: [PATCH 1/4] Fix building without stdint.h + +--- + cli/getopt_long.h | 4 ++++ + libpkgconf/stdinc.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/cli/getopt_long.h b/cli/getopt_long.h +index b124291..2af2100 100644 +--- a/cli/getopt_long.h ++++ b/cli/getopt_long.h +@@ -33,7 +33,11 @@ + #ifndef _GETOPT_LONG_H_ + #define _GETOPT_LONG_H_ + ++#ifdef HAVE_STDINT_H + #include ++#else ++#include ++#endif + + /* + * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension. +diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h +index ca3a7dc..d071ae4 100644 +--- a/libpkgconf/stdinc.h ++++ b/libpkgconf/stdinc.h +@@ -24,7 +24,9 @@ + #include + #include + #include ++#ifdef HAVE_STDINT_H + #include ++#endif + + #ifdef _WIN32 + # define WIN32_LEAN_AND_MEAN +-- +2.16.5 + diff --git a/pkgconf/src/0002-Use-u-instead-of-zu-for-compatibility.patch b/pkgconf/src/0002-Use-u-instead-of-zu-for-compatibility.patch new file mode 100644 index 0000000..bd90e72 --- /dev/null +++ b/pkgconf/src/0002-Use-u-instead-of-zu-for-compatibility.patch @@ -0,0 +1,25 @@ +From 642e19d2af5bbc3c335b191118247f80a149f002 Mon Sep 17 00:00:00 2001 +From: "Tom G. Christensen" +Date: Sat, 23 Mar 2019 20:48:59 +0100 +Subject: [PATCH 2/4] Use %u instead of %zu for compatibility + +--- + libpkgconf/stdinc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h +index d071ae4..a47cd52 100644 +--- a/libpkgconf/stdinc.h ++++ b/libpkgconf/stdinc.h +@@ -54,7 +54,7 @@ + # define PKGCONF_ITEM_SIZE (_MAX_PATH + 1024) + #else + # define PATH_DEV_NULL "/dev/null" +-# define SIZE_FMT_SPECIFIER "%zu" ++# define SIZE_FMT_SPECIFIER "%u" + # ifdef __HAIKU__ + # include + # endif +-- +2.16.5 + diff --git a/pkgconf/src/0003-Install-NEWS-and-COPYING-files.patch b/pkgconf/src/0003-Install-NEWS-and-COPYING-files.patch new file mode 100644 index 0000000..00e1154 --- /dev/null +++ b/pkgconf/src/0003-Install-NEWS-and-COPYING-files.patch @@ -0,0 +1,25 @@ +From 1e950ffd807cbd860f2b28655b3ca73e707f31d9 Mon Sep 17 00:00:00 2001 +From: "Tom G. Christensen" +Date: Sat, 23 Mar 2019 21:05:23 +0100 +Subject: [PATCH 3/4] Install NEWS and COPYING files + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index e7be56a..5d8c4ee 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -161,7 +161,7 @@ noinst_HEADERS = \ + cli/getopt_long.h \ + cli/renderer-msvc.h + +-dist_doc_DATA = README.md AUTHORS ++dist_doc_DATA = README.md AUTHORS NEWS COPYING + + m4datadir = $(datadir)/aclocal + m4data_DATA = pkg.m4 +-- +2.16.5 + diff --git a/pkgconf/src/0004-Re-add-sys-stat.h-to-stdinc.h.patch b/pkgconf/src/0004-Re-add-sys-stat.h-to-stdinc.h.patch new file mode 100644 index 0000000..d9d6892 --- /dev/null +++ b/pkgconf/src/0004-Re-add-sys-stat.h-to-stdinc.h.patch @@ -0,0 +1,25 @@ +From df44a42677b501384563a0ac04098b776a87184e Mon Sep 17 00:00:00 2001 +From: "Tom G. Christensen" +Date: Sun, 24 Mar 2019 12:48:11 +0100 +Subject: [PATCH 4/4] Re-add to stdinc.h + +This fixes a segfault on Solaris 2.6. +--- + libpkgconf/stdinc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h +index a47cd52..0256040 100644 +--- a/libpkgconf/stdinc.h ++++ b/libpkgconf/stdinc.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_STDINT_H + #include + #endif +-- +2.16.5 + diff --git a/pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch b/pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch deleted file mode 100644 index 9da811e..0000000 --- a/pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 - #include - #include -+#ifdef HAVE_STDINT_H - #include -+#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 -+#else -+#include -+#endif - - /* - * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension. diff --git a/pkgconf/src/pkgconf-dist-doc.patch b/pkgconf/src/pkgconf-dist-doc.patch deleted file mode 100644 index f871487..0000000 --- a/pkgconf/src/pkgconf-dist-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pkgconf-0.9.12-56-g7e6fa32/Makefile.am.orig 2016-01-21 17:16:39.000000000 +0100 -+++ pkgconf-0.9.12-56-g7e6fa32/Makefile.am 2016-03-05 17:55:49.610012000 +0100 -@@ -72,7 +72,7 @@ - pkgconf_SOURCES = main.c getopt_long.c - noinst_HEADERS = getopt_long.h - --dist_doc_DATA = README.md AUTHORS -+dist_doc_DATA = README.md AUTHORS NEWS COPYING - - m4datadir = $(datadir)/aclocal - m4data_DATA = pkg.m4