commit: dd34bbdf7823be26904ce94c5bbf4064cb719f38
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 12:51:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 14:25:49 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd34bbdf
kde-plasma/plasma-browser-integration: Drop upstreamed patch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...rowser-integration-5.12.90-respect-libdir.patch | 35 ----------------------
1 file changed, 35 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
deleted file mode 100644
index 20f3dacac7..0000000000
---
a/kde-plasma/plasma-browser-integration/files/plasma-browser-integration-5.12.90-respect-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f3ffa37d89816d3d9f1e9c5bb83b5e4acbbc295b Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <arfrever....@gmail.com>
-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
-
