main/pkgconf: add a regression fix against gtkmm

1 files changed, 41 insertions, 0 deletions

diff --git a/main/pkgconf/variable.patch b/main/pkgconf/variable.patch
new file mode 100644
index 0000000000..6c26dc6edc
--- /dev/null
+++ b/main/pkgconf/variable.patch
@@ -0,0 +1,41 @@
+From 30c35b709627d8fd73f86033f4c7845ad5937c12 Mon Sep 17 00:00:00 2001
+From: William Pitcock <nenolod@dereferenced.org>
+Date: Sat, 1 Apr 2017 18:30:12 -0500
+Subject: [PATCH] main: re-enable --variable pkg-config bug emulation because
+ downstreams take advantage of it
+
+---
+ main.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index 31693e5..35a4854 100644
+--- a/main.c
++++ b/main.c
+@@ -337,7 +337,7 @@ print_variable(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *variabl
+ 
+ 	var = pkgconf_tuple_find(client, &pkg->vars, variable);
+ 	if (var != NULL)
+-		printf("%s\n", var);
++		printf("%s", var);
+ }
+ 
+ static bool
+@@ -352,11 +352,17 @@ apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, i
+ 		pkgconf_dependency_t *dep = iter->data;
+ 
+ 		pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
++
++		if (iter->prev != NULL)
++			printf(" ");
++
+ 		print_variable(client, pkg, variable);
+ 
+ 		pkgconf_pkg_free(&pkg_client, pkg);
+ 	}
+ 
++	printf("\n");
++
+ 	return true;
+ }
+