This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from 5c7d684 CMakeLists.txt: whitespace only. new 4d43439 debian/control: make extra-cmake-modules a noop for older systems that do not have it. new ce7b36f CMakeLists.txt: fix Qml build emulation. The 2 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 | 4 ++-- debian/changelog | 2 ++ debian/control | 2 +- 3 files changed, 5 insertions(+), 3 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 4d434392d2000c531929ac17d63f9e0c802647ed Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 01:37:44 2023 +0200 debian/control: make extra-cmake-modules a noop for older systems that do not have it. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4623cbb..099bb69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Pull in lsb-release as BD, needed for debian/rules. + 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. * 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 121c8d1..e379ce5 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: libkf5plasma-dev | kdelibs5-dev, qtdeclarative5-dev, qtbase5-dev | qtbase5-gles-dev, - extra-cmake-modules + extra-cmake-modules | kdelibs5-dev, Standards-Version: 3.9.5 Homepage: https://code.x2go.org/releases/source/x2goplasmabindings Vcs-Git: git://code.x2g.org/x2goplasmabindings.git -- 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 ce7b36f0ab456f1c64b60acefd8f28001c27db1b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 02:05:03 2023 +0200 CMakeLists.txt: fix Qml build emulation. --- CMakeLists.txt | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b5f361..24c3cc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,7 +177,7 @@ if (USE_PLASMA5) ) install ( - FILES ${plugin_path_} + FILES ${qmldir_path_} DESTINATION ${KDE_INSTALL_QMLDIR}/${plugin_path_} RENAME "qmldir" @@ -187,7 +187,7 @@ if (USE_PLASMA5) TARGET X2GoPlasmoidPlugin POST_BUILD WORKING_DIRECTORY ${runtime_output_dir_} - COMMAND ${CMAKE_COMMAND} -E copy ${plugin_path_} + COMMAND ${CMAKE_COMMAND} -E copy ${qmldir_path_} ${plugin_path_}/qmldir ) diff --git a/debian/changelog b/debian/changelog index 099bb69..96680b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - CMakeLists.txt: detect if ECMQmlModule is available and, if not, emulate its behavior for older platforms. - CMakeLists.txt: whitespace only. + - CMakeLists.txt: fix Qml build emulation. * 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
-
git-admin＠x2go.org