summaryrefslogtreecommitdiff
path: root/pkg.c
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2012-05-18 08:40:38 -0700
committerDan Nicholson <dbn.lists@gmail.com>2012-05-21 21:08:49 -0700
commit7ac6f32625254a14180677694a0a98d333fc5813 (patch)
tree82ecf16d51173b58c2944dcfa3efc0e240503595 /pkg.c
parentb87359cc9b9039b30ab0f76b67fad52980b7913a (diff)
Don't use deprecated glib function to construct path on win32
g_win32_get_package_installation_subdirectory() has been deprecated since GLib 2.18 and in recent (2.31) GLib versions disabled entirely by default. This patch replaces usage of that function by g_win32_get_package_installation_directory_of_module() and g_build_filename(). Use the new functions and rework the code a bit so it leaks less memory. g_win32_get_package_installation_directory_of_module() is supported since GLib 2.16. The minimal GLib version is bumped accordingly. Freedesktop #45742
Diffstat (limited to 'pkg.c')
-rw-r--r--pkg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg.c b/pkg.c
index 728c27c..551b867 100644
--- a/pkg.c
+++ b/pkg.c
@@ -240,7 +240,7 @@ add_virtual_pkgconfig_package (void)
if (pkg->vars == NULL)
pkg->vars = g_hash_table_new (g_str_hash, g_str_equal);
- g_hash_table_insert (pkg->vars, "pc_path", PKG_CONFIG_PC_PATH);
+ g_hash_table_insert (pkg->vars, "pc_path", pkg_config_pc_path);
debug_spew ("Adding virtual 'pkg-config' package to list of known packages\n");
g_hash_table_insert (packages, pkg->key, pkg);