From a3ee85330c1abfbe32226b5baf9c7c179bbd3399 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 15 May 2018 16:51:16 +0300 Subject: [PATCH] khtml: fix build and plugin install path --- kde-frameworks/khtml/khtml-5.46.0.recipe | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/kde-frameworks/khtml/khtml-5.46.0.recipe b/kde-frameworks/khtml/khtml-5.46.0.recipe index 6528618bc..cf102e0bc 100644 --- a/kde-frameworks/khtml/khtml-5.46.0.recipe +++ b/kde-frameworks/khtml/khtml-5.46.0.recipe @@ -6,7 +6,7 @@ LICENSE=" GNU GPL v3 GNU LGPL v2 " -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/KDE/khtml/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="f97b97bb0f3ac4d3c63d6028d4f8a9061a4bf578ec3d39d5e43a1fa77f7f155c" @@ -125,6 +125,11 @@ BUILD_PREREQUIRES=" cmd:python2 " +GLOBAL_WRITABLE_FILES=" + settings/xdg/khtmlrc keep-old + settings/xdg/khtml.categories keep-old + " + BUILD() { mkdir -p build @@ -132,14 +137,11 @@ BUILD() cmake .. $cmakeDirArgs \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 make $jobArgs } -GLOBAL_WRITABLE_FILES=" - settings/xdg/khtmlrc keep-old - " - INSTALL() { cd build