From 138f9219b46697aa34c848aed80921f25b079e4a Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 29 Dec 2007 17:49:50 +0100 Subject: [PATCH] * pkg.c (internal_get_package): Don't add the internal-only pkg-config package twice. --- ChangeLog | 3 +++ pkg.c | 12 ------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48b54eb..187ca61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-12-29 Tollef Fog Heen + * pkg.c (internal_get_package): Don't add the internal-only + pkg-config package twice. + * pkg.c (verify_package): Apply patch from Matthias Clasen of RedHat to prevent segfaults if a Conflicts line is encountered. diff --git a/pkg.c b/pkg.c index a4bf905..2c67af5 100644 --- a/pkg.c +++ b/pkg.c @@ -57,15 +57,6 @@ gboolean disable_uninstalled = FALSE; gboolean ignore_requires = FALSE; gboolean ignore_private_libs = TRUE; -static Package pkg_config_package = { - .key = PACKAGE, - .name = PACKAGE, - .version = VERSION, /* .version */ - .description = "returns metainformation about installed libraries", - .url = "http://pkg-config.freedesktop.org", - 0 /* keep the rest as null */ -}; - void add_search_dir (const char *path) { @@ -284,9 +275,6 @@ internal_get_package (const char *name, gboolean warn, gboolean check_compat) Package *pkg = NULL; const char *location; - if (strcmp(PACKAGE, name) == 0) - return &pkg_config_package; - pkg = g_hash_table_lookup (packages, name); if (pkg) -- 2.39.5