diff --git a/pkgconf/build.sh b/pkgconf/build.sh index 9601a34..1ece56a 100755 --- a/pkgconf/build.sh +++ b/pkgconf/build.sh @@ -6,21 +6,18 @@ ########################################################### # Check the following 4 variables before running the script topdir=pkgconf -version=0.9.12-56-g7e6fa32 +version=1.4.2 pkgver=1 -# Source fetched from https://github.com/pkgconf/pkgconf -# git archive --format=tar --prefix=pkgconf-0.9.12-56-g7e6fa32/ \ -# -o ../pkgconf-0.9.12-56-g7e6fa32.tar pkgconf-0.9.12-56-g7e6fa32 -source[0]=$topdir-$version.tar.xz +source[0]=https://github.com/pkgconf/pkgconf/archive/$topdir-$version.tar.gz # If there are no patches, simply comment this -patch[0]=pkgconf-stdint_h.patch +patch[0]=pkgconf-1.4.2-no-stdint_h.patch patch[1]=pkgconf-dist-doc.patch -patch[2]=pkgconf-include-order.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions # Global settings +topsrcdir=${topdir}-${topdir}-$version export CPPFLAGS="-I$prefix/include" export LDFLAGS="-L$prefix/lib -R$prefix/lib" configure_args+=(--docdir=$prefix/$_vdocdir) diff --git a/pkgconf/meta/ChangeLog b/pkgconf/meta/ChangeLog index 4db7d71..fd6794b 100644 --- a/pkgconf/meta/ChangeLog +++ b/pkgconf/meta/ChangeLog @@ -1,4 +1,7 @@ CHANGELOG --------- +* Fri Apr 13 2018 Tom G. Christensen - 1.4.2-1 +- Update to 1.4.2 + * Sat Mar 05 2016 Tom G. Christensen - 0.9.12-56-g7e6fa32-1 - First package diff --git a/pkgconf/meta/depend b/pkgconf/meta/depend new file mode 100644 index 0000000..d8dee90 --- /dev/null +++ b/pkgconf/meta/depend @@ -0,0 +1 @@ +TGCpkcfd pkgconf auto diff --git a/pkgconf/meta/pkgdef b/pkgconf/meta/pkgdef index 448187a..18f495d 100644 --- a/pkgconf/meta/pkgdef +++ b/pkgconf/meta/pkgdef @@ -9,12 +9,12 @@ files(-,root,bin) default_docs $_bindir/pkgconf $_libdir/libpkgconf.so.* -$_sharedir/aclocal/pkg.m4 $_mandir/man1/pkgconf.1* +$_mandir/man5/pc.5* [pkgconf-devel] pkgname="${pkgprefix}pkcfd" -name="${topdir}d - A pkg-config replacement" +name="${topdir}-devel - A pkg-config replacement" pkgcat="application" pkgvendor="https://github.com/pkgconf/pkgconf/wiki" pkgdesc="Package compiler and linker metadata toolkit" @@ -22,5 +22,8 @@ pkgver="$pkgver" files(-,root,bin) $_libdir/libpkgconf.so $_libdir/libpkgconf.a +$_libdir/pkgconfig/libpkgconf.pc $_includedir/pkgconf +$_sharedir/aclocal/pkg.m4 +$_mandir/man7/pkg.m4.7* diff --git a/pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch b/pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch new file mode 100644 index 0000000..9da811e --- /dev/null +++ b/pkgconf/src/pkgconf-1.4.2-no-stdint_h.patch @@ -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 + #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-include-order.patch b/pkgconf/src/pkgconf-include-order.patch deleted file mode 100644 index f4c6187..0000000 --- a/pkgconf/src/pkgconf-include-order.patch +++ /dev/null @@ -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 - #include - #include -- - #include --#include - - #ifndef HAVE_STRLCPY - diff --git a/pkgconf/src/pkgconf-stdint_h.patch b/pkgconf/src/pkgconf-stdint_h.patch deleted file mode 100644 index db8515f..0000000 --- a/pkgconf/src/pkgconf-stdint_h.patch +++ /dev/null @@ -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 - #include - #include -+#ifdef HAVE_STDINT_H - #include -+#else -+#include -+#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 -+#else -+#include -+#endif - - /* - * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.