This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 2a962a0615b99255854209e3a55b3eafdd3f2da8 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 8 21:47:17 2023 +0200 /: add plasma_compat.h, defining the helper macro X2GOPLASMOID_PLASMA5_COMPAT if we're building against Plasma 5. --- debian/changelog | 2 ++ plasma_compat.h | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/debian/changelog b/debian/changelog index 452dc87..12a784c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - x2goplasmabindings.spec: add cmake(Qt5{,Quick,Core}) BRs. - CMakeLists.txt: fix Qt5 package name. - CMakeLists.txt: include ECMInstallIcons module. + - /: add plasma_compat.h, defining the helper macro + X2GOPLASMOID_PLASMA5_COMPAT if we're building against Plasma 5. * debian/control: + Adapt description to also mention KDE 5. + Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to diff --git a/plasma_compat.h b/plasma_compat.h new file mode 100644 index 0000000..32a7ff3 --- /dev/null +++ b/plasma_compat.h @@ -0,0 +1,24 @@ +#ifndef x2goplasmoid_plasma_compat_h_ + +#define x2goplasmoid_plasma_compat_h_ + +#include <plasma/version.h> + +/* + * Plasma 5.85 deprecated plasma/version.h and wants users to use + * plasma_version.h instead. + * + * While including plasma/version.h still works, prepare for using the other + * header instead - and make sure that we will not use anything but things + * defined in the other header for future compatibility. + */ +#ifndef PLASMA_VERSION_MAJOR +#include <Plasma/plasma_version.h> +#endif /* !defined (PLASMA_VERSION_MAJOR) */ + +#if PLASMA_VERSION_MAJOR >= 5 +/* Shorthand macro for Plasma 5 support. */ +#define X2GOPLASMOID_PLASMA5_COMPAT 1 +#endif + +#endif /* !defined (x2goplasmoid_plasma_compat_h_) */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git