diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD index de358c39b..3f421405b 100644 --- a/extra/webkit2gtk/PKGBUILD +++ b/extra/webkit2gtk/PKGBUILD @@ -8,7 +8,7 @@ highmem=1 pkgname=webkit2gtk -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="GTK+ Web content engine library" arch=(x86_64) @@ -22,16 +22,18 @@ optdepends=('gtk2: Netscape plugin support' 'gst-plugins-good: media decoding' 'gst-libav: nonfree media decoding') source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc} + gtk-doc.diff remove_atomics.patch) -sha256sums=('43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959' +sha256sums=('dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2' 'SKIP' + '4f116b4508d4501498d1e1483555bc5d4e3f5504c5a2f3ec6a21c646b874cdb4' 'd0a1469fdaa5d6f4ff7e498d26470224916b64a6dbe28ba7ad699c19da9ee9ab') validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3') prepare() { mkdir build cd webkitgtk-$pkgver - + patch -Np1 -i ../gtk-doc.diff sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then diff --git a/extra/webkit2gtk/gtk-doc.diff b/extra/webkit2gtk/gtk-doc.diff new file mode 100644 index 000000000..0295861a7 --- /dev/null +++ b/extra/webkit2gtk/gtk-doc.diff @@ -0,0 +1,16 @@ +diff -u -r webkitgtk-2.20.2/Source/PlatformGTK.cmake webkitgtk-2.20.2-doc/Source/PlatformGTK.cmake +--- webkitgtk-2.20.2/Source/PlatformGTK.cmake 2018-05-07 10:30:18.000000000 +0200 ++++ webkitgtk-2.20.2-doc/Source/PlatformGTK.cmake 2018-05-07 18:03:44.333500803 +0200 +@@ -15,10 +15,10 @@ + + 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" + ) + endif () +