This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from 27d9b2c x2goplasmoidkf5.cpp: try to fix code to work with Qt 5.11 and C++11 lambdas for qmlRegisterSingletonType (). new e9de9de x2goplasmabindings.spec: try to BuildIgnore: kinfocenter5, since it contains a rich dependency on /usr/bin/vulkaninfo if libvulkan1 is installed, which breaks obs-build. new 1dc7ff7 x2goplasmabindings.spec: enable verbose Makefiles. new f27cda8 debian/rules: enable verbose Makefiles. new e638a43 CMakeLists.txt: create metadata.desktop via a custom target with the ALL option enabled and BYPRODUCTS set correctly, so that the clean target automatically removes it as well. 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 | 27 ++++++++++----------------- debian/changelog | 8 ++++++++ debian/rules | 2 +- x2goplasmabindings.spec | 7 +++++++ 4 files changed, 26 insertions(+), 18 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 1dc7ff77281035d63af8ec0c7969bf3898e9423e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 21:28:01 2023 +0200 x2goplasmabindings.spec: enable verbose Makefiles. --- debian/changelog | 1 + x2goplasmabindings.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 75c9b74..5b96e4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium no-op for them. + 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. * 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 9256379..ae54dd7 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -134,6 +134,7 @@ cmake .. \ -DPLUGIN_INSTALL_DIR="%_libdir/kde4" \ -DCMAKE_C_FLAGS:STRING="%optflags" \ -DCMAKE_CXX_FLAGS:STRING="%optflags" \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ %if 0%{?plasma5} '-DUSE_PLASMA5=ON' %else -- 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 e9de9dedd6d2aadf9a1c76238107570688c26467 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 21:27:29 2023 +0200 x2goplasmabindings.spec: try to BuildIgnore: kinfocenter5, since it contains a rich dependency on /usr/bin/vulkaninfo if libvulkan1 is installed, which breaks obs-build. --- debian/changelog | 2 ++ x2goplasmabindings.spec | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 92d7407..75c9b74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium /usr/share/plasma/plasmoids. KDE 5 users, which are the intended target of this package, will already have that installed, so it's essentially a no-op for them. + + Try to BuildIgnore: kinfocenter5, since it contains a rich dependency on + /usr/bin/vulkaninfo if libvulkan1 is installed, which breaks obs-build. * 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 2d804d4..9256379 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -65,6 +65,12 @@ BuildRequires: redhat-rpm-config %if 0%{?suse_version} BuildRequires: plasma5-desktop Requires: plasma5-desktop +# The dependency parser barfs on libvulkan1 vs. kinfocenter5, which requires +# /usr/bin/vulkaninfo if libvulkan1 is installed. While that is certainly a +# bug with our version of obs-build, libsolv, librpm or whatever is actually +# causing it, we should be able to easily avoid this error by masking +# kinfocenter5. +#!BuildIgnore: kinfocenter5 %else BuildRequires: plasma-desktop Requires: plasma-desktop -- 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 f27cda89ce7e6a2388f8e1b5777e5af4c8d88ec5 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 21:29:07 2023 +0200 debian/rules: enable verbose Makefiles. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5b96e4a..2ae2bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium code. + Add USE_DESKTOP_FILE selector to support older systems. + Fix syntax. + + Enable verbose Makefiles. * 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 72cc92d..4070522 100755 --- a/debian/rules +++ b/debian/rules @@ -112,4 +112,4 @@ endif dh $@ override_dh_auto_configure: - dh_auto_configure -- -DUSE_PLASMA5=$(USE_PLASMA5) -DUSE_DESKTOPFILE=$(USE_DESKTOP_FILE) + dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -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 e638a43e06dc3ddb6c8117fbe8fa9d62733ea5b6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 11 23:22:55 2023 +0200 CMakeLists.txt: create metadata.desktop via a custom target with the ALL option enabled and BYPRODUCTS set correctly, so that the clean target automatically removes it as well. Only do that if actually requested, though. --- CMakeLists.txt | 27 ++++++++++----------------- debian/changelog | 4 ++++ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f66e72a..74e3e03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,24 +207,17 @@ 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) + add_custom_target ( + CopyDesktopFile + ALL + BYPRODUCTS "${CMAKE_SOURCE_DIR}/package/metadata.desktop" + COMMENT "Copying plasma-applet-org.x2go.plasmoid.desktop to package/metadata.desktop." + COMMAND ${CMAKE_COMMAND} -E copy + "${CMAKE_SOURCE_DIR}/plasma-applet-org.x2go.plasmoid.desktop" + "${CMAKE_SOURCE_DIR}/package/metadata.desktop" + VERBATIM + ) endif (USE_DESKTOP_FILE) else (USE_PLASMA5) kde4_add_plugin( diff --git a/debian/changelog b/debian/changelog index 2ae2bf5..65a45c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,10 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium Qt-6-compatibility. - x2goplasmoidkf5.cpp: try to fix code to work with Qt 5.11 and C++11 lambdas for qmlRegisterSingletonType (). + - CMakeLists.txt: create metadata.desktop via a custom target with the ALL + option enabled and BYPRODUCTS set correctly, so that the clean target + automatically removes it as well. Only do that if actually requested, + though. * 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