[kdeplasma-addons] applets: Revert "use plasma_install_bundled_package"
Friedrich W. H. Kossebau
null at kde.org
Sat Mar 24 14:07:26 UTC 2018
Git commit db0bc0e3116986850f9d6b304b739698caef39d6 by Friedrich W. H. Kossebau.
Committed on 24/03/2018 at 14:06.
Pushed by kossebau into branch 'master'.
Revert "use plasma_install_bundled_package"
This reverts commit c505a726b3f1fff95c382e46377b495016d04786.
Quoting David Edmundson from similar commit to plasma-workspace:
"
Concept is fine, but currently we have severe CMake issues as well
as a major containment loading bug.
When re-reverting we need to be sure to test with clean install prefixes.
"
CC: plasma-devel at kde.org
M +4 -4 applets/CMakeLists.txt
M +1 -1 applets/binary-clock/CMakeLists.txt
M +1 -1 applets/calculator/CMakeLists.txt
M +1 -1 applets/colorpicker/CMakeLists.txt
M +1 -1 applets/comic/CMakeLists.txt
M +1 -1 applets/dict/CMakeLists.txt
M +1 -1 applets/diskquota/CMakeLists.txt
M +1 -1 applets/fifteenPuzzle/CMakeLists.txt
M +1 -1 applets/fuzzy-clock/CMakeLists.txt
M +1 -1 applets/grouping/CMakeLists.txt
M +1 -1 applets/grouping/container/CMakeLists.txt
M +1 -1 applets/mediaframe/CMakeLists.txt
M +1 -1 applets/minimizeall/CMakeLists.txt
M +1 -1 applets/notes/CMakeLists.txt
M +1 -1 applets/quicklaunch/CMakeLists.txt
M +1 -1 applets/quickshare/CMakeLists.txt
M +1 -1 applets/showdesktop/CMakeLists.txt
M +1 -1 applets/systemloadviewer/CMakeLists.txt
M +1 -1 applets/timer/CMakeLists.txt
M +1 -1 applets/userswitcher/CMakeLists.txt
M +1 -1 applets/weather/CMakeLists.txt
M +1 -1 applets/webbrowser/CMakeLists.txt
https://commits.kde.org/kdeplasma-addons/db0bc0e3116986850f9d6b304b739698caef39d6
diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
index 4da44bb5a..e73be9008 100644
--- a/applets/CMakeLists.txt
+++ b/applets/CMakeLists.txt
@@ -1,7 +1,7 @@
-plasma_install_bundled_package(activitypager org.kde.plasma.activitypager)
-plasma_install_bundled_package(kickerdash org.kde.plasma.kickerdash)
-plasma_install_bundled_package(konsoleprofiles/package org.kde.plasma.konsoleprofiles)
-plasma_install_bundled_package(keyboardindicator org.kde.plasma.keyboardindicator)
+plasma_install_package(activitypager org.kde.plasma.activitypager)
+plasma_install_package(kickerdash org.kde.plasma.kickerdash)
+plasma_install_package(konsoleprofiles/package org.kde.plasma.konsoleprofiles)
+plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
add_subdirectory(binary-clock)
add_subdirectory(calculator)
diff --git a/applets/binary-clock/CMakeLists.txt b/applets/binary-clock/CMakeLists.txt
index 909178d4e..39cef05cb 100644
--- a/applets/binary-clock/CMakeLists.txt
+++ b/applets/binary-clock/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_bundled_package(package org.kde.plasma.binaryclock)
+plasma_install_package(package org.kde.plasma.binaryclock)
diff --git a/applets/calculator/CMakeLists.txt b/applets/calculator/CMakeLists.txt
index 25f0c7210..15d6d4f35 100644
--- a/applets/calculator/CMakeLists.txt
+++ b/applets/calculator/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_bundled_package(package org.kde.plasma.calculator)
+plasma_install_package(package org.kde.plasma.calculator)
diff --git a/applets/colorpicker/CMakeLists.txt b/applets/colorpicker/CMakeLists.txt
index fde98c750..c9ee88f89 100644
--- a/applets/colorpicker/CMakeLists.txt
+++ b/applets/colorpicker/CMakeLists.txt
@@ -1,6 +1,6 @@
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-plasma_install_bundled_package(package org.kde.plasma.colorpicker)
+plasma_install_package(package org.kde.plasma.colorpicker)
set(colorpickerplugin_SRCS
plugin/grabwidget.cpp
diff --git a/applets/comic/CMakeLists.txt b/applets/comic/CMakeLists.txt
index fb889d07f..58063c9cb 100644
--- a/applets/comic/CMakeLists.txt
+++ b/applets/comic/CMakeLists.txt
@@ -38,5 +38,5 @@ install(TARGETS plasma_applet_comic DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/
#install(FILES plasma-comic-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES comic.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-plasma_install_bundled_package(package org.kde.plasma.comic)
+plasma_install_package(package org.kde.plasma.comic)
diff --git a/applets/dict/CMakeLists.txt b/applets/dict/CMakeLists.txt
index 36bf7b9ae..d14e91149 100644
--- a/applets/dict/CMakeLists.txt
+++ b/applets/dict/CMakeLists.txt
@@ -10,7 +10,7 @@ if (Qt5WebEngine_FOUND)
#######################################################################################
# Package (metadata.desktop and QML)
-plasma_install_bundled_package(package org.kde.plasma_applet_dict)
+plasma_install_package(package org.kde.plasma_applet_dict)
#######################################################################################
# Icon for the package
diff --git a/applets/diskquota/CMakeLists.txt b/applets/diskquota/CMakeLists.txt
index a46cc6046..cb974949d 100644
--- a/applets/diskquota/CMakeLists.txt
+++ b/applets/diskquota/CMakeLists.txt
@@ -1,7 +1,7 @@
#######################################################################################
# Package
-plasma_install_bundled_package(package org.kde.plasma.diskquota)
+plasma_install_package(package org.kde.plasma.diskquota)
#######################################################################################
diff --git a/applets/fifteenPuzzle/CMakeLists.txt b/applets/fifteenPuzzle/CMakeLists.txt
index 84c2de6d8..6902b9767 100644
--- a/applets/fifteenPuzzle/CMakeLists.txt
+++ b/applets/fifteenPuzzle/CMakeLists.txt
@@ -3,7 +3,7 @@ ecm_install_icons(
DESTINATION ${KDE_INSTALL_ICONDIR}
)
-plasma_install_bundled_package(package org.kde.plasma.fifteenpuzzle)
+plasma_install_package(package org.kde.plasma.fifteenpuzzle)
set(fifteenpuzzleplugin_SRCS
plugin/fifteenimageprovider.cpp
diff --git a/applets/fuzzy-clock/CMakeLists.txt b/applets/fuzzy-clock/CMakeLists.txt
index 25c1ccca5..e78f2571a 100644
--- a/applets/fuzzy-clock/CMakeLists.txt
+++ b/applets/fuzzy-clock/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_bundled_package(package org.kde.plasma.fuzzyclock)
+plasma_install_package(package org.kde.plasma.fuzzyclock)
diff --git a/applets/grouping/CMakeLists.txt b/applets/grouping/CMakeLists.txt
index 8fdfcc7b8..fd81b82a1 100644
--- a/applets/grouping/CMakeLists.txt
+++ b/applets/grouping/CMakeLists.txt
@@ -1,6 +1,6 @@
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.private.grouping\")
-plasma_install_bundled_package(package org.kde.plasma.private.grouping)
+plasma_install_package(package org.kde.plasma.private.grouping)
ecm_qt_declare_logging_category(groupingplasmoid_SRCS HEADER debug.h
IDENTIFIER GROUPING_DEBUG
diff --git a/applets/grouping/container/CMakeLists.txt b/applets/grouping/container/CMakeLists.txt
index d9b9c9cf1..e171d3feb 100644
--- a/applets/grouping/container/CMakeLists.txt
+++ b/applets/grouping/container/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_bundled_package(package org.kde.plasma.grouping)
+plasma_install_package(package org.kde.plasma.grouping)
set(groupedappletscontainer_SRCS
groupedappletscontainer.cpp
diff --git a/applets/mediaframe/CMakeLists.txt b/applets/mediaframe/CMakeLists.txt
index b6a650fb6..95bc8053f 100644
--- a/applets/mediaframe/CMakeLists.txt
+++ b/applets/mediaframe/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_bundled_package(package org.kde.plasma.mediaframe)
+plasma_install_package(package org.kde.plasma.mediaframe)
set(mediaframeplugin_SRCS
plugin/mediaframe.cpp
diff --git a/applets/minimizeall/CMakeLists.txt b/applets/minimizeall/CMakeLists.txt
index b2b847468..28c07fd46 100644
--- a/applets/minimizeall/CMakeLists.txt
+++ b/applets/minimizeall/CMakeLists.txt
@@ -1,2 +1,2 @@
-plasma_install_bundled_package(package org.kde.plasma.minimizeall)
+plasma_install_package(package org.kde.plasma.minimizeall)
diff --git a/applets/notes/CMakeLists.txt b/applets/notes/CMakeLists.txt
index dc2e1f0cd..c8c3640c6 100644
--- a/applets/notes/CMakeLists.txt
+++ b/applets/notes/CMakeLists.txt
@@ -1,7 +1,7 @@
#######################################################################################
# Package
-plasma_install_bundled_package(package org.kde.plasma.notes)
+plasma_install_package(package org.kde.plasma.notes)
#######################################################################################
diff --git a/applets/quicklaunch/CMakeLists.txt b/applets/quicklaunch/CMakeLists.txt
index f50bde715..c765a629b 100644
--- a/applets/quicklaunch/CMakeLists.txt
+++ b/applets/quicklaunch/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(plugin)
-plasma_install_bundled_package(package org.kde.plasma.quicklaunch)
+plasma_install_package(package org.kde.plasma.quicklaunch)
diff --git a/applets/quickshare/CMakeLists.txt b/applets/quickshare/CMakeLists.txt
index 795ab7f88..0b4ffdf2f 100644
--- a/applets/quickshare/CMakeLists.txt
+++ b/applets/quickshare/CMakeLists.txt
@@ -1,2 +1,2 @@
-plasma_install_bundled_package(plasmoid org.kde.plasma.quickshare)
+plasma_install_package(plasmoid org.kde.plasma.quickshare)
add_subdirectory(plugin)
diff --git a/applets/showdesktop/CMakeLists.txt b/applets/showdesktop/CMakeLists.txt
index 82ffd8034..ca0915523 100644
--- a/applets/showdesktop/CMakeLists.txt
+++ b/applets/showdesktop/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_bundled_package(package org.kde.plasma.showdesktop)
+plasma_install_package(package org.kde.plasma.showdesktop)
add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_org.kde.plasma.showdesktop")
diff --git a/applets/systemloadviewer/CMakeLists.txt b/applets/systemloadviewer/CMakeLists.txt
index 8a7074a74..96e508955 100644
--- a/applets/systemloadviewer/CMakeLists.txt
+++ b/applets/systemloadviewer/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_bundled_package(package org.kde.plasma.systemloadviewer)
+plasma_install_package(package org.kde.plasma.systemloadviewer)
diff --git a/applets/timer/CMakeLists.txt b/applets/timer/CMakeLists.txt
index b616e0660..3813d7ecb 100644
--- a/applets/timer/CMakeLists.txt
+++ b/applets/timer/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_bundled_package(package org.kde.plasma.timer)
+plasma_install_package(package org.kde.plasma.timer)
add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_org.kde.plasma.timer")
diff --git a/applets/userswitcher/CMakeLists.txt b/applets/userswitcher/CMakeLists.txt
index 346afbd19..7cb90c9f2 100644
--- a/applets/userswitcher/CMakeLists.txt
+++ b/applets/userswitcher/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_bundled_package(package org.kde.plasma.userswitcher)
+plasma_install_package(package org.kde.plasma.userswitcher)
diff --git a/applets/weather/CMakeLists.txt b/applets/weather/CMakeLists.txt
index 69a665f56..7e6ec05ec 100644
--- a/applets/weather/CMakeLists.txt
+++ b/applets/weather/CMakeLists.txt
@@ -19,7 +19,7 @@ install(TARGETS plasma_applet_weather DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasm
install(FILES wind-arrows.svgz DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/default/weather/)
-plasma_install_bundled_package(package org.kde.plasma.weather)
+plasma_install_package(package org.kde.plasma.weather)
set(weather_SRCS
diff --git a/applets/webbrowser/CMakeLists.txt b/applets/webbrowser/CMakeLists.txt
index b3042caea..f214e041a 100644
--- a/applets/webbrowser/CMakeLists.txt
+++ b/applets/webbrowser/CMakeLists.txt
@@ -8,6 +8,6 @@ set_package_properties(Qt5WebEngine PROPERTIES
if (Qt5WebEngine_FOUND)
-plasma_install_bundled_package(package org.kde.plasma.webbrowser)
+plasma_install_package(package org.kde.plasma.webbrowser)
endif()
More information about the Plasma-devel
mailing list