commit: d26b8d9cccf22e147a59499cc0a0b1f68196422c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue May 29 23:03:57 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue May 29 23:03:57 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d26b8d9c
kde-plasma/plasma-browser-integration: Fix Mozilla dir Upstream commit 9a4e032c04fd567a3b3a5d2e050a22abd689d575 Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com> Closes: https://bugs.gentoo.org/656532 Package-Manager: Portage-2.3.40, Repoman-2.3.9 ...rowser-integration-5.12.90-respect-libdir.patch | 35 ++++++++++++++++++++++ ...> plasma-browser-integration-5.12.90-r1.ebuild} | 16 ++++++++-- .../plasma-browser-integration-5.13.49.9999.ebuild | 14 +++++++-- .../plasma-browser-integration-9999.ebuild | 14 +++++++-- 4 files changed, 70 insertions(+), 9 deletions(-) diff --git a/kde-plasma/plasma-browser-integration/files/plasma-browser-integration-5.12.90-respect-libdir.patch b/kde-plasma/plasma-browser-integration/files/plasma-browser-integration-5.12.90-respect-libdir.patch new file mode 100644 index 0000000000..20f3dacac7 --- /dev/null +++ b/kde-plasma/plasma-browser-integration/files/plasma-browser-integration-5.12.90-respect-libdir.patch @@ -0,0 +1,35 @@ +From f3ffa37d89816d3d9f1e9c5bb83b5e4acbbc295b Mon Sep 17 00:00:00 2001 +From: Arfrever Frehtes Taifersar Arahesis <[email protected]> +Date: Tue, 29 May 2018 09:21:41 +0200 +Subject: [PATCH] Respect libdir for Firefox native messaging host manifest + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a14b60..184b288 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,6 +45,9 @@ add_feature_info(CHROMIUM_EXTENSIONS_DIR On "Directory name to install Chromium + 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") ++add_feature_info(MOZILLA_DIR On "Mozilla directory is '${MOZILLA_DIR}'") ++ + add_subdirectory(host) + add_subdirectory(tabsrunner) + add_subdirectory(reminder) +@@ -66,7 +69,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.chrome_integration.json + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.chrome_integration.json DESTINATION ${KDE_INSTALL_FULL_SYSCONFDIR}/opt/chrome/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json) + # firefox + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integration.json DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/mozilla/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integration.json DESTINATION ${MOZILLA_DIR}/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json) + + if (COPY_MESSAGING_HOST_FILE_HOME) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integration.json DESTINATION $ENV{HOME}/.mozilla/native-messaging-hosts/ RENAME org.kde.plasma.browser_integration.json) +-- +2.17.0 + diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.12.90.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.12.90-r1.ebuild similarity index 80% rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.12.90.ebuild rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.12.90-r1.ebuild index f48f91d786..1739d8a1f2 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.12.90.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.12.90-r1.ebuild @@ -13,9 +13,6 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=" - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) $(add_frameworks_dep kactivities) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -25,5 +22,18 @@ DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep krunner) $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-respect-libdir.patch" ) + +src_configure() { + local mycmakeargs=( + -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" + ) + + kde5_src_configure +} diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.49.9999.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.49.9999.ebuild index 340f87b871..e6c1dca804 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.49.9999.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.49.9999.ebuild @@ -12,9 +12,6 @@ LICENSE="GPL-3+" IUSE="" DEPEND=" - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) $(add_frameworks_dep kactivities) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -24,5 +21,16 @@ DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep krunner) $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" + ) + + kde5_src_configure +} diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild index 340f87b871..e6c1dca804 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild @@ -12,9 +12,6 @@ LICENSE="GPL-3+" IUSE="" DEPEND=" - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) $(add_frameworks_dep kactivities) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -24,5 +21,16 @@ DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep krunner) $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" + ) + + kde5_src_configure +}
