[mingw-webkitgtk3] Fix FTBFS caused by the changed pkg-config behavior in mingw-filesystem

[Erik van Pienbroek]

commit a8386566bca56af1330ad0dc2a432ca9c9b7852e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Jun 3 23:59:07 2013 +0200

    Fix FTBFS caused by the changed pkg-config behavior in mingw-filesystem

 mingw-webkitgtk3.spec                              |   10 ++++-
 ...ONFIG-env-variable-when-generating-gtkdoc.patch |   44 ++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/mingw-webkitgtk3.spec b/mingw-webkitgtk3.spec
index 76ed181..d4ce694 100644
--- a/mingw-webkitgtk3.spec
+++ b/mingw-webkitgtk3.spec
@@ -12,7 +12,7 @@
 
 Name:           mingw-webkitgtk3
 Version:        2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -30,6 +30,10 @@ Patch4:         webkitgtk-harfbuzz-cast.patch
 Patch7:         webkitgtk-jit-win64.patch
 #https://bugs.webkit.org/show_bug.cgi?id=114580
 Patch8:         webkitgtk-jit-mingw.patch
+# https://bugs.webkit.org/show_bug.cgi?id=117168
+# Don't use a hardcoded 'pkg-config', but respect
+# the environment variable PKG_CONFIG if it is set
+Patch9:         webkitgtk-respect-PKG_CONFIG-env-variable-when-generating-gtkdoc.patch
 
 BuildArch:      noarch
 
@@ -124,6 +128,7 @@ This is the MinGW port of WebKitGTK+ for GTK+ 3.
 %patch4 -p1 -b .harfbuzz-cast
 %patch7 -p1 -b .jit-win64
 %patch8 -p1 -b .jit-mingw
+%patch9 -p1 -b .pkg_config
 
 autoreconf --verbose --install -I Source/autotools
 
@@ -210,6 +215,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sun Jun  2 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.2-2
+- Fix FTBFS caused by the changed pkg-config behavior in mingw-filesystem
+
 * Mon May 27 2013 Paweł Forysiuk <tuxator at o2.pl> - 2.0.2-1
 - Update to 2.0.2
 - Drop upstreamed patches
diff --git a/webkitgtk-respect-PKG_CONFIG-env-variable-when-generating-gtkdoc.patch b/webkitgtk-respect-PKG_CONFIG-env-variable-when-generating-gtkdoc.patch
new file mode 100644
index 0000000..c32439e
--- /dev/null
+++ b/webkitgtk-respect-PKG_CONFIG-env-variable-when-generating-gtkdoc.patch
@@ -0,0 +1,44 @@
+diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
+index f3d7f4b..abed56d 100644
+--- a/Tools/GNUmakefile.am
++++ b/Tools/GNUmakefile.am
+@@ -400,7 +400,7 @@ if ENABLE_WEBKIT2
+ 	  fi; \
+ 	fi
+ endif
+-	@$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
++	@$(AM_V_GEN) PKG_CONFIG=$(PKG_CONFIG) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
+ 
+ uninstall-local:
+ if ENABLE_WEBKIT1
+diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
+index 0cbccf1..1f80432 100644
+--- a/Tools/gtk/gtkdoc.py
++++ b/Tools/gtk/gtkdoc.py
+@@ -396,19 +396,21 @@
+     def __init__(self, pkg_config_path, args):
+         super(PkgConfigGTKDoc, self).__init__(args)
+ 
++        pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
++
+         if not os.path.exists(pkg_config_path):
+             raise Exception('Could not find pkg-config file at: %s'
+                             % pkg_config_path)
+ 
+-        self.cflags += " " + self._run_command(['pkg-config',
++        self.cflags += " " + self._run_command([pkg_config,
+                                                 pkg_config_path,
+                                                 '--cflags'], print_output=False)
+-        self.ldflags += " " + self._run_command(['pkg-config',
++        self.ldflags += " " + self._run_command([pkg_config,
+                                                 pkg_config_path,
+                                                 '--libs'], print_output=False)
+-        self.version = self._run_command(['pkg-config',
++        self.version = self._run_command([pkg_config,
+                                           pkg_config_path,
+                                           '--modversion'], print_output=False)
+-        self.prefix = self._run_command(['pkg-config',
++        self.prefix = self._run_command([pkg_config,
+                                          pkg_config_path,
+                                          '--variable=prefix'], print_output=False)
+