This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from 712f847 Continue development new 712f6f1 x2goplasmabindings.spec: prepare for Plasma 5 support. new 4b9525c po/CMakeLists.txt: add reverse domain name notation to catalog name. new 63dc288 CMakeLists.txt: add support for Plasma 5, rename plasmoid to org.x2go.plasmoid where applicable. new 7ce3ad2 plasma-applet-x2goplasmoid.desktop: rename to plasma-applet-org.x2go.plasmoid.desktop and adapt X-KDE-Library and X-KDE-PluginInfo-Name values. new 09f940f CMakeLists.txt: pick plasma-applet-org.x2go.plasmoid.desktop in KDE4 mode. new 5d59a2d CMakeLists.txt: rename project to plasma_applet_org.x2go.plasmoid. new 06aac53 /: add package/metadata.json, created with desktoptojson (mostly) with an unknown key removed. The 7 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 | 89 +++++++++++++++--- debian/changelog | 15 ++- package/metadata.json | 104 +++++++++++++++++++++ ...ktop => plasma-applet-org.x2go.plasmoid.desktop | 4 +- po/CMakeLists.txt | 2 +- x2goplasmabindings.spec | 32 ++++++- 6 files changed, 228 insertions(+), 18 deletions(-) create mode 100644 package/metadata.json rename plasma-applet-x2goplasmoid.desktop => plasma-applet-org.x2go.plasmoid.desktop (97%) -- 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 712f6f1c0892dda9933f2e6f7b8e0fe480a4adc1 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 24 22:46:51 2023 +0200 x2goplasmabindings.spec: prepare for Plasma 5 support. --- debian/changelog | 4 +++- x2goplasmabindings.spec | 32 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8baaa2..9aeb003 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (3.0.2.3): + - x2goplasmabindings.spec: prepare for Plasma 5 support. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec index 1ca1a93..8d55efe 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -1,3 +1,14 @@ +# Choose between KDE 4 and 5. +%global plasma5 0 +%if 0%{?suse_version} +%if 0%{?sle_version} >= 150300 +%global plasma5 1 +%endif +%endif +%if 0%{?fedora} >= 38 +%global plasma5 1 +%endif + Name: x2goplasmabindings Summary: Plasma widget for control X2Go sessions Group: Applications/Communications @@ -16,11 +27,19 @@ Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version} BuildRequires: cmake %if 0%{?suse_version} BuildRequires: kde4-filesystem +%if 0%{?plasma5} +BuildRequires: plasma-framework-devel +%else BuildRequires: libkde4-devel +%endif %else BuildRequires: kde-filesystem +%if 0%{?plasma5} +BuildRequires: kf5-plasma-devel +%els BuildRequires: kdelibs4-devel %endif +%endif BuildRequires: intltool Requires: plasma-addons-x2go @@ -43,7 +62,11 @@ X2Go is a server-based computing environment with - audio support - authentication by smartcard and USB stick +%if 0%{?plasma5} +This package adds a plasma widget (KDE5) for controlling your +%else This package adds a plasma widget (KDE4) for controlling your +%endif X2Go session. %package -n plasma-addons-x2go @@ -62,7 +85,11 @@ X2Go is a server-based computing environment with - audio support - authentication by smartcard and USB stick +%if 0%{?plasma5} +This package adds a plasma widget (KDE5) for controlling your +%else This package adds a plasma widget (KDE4) for controlling your +%endif X2Go session. %prep @@ -80,7 +107,10 @@ cmake .. \ -DKDE4_PLASMA_LIBS="%_libdir/kde4" \ -DPLUGIN_INSTALL_DIR="%_libdir/kde4" \ -DCMAKE_C_FLAGS:STRING="%optflags" \ - -DCMAKE_CXX_FLAGS:STRING="%optflags" + -DCMAKE_CXX_FLAGS:STRING="%optflags" \ +%if 0%{?plasma5} + -DUSE_PLASMA5="ON" +%endif make %{?_smp_mflags} -- 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 4b9525cc17963761dc8e5b7f941fffa8f4685bfc Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 27 21:22:21 2023 +0200 po/CMakeLists.txt: add reverse domain name notation to catalog name. --- debian/changelog | 1 + po/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9aeb003..6275f38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.0.2.3): - x2goplasmabindings.spec: prepare for Plasma 5 support. + - po/CMakeLists.txt: add reverse domain name notation to catalog name. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index bed9710..c1838a5 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -7,7 +7,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE) ------") ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE) - SET(catalogname plasma_applet_x2goplasmoid) + SET(catalogname plasma_applet_org.x2go.plasmoid) ADD_CUSTOM_TARGET(translations ALL) -- 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 63dc288b3e61a799559b1e675f73e1fa3336e498 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 27 21:30:00 2023 +0200 CMakeLists.txt: add support for Plasma 5, rename plasmoid to org.x2go.plasmoid where applicable. --- CMakeLists.txt | 89 +++++++++++++++++++++++++++++++++++++++++++++++--------- debian/changelog | 2 ++ 2 files changed, 78 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87acf0a..c7538ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,24 +1,58 @@ # Project Needs a name ofcourse -project(plasma-applet-x2goplasmoid) - +project(plasma-applet-org.x2go.plasmoid) +option(USE_PLASMA5 "Build against KDE Plasma 5" OFF) # Find the required Libaries -find_package( - KDE4 REQUIRED +if (USE_PLASMA5) + find_package ( + ECM REQUIRED NO_MODULE + ) + set (CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + + include (KDEInstallDirs) + include (KDECMakeSettings) + include (KDECompilerSettings NO_POLICY_SCOPE) + include (FeatureSummary) + + find_package ( + KF5 REQUIRED COMPONENTS + Plasma + I18n + ) + + find_package ( + QT5 CONFIG REQUIRED COMPONENTS + Quick + Core + ) + + feature_summary (WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +else (USE_PLASMA5) + find_package( + KDE4 REQUIRED + ) + include(KDE4Defaults) +endif (USE_PLASMA5) + +add_definitions ( + -DTRANSLATION_DOMAIN=\"plasma_applet_org.x2go.plasmoid\" ) -include(KDE4Defaults) +include_directories( + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} +) +if (NOT USE_PLASMA5) add_definitions ( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ) include_directories( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ) +endif (NOT USE_PLASMA5) find_file(HAVE_PLASMA_SEPARATOR separator.h ${KDE4_INCLUDES}/plasma/widgets) @@ -34,32 +68,61 @@ set( ) # Now make sure all files get to the right place +if (USE_PLASMA5) + add_library ( + org.x2go.plasmoid MODULE + ${x2goplasmoid_SRCS} + ) + set_target_properties ( + org.x2go.plasmoid + PROPERTIES PREFIX "" + ) + target_link_libraries ( + org.x2go.plasmoid + Qt5::Gui + KF5::Plasma + KF5::I18n + ) +else (USE_PLASMA5) kde4_add_plugin( - plasma_applet_x2goplasmoid + org.x2go.plasmoid ${x2goplasmoid_SRCS} ) target_link_libraries( - plasma_applet_x2goplasmoid + org.x2go.plasmoid ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ) - +endif (USE_PLASMA5) add_subdirectory( po ) +if (USE_PLASMA5) +ecm_install_icons ( + ${ICON_INSTALL_DIR} +) + +plasma_install_package ( + "package" + "org.x2go.plasmoid" + "plasmoids" + "applet" +) +else (USE_PLASMA5) kde4_install_icons( ${ICON_INSTALL_DIR} ) - + install( - TARGETS plasma_applet_x2goplasmoid + TARGETS org.x2go.plasmoid DESTINATION ${PLUGIN_INSTALL_DIR} ) install( - FILES plasma-applet-x2goplasmoid.desktop + FILES org.x2go.plasmoid.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +endif (USE_PLASMA5) diff --git a/debian/changelog b/debian/changelog index 6275f38..67ab1b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium * New upstream version (3.0.2.3): - x2goplasmabindings.spec: prepare for Plasma 5 support. - po/CMakeLists.txt: add reverse domain name notation to catalog name. + - CMakeLists.txt: add support for Plasma 5, rename plasmoid to + org.x2go.plasmoid where applicable. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 -- 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 7ce3ad22171d4d6b1b291b8f91920f66eee488f0 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 27 22:33:41 2023 +0200 plasma-applet-x2goplasmoid.desktop: rename to plasma-applet-org.x2go.plasmoid.desktop and adapt X-KDE-Library and X-KDE-PluginInfo-Name values. --- debian/changelog | 3 +++ ...et-x2goplasmoid.desktop => plasma-applet-org.x2go.plasmoid.desktop | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67ab1b3..d369300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - po/CMakeLists.txt: add reverse domain name notation to catalog name. - CMakeLists.txt: add support for Plasma 5, rename plasmoid to org.x2go.plasmoid where applicable. + - plasma-applet-x2goplasmoid.desktop: rename to + plasma-applet-org.x2go.plasmoid.desktop and adapt X-KDE-Library and + X-KDE-PluginInfo-Name values. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 diff --git a/plasma-applet-x2goplasmoid.desktop b/plasma-applet-org.x2go.plasmoid.desktop similarity index 97% rename from plasma-applet-x2goplasmoid.desktop rename to plasma-applet-org.x2go.plasmoid.desktop index 518ce40..1a8a6cf 100644 --- a/plasma-applet-x2goplasmoid.desktop +++ b/plasma-applet-org.x2go.plasmoid.desktop @@ -86,10 +86,10 @@ Type=Service ServicesType=Plasma/Applet X-KDE-ServiceTypes=Plasma/Applet -X-KDE-Library=plasma_applet_x2goplasmoid +X-KDE-Library=org.x2go.plasmoid X-KDE-PluginInfo-Author=Oleksandr Shneyder, Heinz-M. Graesing X-KDE-PluginInfo-Email=oleksandr.shneyder@obviously-nice.de, heinz-m.graesing@obviously-nice.de -X-KDE-PluginInfo-Name=x2goplasmoid +X-KDE-PluginInfo-Name=org.x2go.plasmoid X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Website=https://www.x2go.org X-KDE-PluginInfo-Category= -- 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 09f940fe6beae50d24d46145bc41032af6121ca0 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 27 22:35:06 2023 +0200 CMakeLists.txt: pick plasma-applet-org.x2go.plasmoid.desktop in KDE4 mode. --- CMakeLists.txt | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7538ba..11ea285 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,7 @@ install( ) install( - FILES org.x2go.plasmoid.desktop + FILES plasma-applet-org.x2go.plasmoid.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) endif (USE_PLASMA5) diff --git a/debian/changelog b/debian/changelog index d369300..25a5460 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - plasma-applet-x2goplasmoid.desktop: rename to plasma-applet-org.x2go.plasmoid.desktop and adapt X-KDE-Library and X-KDE-PluginInfo-Name values. + - CMakeLists.txt: pick plasma-applet-org.x2go.plasmoid.desktop in KDE4 + mode. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 -- 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 5d59a2d9b77083903156181496307fd7a44776cd Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 27 22:40:28 2023 +0200 CMakeLists.txt: rename project to plasma_applet_org.x2go.plasmoid. --- CMakeLists.txt | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11ea285..5789c95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Project Needs a name ofcourse -project(plasma-applet-org.x2go.plasmoid) +project(plasma_applet_org.x2go.plasmoid) option(USE_PLASMA5 "Build against KDE Plasma 5" OFF) diff --git a/debian/changelog b/debian/changelog index 25a5460..5315b60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium X-KDE-PluginInfo-Name values. - CMakeLists.txt: pick plasma-applet-org.x2go.plasmoid.desktop in KDE4 mode. + - CMakeLists.txt: rename project to plasma_applet_org.x2go.plasmoid. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 -- 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 06aac53a8a55533c5bd923f97b38498bd645ec99 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 27 22:46:17 2023 +0200 /: add package/metadata.json, created with desktoptojson (mostly) with an unknown key removed. --- debian/changelog | 2 + package/metadata.json | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5315b60..d881ae0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - CMakeLists.txt: pick plasma-applet-org.x2go.plasmoid.desktop in KDE4 mode. - CMakeLists.txt: rename project to plasma_applet_org.x2go.plasmoid. + - /: add package/metadata.json, created with desktoptojson (mostly) with + an unknown key removed. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 diff --git a/package/metadata.json b/package/metadata.json new file mode 100644 index 0000000..eeeb10f --- /dev/null +++ b/package/metadata.json @@ -0,0 +1,104 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "oleksandr.shneyder@obviously-nice.de, heinz-m.graesing@obviously-nice.de", + "Name": "Oleksandr Shneyder, Heinz-M. Graesing" + } + ], + "Category": "", + "Dependencies": [ + ], + "Description": "Plasma x2goplasmoid", + "Description[ca@valencia]": "Plasma x2goplasmoid", + "Description[ca]": "Plasma x2goplasmoid", + "Description[cs]": "Plasma x2goplasmoid", + "Description[da]": "Plasma x2goplasmoid", + "Description[de]": "Plasma x2goplasmoid", + "Description[el]": "Plasma x2goplasmoid", + "Description[en_GB]": "Plasma x2goplasmoid", + "Description[eo]": "Plasma x2goplasmoid", + "Description[es]": "Plasma x2goplasmoid", + "Description[et]": "Plasma x2goplasmoid", + "Description[fi]": "Plasma x2goplasmoid", + "Description[fr]": "Plasma x2goplasmoid", + "Description[ga]": "Plasma x2goplasmoid", + "Description[gl]": "Plasma x2goplasmoid", + "Description[hu]": "Plasma x2goplasmoid", + "Description[it]": "Plasma x2goplasmoid", + "Description[ja]": "Plasma x2goplasmoid", + "Description[km]": "ប្លាស្មា x2goplasmoid", + "Description[ko]": "Plasma x2goplasmoid", + "Description[lv]": "Plasma x2goplasmoid", + "Description[nb]": "Plasma x2goplasmoid", + "Description[nds]": "Plasma x2goplasmoid", + "Description[nl]": "Plasma x2goplasmoid", + "Description[nn]": "Plasma x2goplasmoid", + "Description[pa]": "ਪਲਾਜ਼ਮਾ x2goplasmoid", + "Description[pl]": "Plasma x2goplasmoid", + "Description[pt]": "Plasma x2goplasmoid", + "Description[pt_BR]": "Plasma x2goplasmoid", + "Description[ro]": "Plasma x2goplasmoid", + "Description[ru]": "Plasma x2goplasmoid", + "Description[sr@ijekavian]": "Плазмин x2goplasmoid", + "Description[sr@ijekavianlatin]": "Plasmin x2goplasmoid", + "Description[sr@latin]": "Plasmin x2goplasmoid", + "Description[sr]": "Плазмин x2goplasmoid", + "Description[sv]": "Plasma x2goplasmoid", + "Description[tr]": "Plasma x2goplasmoid", + "Description[uk]": "Плазма x2goplasmoid", + "Description[x-test]": "xxPlasma x2goplasmoidxx", + "Description[zh_CN]": "Plasma x2goplasmoid", + "Description[zh_TW]": "Plasma x2goplasmoid", + "EnabledByDefault": true, + "Icon": "x2go", + "Id": "org.x2go.plasmoid", + "License": "GPL", + "Name": "x2goplasmoid", + "Name[ca@valencia]": "x2goplasmoid", + "Name[ca]": "x2goplasmoid", + "Name[cs]": "x2goplasmoid", + "Name[da]": "x2goplasmoid", + "Name[de]": "x2goplasmoid", + "Name[el]": "x2goplasmoid", + "Name[en_GB]": "x2goplasmoid", + "Name[eo]": "x2goplasmoid", + "Name[es]": "x2goplasmoid", + "Name[et]": "x2goplasmoid", + "Name[fi]": "x2goplasmoid", + "Name[fr]": "x2goplasmoid", + "Name[ga]": "x2goplasmoid", + "Name[gl]": "x2goplasmoid", + "Name[hu]": "x2goplasmoid", + "Name[it]": "x2goplasmoid", + "Name[ja]": "x2goplasmoid", + "Name[km]": "x2goplasmoid", + "Name[ko]": "x2goplasmoid", + "Name[lv]": "x2goplasmoid", + "Name[nb]": "x2goplasmoid", + "Name[nds]": "x2goplasmoid", + "Name[nl]": "x2goplasmoid", + "Name[nn]": "x2goplasmoid", + "Name[pa]": "x2goplasmoid", + "Name[pl]": "x2goplasmoid", + "Name[pt]": "x2goplasmoid", + "Name[pt_BR]": "x2goplasmoid", + "Name[ro]": "x2goplasmoid", + "Name[ru]": "x2goplasmoid", + "Name[sr@ijekavian]": "x2goplasmoid", + "Name[sr@ijekavianlatin]": "x2goplasmoid", + "Name[sr@latin]": "x2goplasmoid", + "Name[sr]": "x2goplasmoid", + "Name[sv]": "x2goplasmoid", + "Name[tr]": "x2goplasmoid", + "Name[uk]": "x2goplasmoid", + "Name[x-test]": "xxx2goplasmoidxx", + "Name[zh_CN]": "x2goplasmoid", + "Name[zh_TW]": "x2goplasmoid", + "ServiceTypes": [ + "Plasma/Applet" + ], + "Version": "0.1", + "Website": "https://www.x2go.org" + } +} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
-
git-admin＠x2go.org