commit 98e94725ba873e165f95a2ab830a5fe56b5f5230 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Feb 1 00:18:28 2018 +1100 webkitgtk: fix for enchant diff --git a/webkitgtk/.md5sum b/webkitgtk/.md5sum index a7676f19..c44994f2 100644 --- a/webkitgtk/.md5sum +++ b/webkitgtk/.md5sum @@ -1 +1,2 @@ +6700854d41a714c73085242af39f1f5a enchant-2.patch c1a548595135ee75ad3bf2e18ac83112 webkitgtk-2.18.6.tar.xz diff --git a/webkitgtk/.signature b/webkitgtk/.signature index de46d114..b72c7731 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+WmAKCXnIrSbxEHxVFpkkMW4qasAPGmM9Ih/ozaDkCOKydkARPP/6YtZl8jpkNZNYEScaAitd5/hbg9vhhQJQY= -SHA256 (Pkgfile) = b192eb16542f778a7133a7085934a3627710fc28694da67b270e7d50ebb68c0b +RWSagIOpLGJF3zXVJa44XuVC2C4zRbyuY2FPOeyzt69LMc9TVSHv0Z1ld5O2u2iUu8epb13QGeT/0uB6I9mKRUoeeAnrW4Cf+ws= +SHA256 (Pkgfile) = a4d83ff7419519adc216d2145eed6a0a184f96d059ed246d17dc5760289127bd SHA256 (.footprint) = 1d9c6cf7142a7529f10c7c50357b251bc87d149bc80203309a3f3ddd5d4400d7 SHA256 (webkitgtk-2.18.6.tar.xz) = 93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c +SHA256 (enchant-2.patch) = ed8e5fe614ed800da3caccb8162bdd2d8dbd5a69ab90d426b34e124dee5cf1b6 diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index 718f0456..c64ac254 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -7,12 +7,15 @@ name=webkitgtk version=2.18.6 release=1 -source=(https://webkitgtk.org/releases/$name-$version.tar.xz) +source=(https://webkitgtk.org/releases/$name-$version.tar.xz + enchant-2.patch) build() { mkdir build cd $name-$version + patch -p1 -i $SRC/enchant-2.patch + # setting CC and CXX breaks compilation if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then unset CC CXX diff --git a/webkitgtk/enchant-2.patch b/webkitgtk/enchant-2.patch new file mode 100644 index 00000000..93c98828 --- /dev/null +++ b/webkitgtk/enchant-2.patch @@ -0,0 +1,21 @@ +diff -u -r webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake +--- webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake 2017-08-09 11:13:53.000000000 +0200 ++++ webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake 2018-01-18 10:06:07.127310881 +0100 +@@ -28,7 +28,7 @@ + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + find_package(PkgConfig) +-pkg_check_modules(PC_ENCHANT enchant) ++pkg_check_modules(PC_ENCHANT enchant-2) + + find_path(ENCHANT_INCLUDE_DIRS + NAMES enchant.h +@@ -37,7 +37,7 @@ + ) + + find_library(ENCHANT_LIBRARIES +- NAMES enchant ++ NAMES enchant-2 + PATHS ${PC_ENCHANT_LIBDIR} + ${PC_ENCHANT_LIBRARY_DIRS} + )