This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from 271f301 CMakeLists.txt: actually fix the issue by moving the code below the invocation of plasma_install_package (). new fb3dc18 package/metadata.json: add X-Plasma keys to make the QML stuff work. new 57ffff5 package/metadata.json: bump version to 1.0. This seems to be the minimum version for QML plasmoids. new abd1bb7 CMakeLists.txt: also add the X-Plasma keys the metadata.desktop file we use for older operating systems. new 4dd8a73 debian/control: very old Ubuntu versions didn't have libkf5plasma-dev, but plasma-framework-dev, so try to add this as an alternative before falling back to kdelibs5-dev. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt | 26 ++++++++++++++++++++++++-- debian/changelog | 8 ++++++++ debian/control | 2 +- package/metadata.json | 8 ++++++-- 4 files changed, 39 insertions(+), 5 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 57ffff54b6c55864383559845407e2ecd505d9e2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 13 19:56:09 2023 +0200 package/metadata.json: bump version to 1.0. This seems to be the minimum version for QML plasmoids. --- debian/changelog | 2 ++ package/metadata.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cbceac..8cccba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium for is only available after this macro has executed, so what we want to do must also be done after calling it. - package/metadata.json: add X-Plasma keys to make the QML stuff work. + - package/metadata.json: bump version to 1.0. This seems to be the minimum + version for QML plasmoids. * x2goplasmabindings.spec: + Prepare for Plasma 5 support. + Stop duplicating Group tag. diff --git a/package/metadata.json b/package/metadata.json index db16b1c..1e7c8ba 100644 --- a/package/metadata.json +++ b/package/metadata.json @@ -98,7 +98,7 @@ "ServiceTypes": [ "Plasma/Applet" ], - "Version": "0.1", + "Version": "1.0", "Website": "https://www.x2go.org" }, "X-Plasma-API": "declarativeappletscript", -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit fb3dc180304f6a21fdb7c64c5b71b9e162207616 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 13 19:55:35 2023 +0200 package/metadata.json: add X-Plasma keys to make the QML stuff work. --- debian/changelog | 1 + package/metadata.json | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a2d120d..9cbceac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium the invocation of plasma_install_package (). The target we're checking for is only available after this macro has executed, so what we want to do must also be done after calling it. + - package/metadata.json: add X-Plasma keys to make the QML stuff work. * x2goplasmabindings.spec: + Prepare for Plasma 5 support. + Stop duplicating Group tag. diff --git a/package/metadata.json b/package/metadata.json index 8d41ff6..db16b1c 100644 --- a/package/metadata.json +++ b/package/metadata.json @@ -100,5 +100,9 @@ ], "Version": "0.1", "Website": "https://www.x2go.org" - } + }, + "X-Plasma-API": "declarativeappletscript", + "X-Plasma-MainScript": "ui/main.qml", + "X-Plasma-NotificationArea": "true", + "X-Plasma-NotificationAreaCategory": "ApplicationStatus" } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit abd1bb7446e3177106fe7e769fbabcd425fe6120 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 13 21:34:44 2023 +0200 CMakeLists.txt: also add the X-Plasma keys the metadata.desktop file we use for older operating systems. --- CMakeLists.txt | 26 ++++++++++++++++++++++++-- debian/changelog | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b632016..3c42eb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,13 +208,35 @@ if (USE_PLASMA5) endif (HAVE_ECMQMLMODULE) if (USE_DESKTOP_FILE) + set (x_plasma_qml_ "X-Plasma-API=declarativeappletscript\n") + string (APPEND x_plasma_qml_ "X-Plasma-MainScript=ui/main.qml\n") + string (APPEND x_plasma_qml_ "X-Plasma-NotificationArea=true\n") + string (APPEND x_plasma_qml_ + "X-Plasma-NotificationAreaCategory=ApplicationStatus\n" + ) + file (READ + "${CMAKE_SOURCE_DIR}/plasma-applet-org.x2go.plasmoid.desktop" + plasmoid_desktop_file_content_ + ) + string (APPEND plasmoid_desktop_file_content_ + "${x_plasma_qml_}" + ) + file (WRITE + "${CMAKE_CURRENT_BINARY_DIR}/metadata-generated.desktop.in" + "${plasmoid_desktop_file_content_}" + ) + configure_file ( + "${CMAKE_CURRENT_BINARY_DIR}/metadata-generated.desktop.in" + "${CMAKE_CURRENT_BINARY_DIR}/metadata-generated.desktop" + COPYONLY + ) add_custom_target ( CopyDesktopFile ALL BYPRODUCTS "${CMAKE_SOURCE_DIR}/package/metadata.desktop" - COMMENT "Copying plasma-applet-org.x2go.plasmoid.desktop to package/metadata.desktop." + COMMENT "Copying metadata-generated.desktop to package/metadata.desktop." COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_SOURCE_DIR}/plasma-applet-org.x2go.plasmoid.desktop" + "${CMAKE_CURRENT_BINARY_DIR}/metadata-generated.desktop" "${CMAKE_SOURCE_DIR}/package/metadata.desktop" VERBATIM ) diff --git a/debian/changelog b/debian/changelog index 8cccba0..6b35fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - package/metadata.json: add X-Plasma keys to make the QML stuff work. - package/metadata.json: bump version to 1.0. This seems to be the minimum version for QML plasmoids. + - CMakeLists.txt: also add the X-Plasma keys the metadata.desktop file we + use for older operating systems. * x2goplasmabindings.spec: + Prepare for Plasma 5 support. + Stop duplicating Group tag. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 4dd8a736873969b809601381a0fab53d14c91c2d Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 13 21:43:08 2023 +0200 debian/control: very old Ubuntu versions didn't have libkf5plasma-dev, but plasma-framework-dev, so try to add this as an alternative before falling back to kdelibs5-dev. --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6b35fcb..ed38535 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,9 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Add BD for qtdeclarative5-dev and qtbase5-dev or qtbase5-gles-dev. + Add BD for extra-cmake-modules for ECMQmlModule support. + Make extra-cmake-modules a noop for older systems that do not have it. + + Very old Ubuntu versions didn't have libkf5plasma-dev, but + plasma-framework-dev, so try to add this as an alternative before + falling back to kdelibs5-dev. * debian/rules: + Add Plasma 4/5 bridge based on distro version and pass down to build system. diff --git a/debian/control b/debian/control index e379ce5..a5acd8a 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: lsb-release, cmake, libkf5i18n-dev | kdelibs5-dev, - libkf5plasma-dev | kdelibs5-dev, + libkf5plasma-dev | plasma-framework-dev | kdelibs5-dev, qtdeclarative5-dev, qtbase5-dev | qtbase5-gles-dev, extra-cmake-modules | kdelibs5-dev, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
-
git-admin＠x2go.org