Attachment 340068 Details for Bug 185468 – Patch for landing

[patch] Patch for landing

wk-gtk-doc-install.diff (text/plain), 1.77 KB, created by Carlos Garcia Campos on 2018-05-09 23:03:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2018-05-09 23:03:34 PDT

Size: 1.77 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index e2e04d1a419..7c71b33c6f6 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-09  Jan Alexander Steffens  <jan.steffens@gmail.com>
>+
>+        [GTK] gtk-doc installation subdir duplicated
>+        https://bugs.webkit.org/show_bug.cgi?id=185468
>+
>+        Reviewed by Carlos Garcia Campos.
>+
>+        The GTK docs are installed into a duplicated subdir,
>+        e.g. /usr/share/doc/gtk-doc/html/webkit2gtk-4.0/webkit2gtk-4.0.
>+
>+        * Source/PlatformGTK.cmake:
>+
> 2018-05-09  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed. Bump WPE soname for good measure.
>diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
>index b8527ca2c2c..28841c20e98 100644
>--- a/Source/PlatformGTK.cmake
>+++ b/Source/PlatformGTK.cmake
>@@ -15,13 +15,13 @@ list(APPEND DocumentationDependencies
> 
> if (ENABLE_GTKDOC)
>     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_VERSION}/html/webkit2gtk-${WEBKITGTK_API_VERSION}
>-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkit2gtk-${WEBKITGTK_API_VERSION}"
>+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>     )
>     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_VERSION}
>-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkitdomgtk-${WEBKITGTK_API_VERSION}"
>+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>     )
>     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_VERSION}/html/jsc-glib-${WEBKITGTK_API_VERSION}
>-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/jsc-glib-${WEBKITGTK_API_VERSION}"
>+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
>     )
> endif ()
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185468: 339950 | 340068