Commit 14c2aa3c authored by Carlos Garcia Campos's avatar Carlos Garcia Campos

core-deps-3.14: WebKitGTK+ 2.5.3

Also remove the patch for 2.5.2 that is no longer needed.
parent f73bf625
......@@ -1338,10 +1338,9 @@
<cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
<branch repo="webkitgtk.org"
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"/>
module="webkitgtk-2.5.3.tar.xz" version="2.5.3"
hash="sha256:010803e371ac92a3e0e297e929978f83a9a3c597e4a10d50363fb1aaa6ea18d6"
size="10093908">
</branch>
<dependencies>
<dep package="at-spi2-core"/>
......
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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment