This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from eb21968 debian/control: add BD for extra-cmake-modules for ECMQmlModule support. new b867282 x2goplasmoidkf5.cpp: fix moc include. new b1b3477 x2goplasmabindings.spec: fix Plasma 5 detection on OpenSuSE Tumbleweed. new bc32869 CMakeLists.txt: detect if ECMQmlModule is available and, if not, emulate its behavior for older platforms. new 5c7d684 CMakeLists.txt: whitespace only. 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 | 190 ++++++++++++++++++++++++++++++++++++++---------- debian/changelog | 5 ++ x2goplasmabindings.spec | 2 +- x2goplasmoidkf5.cpp | 2 +- 4 files changed, 157 insertions(+), 42 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 b1b3477e29a0af6025f68c60b2888e526a3202fd Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Aug 7 22:09:41 2023 +0200 x2goplasmabindings.spec: fix Plasma 5 detection on OpenSuSE Tumbleweed. --- debian/changelog | 1 + x2goplasmabindings.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d0007a7..4477bc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium %doc macros in %files section. + 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. * 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 0c13c3f..d37bac7 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -1,7 +1,7 @@ # Choose between KDE 4 and 5. %global plasma5 0 %if 0%{?suse_version} -%if 0%{?sle_version} >= 150300 +%if 0%{?sle_version} >= 150300 || 0%{?suse_version} > 1550 %global plasma5 1 %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 b8672828a364fa48e9deb1a62ad412312b0cf6f1 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Aug 7 21:30:28 2023 +0200 x2goplasmoidkf5.cpp: fix moc include. --- debian/changelog | 1 + x2goplasmoidkf5.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 79b9c54..d0007a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - package/contents/ui: add main.qml, also provided by Robert Tari. - CMakeLists.txt: rework building of org.x2go.plasmoid library in Plasma5 mode, based upon QML. + - x2goplasmoidkf5.cpp: fix moc include. * x2goplasmabindings.spec: + Prepare for Plasma 5 support. + Stop duplicating Group tag. diff --git a/x2goplasmoidkf5.cpp b/x2goplasmoidkf5.cpp index 35eed8b..7cb27e0 100644 --- a/x2goplasmoidkf5.cpp +++ b/x2goplasmoidkf5.cpp @@ -68,4 +68,4 @@ public: } }; -#include "x2go-plasmoid-plugin.moc" +#include "x2goplasmoidkf5.moc" -- 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 5c7d68479093c998924ee33f3a8de47c85ac5a07 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Aug 10 03:25:58 2023 +0200 CMakeLists.txt: whitespace only. --- CMakeLists.txt | 60 ++++++++++++++++++++++++++++---------------------------- debian/changelog | 1 + 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b347e22..4b5f361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,15 +206,15 @@ if (USE_PLASMA5) endif (NOT BUILD_SHARED_LIBS) endif (HAVE_ECMQMLMODULE) else (USE_PLASMA5) -kde4_add_plugin( - org.x2go.plasmoid - ${x2goplasmoid_SRCS} -) -target_link_libraries( - org.x2go.plasmoid - ${KDE4_PLASMA_LIBS} - ${KDE4_KDEUI_LIBS} -) + kde4_add_plugin( + org.x2go.plasmoid + ${x2goplasmoid_SRCS} + ) + target_link_libraries( + org.x2go.plasmoid + ${KDE4_PLASMA_LIBS} + ${KDE4_KDEUI_LIBS} + ) endif (USE_PLASMA5) @@ -223,28 +223,28 @@ add_subdirectory( ) if (USE_PLASMA5) -ecm_install_icons ( - ${ICON_INSTALL_DIR} -) + ecm_install_icons ( + ${ICON_INSTALL_DIR} + ) -plasma_install_package ( - "package" - "org.x2go.plasmoid" - "plasmoids" - "applet" -) + plasma_install_package ( + "package" + "org.x2go.plasmoid" + "plasmoids" + "applet" + ) else (USE_PLASMA5) -kde4_install_icons( - ${ICON_INSTALL_DIR} -) + kde4_install_icons( + ${ICON_INSTALL_DIR} + ) -install( - TARGETS org.x2go.plasmoid - DESTINATION ${PLUGIN_INSTALL_DIR} -) - -install( - FILES plasma-applet-org.x2go.plasmoid.desktop - DESTINATION ${SERVICES_INSTALL_DIR} -) + install( + TARGETS org.x2go.plasmoid + DESTINATION ${PLUGIN_INSTALL_DIR} + ) + + install( + FILES plasma-applet-org.x2go.plasmoid.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + ) endif (USE_PLASMA5) diff --git a/debian/changelog b/debian/changelog index 369c30f..4623cbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - x2goplasmoidkf5.cpp: fix moc include. - CMakeLists.txt: detect if ECMQmlModule is available and, if not, emulate its behavior for older platforms. + - CMakeLists.txt: whitespace only. * 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 bc32869240f6b6f763cbe53cfdcfb034ec56d885 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Aug 10 03:24:13 2023 +0200 CMakeLists.txt: detect if ECMQmlModule is available and, if not, emulate its behavior for older platforms. --- CMakeLists.txt | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++----- debian/changelog | 2 + 2 files changed, 122 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3368dd..b347e22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,14 @@ if (USE_PLASMA5) include (KDECompilerSettings NO_POLICY_SCOPE) include (FeatureSummary) include (ECMInstallIcons) - include (ECMQmlModule) + + # ECMQmlModule might not be available on all platforms. + set (ECMQmlModule_path "") + set (HAVE_ECMQMLMODULE FALSE) + include (ECMQmlModule OPTIONAL RESULT_VARIABLE ECMQmlModule_path) + if (NOT ECMQmlModule_path STREQUAL "NOTFOUND") + set (HAVE_ECMQMLMODULE TRUE) + endif (ECMQmlModule_path STREQUAL "NOTFOUND") find_package ( KF5 REQUIRED COMPONENTS @@ -79,22 +86,125 @@ endif (USE_PLASMA5) # Now make sure all files get to the right place if (USE_PLASMA5) - ecm_add_qml_module ( - org.x2go.plasmoid URI org.x2go.plasmoid - ) + if (HAVE_ECMQMLMODULE) + ecm_add_qml_module ( + X2GoPlasmoidPlugin URI "org.x2go.plasmoid" + ) + else (HAVE_ECMQMLMODULE) + add_library (X2GoPlasmoidPlugin) + set_target_properties (X2GoPlasmoidPlugin PROPERTIES + AUTOMOC_MOC_OPTIONS -Muri="org.x2go.plasmoid" + ) + endif (HAVE_ECMQMLMODULE) target_sources ( - org.x2go.plasmoid PRIVATE + X2GoPlasmoidPlugin PRIVATE ${x2goplasmoid_SRCS} ) target_link_libraries ( - org.x2go.plasmoid + X2GoPlasmoidPlugin Qt::Core Qt::Qml ) - ecm_finalize_qml_module ( - org.x2go.plasmoid DESTINATION - ${KDE_INSTALL_QMLDIR} - ) + if (HAVE_ECMQMLMODULE) + ecm_finalize_qml_module ( + X2GoPlasmoidPlugin DESTINATION + ${KDE_INSTALL_QMLDIR} + ) + else (HAVE_ECMQMLMODULE) + set (qmldir_template_ "# This file was automatically generated and should not be modified") + string (APPEND qmldir_template_ "\nmodule org.x2go.plasmoid") + string (APPEND qmldir_template_ "\nplugin X2GoPlasmoidPlugin") + string (APPEND qmldir_template_ "\nclassname X2GoPlasmoidPlugin") + string (APPEND qmldir_template_ "\n") + + set ( + qmldir_path_ + "${CMAKE_CURRENT_BINARY_DIR}/X2GoPlasmoidPlugin_qmldir" + ) + file (WRITE "${qmldir_path_}" "${qmldir_template_}") + + string (REPLACE "." "/" plugin_path_ "org.x2go.plasmoid") + + if (NOT BUILD_SHARED_LIBS) + set (qrc_template_ "<!-- This file was automatically generated and should not be modified -->") + string (APPEND qrc_template_ "\n<RCC>\n<qresource prefix=\"/qt-project.org/imports/${plugin_path_}\">") + string (APPEND qrc_template_ "\n<file alias=\"qmldir\">${qmldir_path_}</file>") + string (APPEND qrc_template_ "\n</qresource>\n</RCC>\n") + file (WRITE + "${CMAKE_CURRENT_BINARY_DIR}/X2GoPlasmoidPlugin.qrc" + "${qrc_template_}" + ) + qt_add_resources ( + qrc_output_ + "${CMAKE_CURRENT_BINARY_DIR}/X2GoPlasmoidPlugin.qrc" + ) + target_sources (X2GoPlasmoidPlugin PRIVATE ${qrc_output_}) + + set (CPP_RESOURCE_INIT "#include <qglobal.h>\n#include<QDebug> \n void initQmlResourceX2GoPlasmoidPlugin () {Q_INIT_RESOURCE(X2GoPlasmoidPlugin); qWarning()<<Q_FUNC_INFO;};") + file (WRITE X2GoPlasmoidPlugin_init.cpp "${CPP_RESOURCE_INIT}") + target_sources ( + X2GoPlasmoidPlugin + PRIVATE X2GoPlasmoidPlugin_init.cpp + ) + target_compile_definitions ( + X2GoPlasmoidPlugin PRIVATE + -DQT_PLUGIN_RESOURCE_INIT_FUNCTION=initQmlResourceX2GoPlasmoidPlugin + -DQT_STATICPLUGIN=1 + ) + install (TARGETS X2GoPlasmoidPlugin DESTINATION + ${KDE_INSTALL_QMLDIR}/${plugin_path_} + ) + else (NOT BUILD_SHARED_LIBS) + get_target_property ( + runtime_output_dir_ + X2GoPlasmoidPlugin RUNTIME_OUTPUT_DIRECTORY + ) + if (NOT ${runtime_output_dir_}) + if ("${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" STREQUAL "") + set (runtime_output_dir_ ${CMAKE_CURRENT_BINARY_DIR}) + else ("${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" STREQUAL "") + set (runtime_output_dir_ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + endif ("${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" STREQUAL "") + endif (NOT ${runtime_output_dir_}) + + add_custom_command ( + TARGET X2GoPlasmoidPlugin + POST_BUILD + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E make_directory + ${runtime_output_dir_}/${plugin_path_} + BYPRODUCTS ${runtime_output_dir_}/${plugin_path_} + ) + + install ( + FILES ${plugin_path_} + DESTINATION + ${KDE_INSTALL_QMLDIR}/${plugin_path_} + RENAME "qmldir" + ) + + add_custom_command ( + TARGET X2GoPlasmoidPlugin + POST_BUILD + WORKING_DIRECTORY ${runtime_output_dir_} + COMMAND ${CMAKE_COMMAND} -E copy ${plugin_path_} + ${plugin_path_}/qmldir + ) + + install ( + TARGETS X2GoPlasmoidPlugin + DESTINATION ${KDE_INSTALL_QMLDIR}/${plugin_path_} + ) + + add_custom_command ( + TARGET X2GoPlasmoidPlugin + POST_BUILD + WORKING_DIRECTORY ${runtime_output_dir_} + COMMAND ${CMAKE_COMMAND} -E copy + $<TARGET_FILE:X2GoPlasmoidPlugin> ${plugin_path_} + ) + endif (NOT BUILD_SHARED_LIBS) + endif (HAVE_ECMQMLMODULE) else (USE_PLASMA5) kde4_add_plugin( org.x2go.plasmoid diff --git a/debian/changelog b/debian/changelog index 4477bc6..369c30f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - CMakeLists.txt: rework building of org.x2go.plasmoid library in Plasma5 mode, based upon QML. - x2goplasmoidkf5.cpp: fix moc include. + - CMakeLists.txt: detect if ECMQmlModule is available and, if not, emulate + its behavior for older platforms. * 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