Compare commits

..

No commits in common. "7976daab9af5b087ba187286fbeb56d21fd18c66" and "666b520273162131dd46a98b78094c7079ce74ce" have entirely different histories.

7 changed files with 7 additions and 15 deletions

View File

@ -151,7 +151,7 @@ libpkgconf_la_SOURCES = \
libpkgconf/path.c \ libpkgconf/path.c \
libpkgconf/personality.c \ libpkgconf/personality.c \
libpkgconf/parser.c libpkgconf/parser.c
libpkgconf_la_LDFLAGS = -no-undefined -version-info 4:0:0 -export-symbols-regex '^pkgconf_' libpkgconf_la_LDFLAGS = -no-undefined -version-info 3:0:0 -export-symbols-regex '^pkgconf_'
dist_man_MANS = \ dist_man_MANS = \
man/pkgconf.1 \ man/pkgconf.1 \

4
NEWS
View File

@ -28,10 +28,6 @@ Changes from 1.8.0 to 1.9.0:
- SYSROOT rules are no longer applied to `-uninstalled` packages by - SYSROOT rules are no longer applied to `-uninstalled` packages by
default. Use `PKG_CONFIG_PKGCONF1_SYSROOT_RULES` for legacy behavior. default. Use `PKG_CONFIG_PKGCONF1_SYSROOT_RULES` for legacy behavior.
* A new `--license` selector has been added to the pkgconf CLI. This uses
SPDX expressions which can be set as the `License` field in `.pc` files.
See the `pc(5)` manpage for more information.
* The canonical location for pkgconf maintenance going forward is * The canonical location for pkgconf maintenance going forward is
<https://gitea.treehouse.systems/ariadne/pkgconf>. This is presently <https://gitea.treehouse.systems/ariadne/pkgconf>. This is presently
mirrored to GitHub for user convenience, but that mirroring will mirrored to GitHub for user convenience, but that mirroring will

View File

@ -12,7 +12,7 @@ dnl implied. In no event shall the authors be liable for any damages arising
dnl from the use of this software. dnl from the use of this software.
AC_PREREQ([2.71]) AC_PREREQ([2.71])
AC_INIT([pkgconf],[1.9.0],[https://github.com/pkgconf/pkgconf/issues/new]) AC_INIT([pkgconf],[1.8.0],[https://github.com/pkgconf/pkgconf/issues/new])
AC_CONFIG_SRCDIR([cli/main.c]) AC_CONFIG_SRCDIR([cli/main.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"]) AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])

View File

@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <libpkgconf/bsdstubs.h> #include <libpkgconf/bsdstubs.h>
#include <libpkgconf/config.h> #include <libpkgconf/config.h>

View File

@ -79,8 +79,8 @@ typedef struct pkgconf_cross_personality_ pkgconf_cross_personality_t;
#define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \ #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
for ((value) = (tail); (value) != NULL; (value) = (value)->prev) for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
#define LIBPKGCONF_VERSION 10900 #define LIBPKGCONF_VERSION 10700
#define LIBPKGCONF_VERSION_STR "1.9.0" #define LIBPKGCONF_VERSION_STR "1.7.0"
struct pkgconf_fragment_ { struct pkgconf_fragment_ {
pkgconf_node_t iter; pkgconf_node_t iter;

View File

@ -110,9 +110,6 @@ statically.
Libraries this package depends on for linking against it statically, which are Libraries this package depends on for linking against it statically, which are
not described as dependencies should be specified here. not described as dependencies should be specified here.
(optional; fragment list) (optional; fragment list)
.It License
The asserted SPDX license tag that should be applied to the given package.
(optional; literal; pkgconf extension)
.It Requires .It Requires
Required dependencies that must be met for the package to be usable. Required dependencies that must be met for the package to be usable.
All dependencies must be satisfied or the pkg-config implementation must not use All dependencies must be satisfied or the pkg-config implementation must not use

View File

@ -1,5 +1,5 @@
project('pkgconf', 'c', project('pkgconf', 'c',
version : '1.9.0', version : '1.8.0',
license : 'ISC', license : 'ISC',
meson_version : '>=0.47', meson_version : '>=0.47',
default_options : ['c_std=c99'], default_options : ['c_std=c99'],
@ -82,8 +82,8 @@ libpkgconf = library('pkgconf',
'libpkgconf/tuple.c', 'libpkgconf/tuple.c',
c_args: ['-DLIBPKGCONF_EXPORT', build_static], c_args: ['-DLIBPKGCONF_EXPORT', build_static],
install : true, install : true,
version : '4.0.0', version : '3.0.0',
soversion : '4', soversion : '3',
) )
# For other projects using libpkgconfig as a subproject # For other projects using libpkgconfig as a subproject