diff options
4 files changed, 16 insertions, 2 deletions
diff --git a/kde/build/plasma-browser-integration b/kde/build/plasma-browser-integration new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/plasma-browser-integration @@ -0,0 +1 @@ +2 diff --git a/kde/cmake/plasma-browser-integration b/kde/cmake/plasma-browser-integration index 7e9e3b2..c9b3db9 100644 --- a/kde/cmake/plasma-browser-integration +++ b/kde/cmake/plasma-browser-integration @@ -15,10 +15,9 @@ cd build -DKDE_INSTALL_MANDIR=/usr/man \ -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ + -DKDE_INSTALL_SYSCONFDIR=/etc \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ - -DHAVE_SHADOW=TRUE \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ -DINSTALL_CHROME_MANIFEST=ON \ .. diff --git a/kde/patch/plasma-browser-integration.patch b/kde/patch/plasma-browser-integration.patch new file mode 100644 index 0000000..c82fee9 --- /dev/null +++ b/kde/patch/plasma-browser-integration.patch @@ -0,0 +1,3 @@ +# Fix hardcoded mozilla 'lib' libdir: +cat $CWD/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch b/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch new file mode 100644 index 0000000..c881edf --- /dev/null +++ b/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2018-06-07 22:22:27.000000000 +0800 ++++ b/CMakeLists.txt 2018-06-20 20:55:56.000000000 +0800 +@@ -45,7 +45,7 @@ + option(COPY_MESSAGING_HOST_FILE_HOME "Copy the native messaging hosts json file to user home dir" FALSE) + add_feature_info(COPY_MESSAGING_HOST_FILE_HOME ${COPY_MESSAGING_HOST_FILE_HOME} "Enable this option to copy the native messaging hosts json file to home dir if you install plasma-browser-integration to custom prefix (non-/usr)") + +-set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/lib/mozilla" CACHE STRING "Mozilla directory") ++set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}/mozilla" CACHE STRING "Mozilla directory") + add_feature_info(MOZILLA_DIR On "Mozilla directory is '${MOZILLA_DIR}'") + + add_subdirectory(host) |