[plasma-browser-integration] /: cmake: Don't install chrome manifest to ubuntu specific location

Bhushan Shah null at kde.org
Wed May 16 09:36:04 BST 2018


Git commit 9d6056c5e6ca531869cbd924b0b3d89a184ad3ca by Bhushan Shah.
Committed on 16/05/2018 at 08:35.
Pushed by bshah into branch 'master'.

cmake: Don't install chrome manifest to ubuntu specific location

Ubuntu patches their chromium to have extension path to be
chromium-browser/extensions instead of chromium/extensions for whatever
reasons. This doesn't work with anything !ubuntu.

So code here is adjusted to match what upstream does for now, ubuntu
needs to manually patch this out OR devise a packaging level solution as
we can't keep packaging workarounds in upstream repository.

BUG: 393846

Reviewed-by: kbroulik

CCMAIL: distributions at kde.org
CCMAIL: kde-distro-packagers at kde.org

M  +4    -1    CMakeLists.txt

https://commits.kde.org/plasma-browser-integration/9d6056c5e6ca531869cbd924b0b3d89a184ad3ca

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e12dea..4cee747 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,10 @@ if (INSTALL_CHROME_MANIFEST) # Install a policy to have browsers automatically a
     # google-chrome
     install(FILES chrome_install_from_store_policy DESTINATION ${KDE_INSTALL_DATADIR}/google-chrome/extensions RENAME ${CHROME_EXTENSION_ID}.json)
     # chromium
-    install(FILES chrome_install_from_store_policy DESTINATION ${KDE_INSTALL_DATADIR}/chromium-browser/extensions RENAME ${CHROME_EXTENSION_ID}.json)
+    # in ubuntu and derivatives, this should be installed in the chromium-browser/extensions,
+    # but since this is distribution specific path, let's use what upstream uses
+    # ideally ubuntu and derivatives should patch this in their packaging
+    install(FILES chrome_install_from_store_policy DESTINATION ${KDE_INSTALL_DATADIR}/chromium/extensions RENAME ${CHROME_EXTENSION_ID}.json)
 endif()
 
 # TODO firefox



More information about the Distributions mailing list