pkgconf: Update to 1.7.3
conflict with pkg-config and provide pkg-config binaries
This commit is contained in:
Christoph Reiter
File diff suppressed because it is too large
Load Diff
16
mingw-w64-pkgconf/0001-meson-write-pc-file.patch
Normal file
16
mingw-w64-pkgconf/0001-meson-write-pc-file.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
--- pkgconf-1.7.3/meson.build.orig 2020-10-18 17:27:40.210500600 +0200
|
||||
+++ pkgconf-1.7.3/meson.build 2020-10-18 17:27:00.204103200 +0200
|
||||
@@ -84,6 +84,13 @@
|
||||
soversion : '3',
|
||||
)
|
||||
|
||||
+pkg = import('pkgconfig')
|
||||
+pkg.generate(libpkgconf,
|
||||
+ name : 'libpkgconf',
|
||||
+ description : 'a library for accessing and manipulating development framework configuration',
|
||||
+ url: 'http://github.com/pkgconf/pkgconf',
|
||||
+ filebase : 'libpkgconf',
|
||||
+)
|
||||
|
||||
pkgconf_exe = executable('pkgconf',
|
||||
'cli/main.c',
|
||||
41
mingw-w64-pkgconf/0002-prefer-forward-slashes.patch
Normal file
41
mingw-w64-pkgconf/0002-prefer-forward-slashes.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
--- pkgconf-1.7.3/libpkgconf/path.c.orig 2019-07-12 13:10:54.000000000 +0200
|
||||
+++ pkgconf-1.7.3/libpkgconf/path.c 2020-10-18 16:14:04.551602400 +0200
|
||||
@@ -322,7 +322,7 @@
|
||||
{
|
||||
#if defined(HAVE_CYGWIN_CONV_PATH) && defined(__MSYS__)
|
||||
ssize_t size;
|
||||
- char *tmpbuf, *ti;
|
||||
+ char *tmpbuf;
|
||||
|
||||
size = cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, NULL, 0);
|
||||
if (size < 0 || (size_t) size > buflen)
|
||||
@@ -334,13 +334,6 @@
|
||||
|
||||
pkgconf_strlcpy(buf, tmpbuf, buflen);
|
||||
free(tmpbuf);
|
||||
-
|
||||
- /* rewrite any backslash arguments for best compatibility */
|
||||
- for (ti = buf; *ti != '\0'; ti++)
|
||||
- {
|
||||
- if (*ti == '\\')
|
||||
- *ti = '/';
|
||||
- }
|
||||
#else
|
||||
char *tmpbuf;
|
||||
|
||||
@@ -358,5 +351,15 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if defined(__MSYS__) || defined(__MINGW32__)
|
||||
+ char *ti;
|
||||
+ /* rewrite any backslash arguments for best compatibility */
|
||||
+ for (ti = buf; *ti != '\0'; ti++)
|
||||
+ {
|
||||
+ if (*ti == '\\')
|
||||
+ *ti = '/';
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
return true;
|
||||
}
|
||||
15
mingw-w64-pkgconf/0003-size-t-format.patch
Normal file
15
mingw-w64-pkgconf/0003-size-t-format.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
--- pkgconf-1.7.3/libpkgconf/stdinc.h.orig 2019-07-12 13:10:54.000000000 +0200
|
||||
+++ pkgconf-1.7.3/libpkgconf/stdinc.h 2020-10-18 17:39:44.838906800 +0200
|
||||
@@ -31,11 +31,7 @@
|
||||
# include <windows.h>
|
||||
# include <malloc.h>
|
||||
# define PATH_DEV_NULL "nul"
|
||||
-# ifdef _WIN64
|
||||
-# define SIZE_FMT_SPECIFIER "%I64u"
|
||||
-# else
|
||||
-# define SIZE_FMT_SPECIFIER "%u"
|
||||
-# endif
|
||||
+# define SIZE_FMT_SPECIFIER "%zu"
|
||||
# ifndef ssize_t
|
||||
# ifndef __MINGW32__
|
||||
# include <BaseTsd.h>
|
||||
@@ -3,39 +3,55 @@
|
||||
_realname=pkgconf
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=1.3.8
|
||||
pkgver=1.7.3
|
||||
pkgrel=1
|
||||
pkgdesc='pkg-config compatible utility which does not depend on glib'
|
||||
url='https://github.com/pkgconf/pkgconf'
|
||||
arch=('any')
|
||||
license=('ISC')
|
||||
options=('!debug' 'strip')
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
|
||||
provides=("${MINGW_PACKAGE_PREFIX}-pkg-config")
|
||||
conflicts=("${MINGW_PACKAGE_PREFIX}-pkg-config")
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
|
||||
"${MINGW_PACKAGE_PREFIX}-meson"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja")
|
||||
source=(https://distfiles.dereferenced.org/pkgconf/$_realname-$pkgver.tar.gz
|
||||
0001-fix-mingw64-and-static.patch)
|
||||
sha256sums=('fdac40205a50c77485f1f034a36bcda08d0935320b90bdba1734dc4436ba00ef'
|
||||
'f92d157c481128d301473b1cd229557ac25a75e0b6ffd6ff6bbf17be5b84c047')
|
||||
0001-meson-write-pc-file.patch
|
||||
0002-prefer-forward-slashes.patch
|
||||
0003-size-t-format.patch)
|
||||
sha256sums=('d040859b36880323209f347c7c936e40a748ee63e123e43a771791a64165d6b1'
|
||||
'9af1f0600ca15e5f285ba54f4cb334f5d7e00f1bc21b6f571d71acd747f303b6'
|
||||
'4206763c501e73a60086b5d48ef4e13fdf75ff13cf72c021f31ad686af099070'
|
||||
'1db5975d6b1db946ba1d71cc3cf390dec567899a89d7ef53f56f24f0058cdbe3')
|
||||
|
||||
prepare() {
|
||||
cd $_realname-$pkgver
|
||||
patch -p1 -i ${srcdir}/0001-fix-mingw64-and-static.patch
|
||||
cd ${srcdir}/$_realname-$pkgver
|
||||
|
||||
patch -p1 -i ${srcdir}/0001-meson-write-pc-file.patch
|
||||
# To match what our old pkg-config did
|
||||
patch -p1 -i ${srcdir}/0002-prefer-forward-slashes.patch
|
||||
patch -p1 -i ${srcdir}/0003-size-t-format.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
|
||||
mkdir ${srcdir}/build-${MINGW_CHOST}
|
||||
cd ${srcdir}/build-${MINGW_CHOST}
|
||||
|
||||
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
|
||||
${MINGW_PREFIX}/bin/cmake \
|
||||
-G"MSYS Makefiles" \
|
||||
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
|
||||
|
||||
${MINGW_PREFIX}/bin/meson \
|
||||
--buildtype=plain \
|
||||
-Dtests=false \
|
||||
../${_realname}-${pkgver}
|
||||
make
|
||||
|
||||
meson compile
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/build-${MINGW_CHOST}
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
DESTDIR="${pkgdir}${MINGW_PREFIX}" meson install
|
||||
|
||||
cp "${pkgdir}${MINGW_PREFIX}"/bin/pkgconf "${pkgdir}${MINGW_PREFIX}"/bin/pkg-config
|
||||
cp "${pkgdir}${MINGW_PREFIX}"/bin/pkgconf "${pkgdir}${MINGW_PREFIX}"/bin/${MINGW_CHOST}-pkgconf
|
||||
cp "${pkgdir}${MINGW_PREFIX}"/bin/pkg-config "${pkgdir}${MINGW_PREFIX}"/bin/${MINGW_CHOST}-pkg-config
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user