This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from ce7b36f CMakeLists.txt: fix Qml build emulation. new a6700da CMakeLists.txt: copy desktop file to package/metadata.desktop if USE_DESKTOP_FILE is enabled. new 2b59c3e debian/rules: select Ubuntu 16.04 (Xenial) as the first version to use the Plasma 5 code. new 4e193fd debian/rules: add USE_DESKTOP_FILE selector to support older systems. new bdc9e83 CMakeLists.txt: make sure to use the Qt5::... targets, older systems do not define a versionless alias, since this was only introduced for Qt-6-compatibility. new 3edb456 x2goplasmabindings.spec: update file list with Plasma 5 files. The 5 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 | 25 +++++++++++++++++++++++-- debian/changelog | 9 +++++++++ debian/rules | 12 ++++++++++-- x2goplasmabindings.spec | 9 +++++++++ 4 files changed, 51 insertions(+), 4 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 a6700da13c7f5881a557e9353f74bc946b61d03b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 04:38:36 2023 +0200 CMakeLists.txt: copy desktop file to package/metadata.desktop if USE_DESKTOP_FILE is enabled. Also make sure to clean it up again. --- CMakeLists.txt | 21 +++++++++++++++++++++ debian/changelog | 2 ++ 2 files changed, 23 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24c3cc2..6f39dbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ project(plasma_applet_org.x2go.plasmoid) option(USE_PLASMA5 "Build against KDE Plasma 5" OFF) +option (USE_DESKTOP_FILE "Create package/metadata.desktop for older KF5 versions" OFF) # Find the required Libaries if (USE_PLASMA5) @@ -205,6 +206,26 @@ if (USE_PLASMA5) ) endif (NOT BUILD_SHARED_LIBS) endif (HAVE_ECMQMLMODULE) + + add_custom_target (CopyDesktopFile) + add_custom_command ( + TARGET CopyDesktopFile + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + "${CMAKE_SOURCE_DIR}/plasma-applet-org.x2go.plasmoid.desktop" + "${CMAKE_SOURCE_DIR}/package/metadata.desktop" + ) + add_custom_target (CleanDesktopFile) + add_custom_command ( + TARGET CleanDesktopFile + PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E remove + "${CMAKE_SOURCE_DIR}/package/metadata.desktop" + ) + if (USE_DESKTOP_FILE) + add_dependencies (ALL CopyDesktopFile) + add_dependencies (CLEAN CleanDesktopFile) + endif (USE_DESKTOP_FILE) else (USE_PLASMA5) kde4_add_plugin( org.x2go.plasmoid diff --git a/debian/changelog b/debian/changelog index 96680b6..585ebe4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium its behavior for older platforms. - CMakeLists.txt: whitespace only. - CMakeLists.txt: fix Qml build emulation. + - CMakeLists.txt: copy desktop file to package/metadata.desktop if + USE_DESKTOP_FILE is enabled. Also make sure to clean it up again. * 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 2b59c3e38948f93808425393610c03bb1e95fe26 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 05:23:54 2023 +0200 debian/rules: select Ubuntu 16.04 (Xenial) as the first version to use the Plasma 5 code. --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 585ebe4..bdc6b2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Add Plasma 4/5 bridge based on distro version and pass down to build system. + Fix override_dh_auto_configure rule/dh_auto_configure call. + + Select Ubuntu 16.04 (Xenial) as the first version to use the Plasma 5 + code. * debian/copyright: + Add information for x2goplasmoidkf5.cpp, which is GPL-3.0-only. + Add information for package/contents/ui/main.qml. diff --git a/debian/rules b/debian/rules index 173981f..f552160 100755 --- a/debian/rules +++ b/debian/rules @@ -95,7 +95,7 @@ else # USE_PLASMA5 = ON # endif #else - ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 20 )) && echo '"'"'yes'"'"),yes) + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo '"'"'yes'"'"),yes) USE_PLASMA5 = ON endif endif -- 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 4e193fd5b3a02d9b0e98f80dbe4f43d35a38e243 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 05:24:52 2023 +0200 debian/rules: add USE_DESKTOP_FILE selector to support older systems. --- debian/changelog | 1 + debian/rules | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bdc6b2f..21e0b79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Fix override_dh_auto_configure rule/dh_auto_configure call. + Select Ubuntu 16.04 (Xenial) as the first version to use the Plasma 5 code. + + Add USE_DESKTOP_FILE selector to support older systems. * debian/copyright: + Add information for x2goplasmoidkf5.cpp, which is GPL-3.0-only. + Add information for package/contents/ui/main.qml. diff --git a/debian/rules b/debian/rules index f552160..6171413 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,7 @@ VENDOR_DEBIAN := VENDOR_UBUNTU := USE_PLASMA5 := OFF +USE_DESKTOP_FILE := OFF # Setting these disables autodetection. FORCE_VENDOR ?= @@ -86,6 +87,10 @@ ifeq ($(VENDOR_DEBIAN),yes) ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 10 )) && echo '"'"'yes'"'"),yes) USE_PLASMA5 = ON endif +ifeq ($(VENDOR_DEBIAN),yes) + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) < 12 )) && echo '"'"'yes'"'"),yes) + USE_DESKTOP_FILE = ON + endif else ifeq ($(VENDOR_UBUNTU),yes) # Example of how to use major and minor as a selector, we currently won't need @@ -98,6 +103,9 @@ else ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo '"'"'yes'"'"),yes) USE_PLASMA5 = ON endif + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) < 21 )) && echo '"'"'yes'"'"),yes) + USE_DESKTOP_FILE = ON + endif endif endif @@ -105,4 +113,4 @@ endif dh $@ override_dh_auto_configure: - dh_auto_configure -- -DUSE_PLASMA5=$(USE_PLASMA5) + dh_auto_configure -- -DUSE_PLASMA5=$(USE_PLASMA5) -DUSE_DESKTOPFILE=$(USE_DESKTOP_FILE) -- 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 bdc9e831ca126a184c64b76b52c121c8180e461b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 05:44:31 2023 +0200 CMakeLists.txt: make sure to use the Qt5::... targets, older systems do not define a versionless alias, since this was only introduced for Qt-6-compatibility. --- CMakeLists.txt | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f39dbc..f66e72a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,8 +103,8 @@ if (USE_PLASMA5) ) target_link_libraries ( X2GoPlasmoidPlugin - Qt::Core - Qt::Qml + Qt5::Core + Qt5::Qml ) if (HAVE_ECMQMLMODULE) ecm_finalize_qml_module ( diff --git a/debian/changelog b/debian/changelog index 21e0b79..d8d0a7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,9 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - CMakeLists.txt: fix Qml build emulation. - CMakeLists.txt: copy desktop file to package/metadata.desktop if USE_DESKTOP_FILE is enabled. Also make sure to clean it up again. + - CMakeLists.txt: make sure to use the Qt5::... targets, older systems do + not define a versionless alias, since this was only introduced for + Qt-6-compatibility. * 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 3edb456aa7d99873dcc12e3ec09788c8281d59c0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 05:54:44 2023 +0200 x2goplasmabindings.spec: update file list with Plasma 5 files. --- debian/changelog | 1 + x2goplasmabindings.spec | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index d8d0a7a..bfcff0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Add BRs on kf5umbrella for *SuSE-based systems and kf5-rpm-macros for RedHat-based systems to get ECMQmlModule support. + Fix Plasma 5 detection on OpenSuSE Tumbleweed. + + Update file list with Plasma 5 files. * debian/control: + Adapt description to also mention KDE 5. + Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec index d37bac7..0f66956 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -155,10 +155,19 @@ fi %endif %doc debian/changelog %doc debian/copyright +%if 0%{?plasma5} +%dir %{_libdir}/qt5/qml/org +%dir %{_libdir}/qt5/qml/org/x2go +%dir %{_libdir}/qt5/qml/org/x2go/plasmoid +%{_libdir}/qt5/qml/org/x2go/plasmoid/libX2GoPlasmoidPlugin.so +%{_datadir}/plasma/plasmoids/org.x2go.plasmoid +%{_datadir}/metainfo/org.x2go.plasmoid.appdata.xml +%else %dir %{_libdir}/kde4 %{_libdir}/kde4/* %dir %{_datadir}/kde4/services %{_datadir}/kde4/services/* +%endif %{_datadir}/icons/* %{_datadir}/locale/*/LC_MESSAGES/*.mo -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
-
git-admin＠x2go.org