[jhbuild] 3.14: patch webkit to install gir properly

[Michael Catanzaro <mcatanzaro src gnome org>]

commit f73bf6250a04e751f94441e0529d36cf3825cddb
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Aug 14 21:42:01 2014 -0500

    3.14: patch webkit to install gir properly
    
    This lets us build gitg again, which was the only remaining module that
    was broken in the WebKit transition.

 modulesets/gnome-suites-core-deps-3.14.modules   |    1 +
 patches/webkit-2.5.2.gir-install-directory.patch |   56 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index ea51f2d..9dfae1e 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -1341,6 +1341,7 @@
             module="webkitgtk-2.5.2.tar.xz" version="2.5.2"
             hash="sha256:fe9ae532ad04617a478e8e0440ad52305a65577321263c724e8b4d24af047eca"
             size="10093268">
+      <patch file="webkit-2.5.2.gir-install-directory.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
diff --git a/patches/webkit-2.5.2.gir-install-directory.patch 
b/patches/webkit-2.5.2.gir-install-directory.patch
new file mode 100644
index 0000000..2d702b3
--- /dev/null
+++ b/patches/webkit-2.5.2.gir-install-directory.patch
@@ -0,0 +1,56 @@
+ 2014-08-14  Carlos Garcia Campos  <cgarcia igalia com>
+
+        [GTK] REGRESSION(r171598, CMake): Introspection files are installed at the wrong path
+        https://bugs.webkit.org/show_bug.cgi?id=135934
+
+        Reviewed by NOBODY (OOPS!).
+
+        Since r171598 gir files are installed under $datadir/webkitgtk-4.0/gir-1.0/.
+        The gir files should installed in $datadir/gir-1.0/ together with all other
+        gir files. We don't need to install introspection files in a versioned
+        directory because their filenames already contain the binary version. But before
+        r171598, the files were only installed to the right directory if the
+        gobject-instrospection pkg-config file was in the same prefix than the one we
+        wanted to install, because the gir and typelibs directories were extracted from
+        the pkg-config file. We should define INTROSPECTION_INSTALL_GIRDIR and
+        INTROSPECTION_INSTALL_TYPELIBDIR in OptionsGTK.cmake based on $datadir and $libdir
+        like we do in the autotools build.
+
+        * Source/cmake/FindGObjectIntrospection.cmake: Do not define
+        INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR.
+        * Source/cmake/OptionsGTK.cmake: Define
+        INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR.
+
+diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake
+index 0fb85f0..e1f49b4 100644
+--- a/Source/cmake/FindGObjectIntrospection.cmake
++++ b/Source/cmake/FindGObjectIntrospection.cmake
+@@ -44,8 +44,6 @@ if (PKG_CONFIG_FOUND)
+         _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate" "")
+         _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir" "")
+         _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir" "")
+-        _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_GIRDIR "girdir" 
"--define-variable=datadir=${DATA_INSTALL_DIR}")
+-        _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_TYPELIBDIR "typelibdir" 
"--define-variable=libdir=${LIB_INSTALL_DIR}")
+         set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
+         set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
+     endif ()
+@@ -59,6 +57,4 @@ mark_as_advanced(
+     INTROSPECTION_TYPELIBDIR
+     INTROSPECTION_CFLAGS
+     INTROSPECTION_LIBS
+-    INTROSPECTION_INSTALL_GIRDIR
+-    INTROSPECTION_INSTALL_TYPELIBDIR
+ )
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 352d71c..a336e72 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -25,6 +25,8 @@ set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkitgtk-${WEBKITGTK_
+ set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
+ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
+ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
++set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
++set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
+
+ find_package(Cairo 1.10.2 REQUIRED)
+ find_package(Fontconfig 2.8.0 REQUIRED)