kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Actually apply the proper patch

Browse source
This commit is contained in:
Baptiste Daroussin 2017-01-22 10:30:31 +00:00
parent b2f5a0027a
commit 8d785d9964
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=432109
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/pkgconf/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= pkgconf
PORTVERSION= 1.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://distfiles.dereferenced.org/pkgconf/ \
http://files.etoilebsd.net/pkgconf/

27
devel/pkgconf/files/patch-libpkgconf_pkg.c
View file

@ -1,11 +1,26 @@
--- libpkgconf/pkg.c.orig 2017-01-20 02:01:30 UTC
+++ libpkgconf/pkg.c
@@ -1341,7 +1341,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c
if (maxdepth == 0)
return eflags;
@@ -1336,6 +1336,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c
void *data,
int maxdepth)
{
+ unsigned int saved_flags = client->flags;
unsigned int eflags = PKGCONF_PKG_ERRF_OK;
- if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL)
+ if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & ~PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL)
{
if (maxdepth == 0)
@@ -1346,6 +1347,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c
if (func != NULL)
func(client, root, data);
}
+ client->flags &= ~PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL;
if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS))
{
@@ -1368,6 +1370,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *c
if (eflags != PKGCONF_PKG_ERRF_OK)
return eflags;
}
+ client->flags = saved_flags;
return eflags;
}