Attachment 4093 Details for Bug 5340 – Part 2 of patch, patches pkg.c

[patch] Part 2 of patch, patches pkg.c

pkgconfig_pkg.c.diff (text/plain), 1.79 KB, created by Björn Lindqvist on 2005-12-16 04:31:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Lindqvist

Created: 2005-12-16 04:31:58 UTC

Size: 1.79 KB

patch

obsolete

>--- ../orig/pkg-config-0.20/pkg.c	2005-10-16 19:28:31.000000000 +0200
>+++ pkg.c	2005-12-15 18:16:51.000000000 +0100
>@@ -268,11 +268,11 @@
>     return FALSE;
> }
> 
> 
> static Package *
>-internal_get_package (const char *name, gboolean warn, gboolean check_compat)
>+internal_get_package (const char *name, gboolean check_compat)
> {
>   Package *pkg = NULL;
>   const char *location;
>   
>   pkg = g_hash_table_lookup (packages, name);
>@@ -296,11 +296,11 @@
>         {
>           char *un;
> 
>           un = g_strconcat (name, "-uninstalled", NULL);
> 
>-          pkg = internal_get_package (un, FALSE, FALSE);
>+          pkg = internal_get_package (un, FALSE);
> 
>           g_free (un);
>           
>           if (pkg)
>             {
>@@ -322,25 +322,17 @@
>                       name);
>           
>           return pkg;
>         }
>     }
>-      
>-  if (location == NULL)
>-    {
>-      if (warn)
>-        verbose_error ("Package %s was not found in the pkg-config search path.\n"
>-                       "Perhaps you should add the directory containing `%s.pc'\n"
>-                       "to the PKG_CONFIG_PATH environment variable\n",
>-                       name, name);
> 
>+  if (location == NULL)
>       return NULL;
>-    }
> 
>   debug_spew ("Reading '%s' from file '%s'\n", name, location);
>   pkg = parse_package_file (location, ignore_requires, ignore_private_libs);
>-  
>+
>   if (pkg == NULL)
>     {
>       debug_spew ("Failed to parse '%s'\n", location);
>       return NULL;
>     }
>@@ -382,17 +374,11 @@
> }
> 
> Package *
> get_package (const char *name)
> {
>-  return internal_get_package (name, TRUE, TRUE);
>-}
>-
>-Package *
>-get_package_quiet (const char *name)
>-{
>-  return internal_get_package (name, FALSE, TRUE);
>+  return internal_get_package (name, TRUE);
> }
> 
> static GSList*
> string_list_strip_duplicates (GSList *list)
> {

Actions: View | Splinter Review

Attachments on bug 5340: 4092 | 4093 | 4094 | 4095

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.