This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from ecbd083 debian/rules: downgrade Plasma-5-requirement to Debian Stretch (9). new 7bac7b4 CMakeLists.txt: fix builds on Debian Stretch/9 by depending upon CopyDesktopFile before desktoptojson is called on it. new e7dc1ba x2goplasmabindings.spec: only BR kde(4)-filesystem if not building for Plasma 5. 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 | 9 +++++++++ debian/changelog | 3 +++ x2goplasmabindings.spec | 10 +++++----- 3 files changed, 17 insertions(+), 5 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 7bac7b42ad41c6b1b94ac53ef12138f9d4ad0772 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 12 01:55:41 2023 +0200 CMakeLists.txt: fix builds on Debian Stretch/9 by depending upon CopyDesktopFile before desktoptojson is called on it. --- CMakeLists.txt | 9 +++++++++ debian/changelog | 2 ++ 2 files changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index de77544..362725a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,6 +218,15 @@ if (USE_PLASMA5) "${CMAKE_SOURCE_DIR}/package/metadata.desktop" VERBATIM ) + + # For very old systems, make sure that the desktop file exists + # before they try to run desktoptojson on it... + if (TARGET org.x2go.plasmoid-metadata-json) + add_dependencies ( + org.x2go.plasmoid-metadata-json + CopyDesktopFile + ) + endif (TARGET org.x2go.plasmoid-metadata-json) endif (USE_DESKTOP_FILE) else (USE_PLASMA5) kde4_add_plugin( diff --git a/debian/changelog b/debian/changelog index c3aa5f4..969fa54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium automatically removes it as well. Only do that if actually requested, though. - CMakeLists.txt: fix warning due to mismatched if/endif parameters. + - CMakeLists.txt: fix builds on Debian Stretch/9 by depending upon + CopyDesktopFile before desktoptojson is called on it. * 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 e7dc1ba80c9fc9756c30eecdfaea29a5e1a87868 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 12 01:58:38 2023 +0200 x2goplasmabindings.spec: only BR kde(4)-filesystem if not building for Plasma 5. --- debian/changelog | 1 + x2goplasmabindings.spec | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 969fa54..d1591b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -77,6 +77,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium + Try to BuildIgnore: kinfocenter5, since it contains a rich dependency on /usr/bin/vulkaninfo if libvulkan1 is installed, which breaks obs-build. + Enable verbose Makefiles. + + Only BR kde(4)-filesystem if not building for 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/x2goplasmabindings.spec b/x2goplasmabindings.spec index ae54dd7..c8c9245 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -25,11 +25,6 @@ URL: https://www.x2go.org Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildRequires: cmake -%if 0%{?suse_version} -BuildRequires: kde4-filesystem -%else -BuildRequires: kde-filesystem -%endif %if 0%{?plasma5} BuildRequires: cmake(KF5Plasma) BuildRequires: cmake(KF5I18n) @@ -43,6 +38,11 @@ BuildRequires: kf5-rpm-macros BuildRequires: kf5umbrella %endif %else +%if 0%{?suse_version} +BuildRequires: kde4-filesystem +%else +BuildRequires: kde-filesystem +%endif %if 0%{?rhel} BuildRequires: kdelibs4-devel %else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
-
git-admin＠x2go.org