Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xwaylandvideobridge for
openSUSE:Factory checked in at 2024-03-13 22:17:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xwaylandvideobridge (Old)
and /work/SRC/openSUSE:Factory/.xwaylandvideobridge.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xwaylandvideobridge"
Wed Mar 13 22:17:26 2024 rev:3 rq:1157012 version:0.4.0+git12
Changes:
--------
--- /work/SRC/openSUSE:Factory/xwaylandvideobridge/xwaylandvideobridge.changes
2024-02-01 18:07:12.627058569 +0100
+++
/work/SRC/openSUSE:Factory/.xwaylandvideobridge.new.1770/xwaylandvideobridge.changes
2024-03-13 22:18:15.131551376 +0100
@@ -1,0 +2,5 @@
+Mon Mar 11 16:36:56 UTC 2024 - Christophe Marin <[email protected]>
+
+- Build with KF 6/Plasma 6 when possible
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xwaylandvideobridge.spec ++++++
--- /var/tmp/diff_new_pack.KrIAvo/_old 2024-03-13 22:18:15.611569035 +0100
+++ /var/tmp/diff_new_pack.KrIAvo/_new 2024-03-13 22:18:15.611569035 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xwaylandvideobridge
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,35 +16,53 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%if 0%{?suse_version} > 1500 || "%{_repository}" ==
"KDE_Applications_openSUSE_Leap_15.5" || "%{_repository}" ==
"KDE_Applications_openSUSE_Leap_15.6"
+%define kf6 1
+%define _version 6
+%define kf_version 5.240.0
+%define qt_version 6.4.0
+%else
+%define kf6 0
+%define _version 5
+%define kf_version 5.83.0
+%define qt_version 5.15.0
+%endif
+
Name: xwaylandvideobridge
Version: 0.4.0+git12
Release: 0
Summary: XWayland Video Bridge
-License: GPL-2.0-only or GPL-3.0-or-later
-Group: System/GUI/KDE
+License: GPL-2.0-only OR GPL-3.0-or-later
URL: https://www.kde.org
# No release yet, missing kdereview
Source: %{name}-%{version}.tar.xz
-BuildRequires: cmake >= 3.16
-BuildRequires: extra-cmake-modules >= 5.83.0
-BuildRequires: cmake(KF5CoreAddons)
-BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5WindowSystem)
-BuildRequires: cmake(KF5Notifications)
-BuildRequires: cmake(KPipeWire) >= 5.27.5
-BuildRequires: cmake(Qt5DBus) >= 5.15.0
-BuildRequires: cmake(Qt5Quick)
-BuildRequires: cmake(Qt5X11Extras)
BuildRequires: pkgconfig
+BuildRequires: cmake(KF%{_version}CoreAddons) >= %{kf_version}
+BuildRequires: cmake(KF%{_version}I18n) >= %{kf_version}
+BuildRequires: cmake(KF%{_version}Notifications) >= %{kf_version}
+BuildRequires: cmake(KF%{_version}WindowSystem) >= %{kf_version}
+BuildRequires: cmake(Qt%{_version}DBus) >= %{qt_version}
+BuildRequires: cmake(Qt%{_version}Quick) >= %{qt_version}
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-composite)
BuildRequires: pkgconfig(xcb-event)
BuildRequires: pkgconfig(xcb-record)
BuildRequires: pkgconfig(xcb-xfixes)
-%if 0%{?suse_version} < 1600
+%if %{kf6}
+BuildRequires: kf6-extra-cmake-modules >= %{kf_version}
+BuildRequires: qt6-gui-private-devel >= %{qt_version}
+BuildRequires: cmake(KF6StatusNotifierItem) >= %{kf_version}
+BuildRequires: cmake(KPipeWire) >= 6.0.0
+%else
+# Still useful for some repos in the devel project
+BuildRequires: extra-cmake-modules >= %{kf_version}
# Needs C++20
-BuildRequires: gcc13-c++
BuildRequires: gcc13-PIE
+BuildRequires: gcc13-c++
+BuildRequires: cmake(Qt5X11Extras) >= %{qt_version}
+BuildRequires: (cmake(KPipeWire) >= 5.27 with cmake(KPipeWire) < 6)
%endif
%description
@@ -53,26 +71,46 @@
This tool allows us to share specific windows to X11 clients, but within the
control of the user at all times.
%prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{version}
%build
-%if 0%{?suse_version} < 1600
+%if !%{kf6}
export CC=gcc-13
export CXX=g++-13
%endif
+
+%if %{kf6}
+%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
+%kf6_build
+%else
%cmake_kf5 -d build
%cmake_build
+%endif
%install
+%if %{kf6}
+%kf6_install
+%else
%kf5_makeinstall -C build
-%find_lang %{name}
+%endif
+
+%find_lang %{name} --all-name
%files -f %{name}.lang
%license LICENSES/*
+%if %{kf6}
+%{_kf6_applicationsdir}/org.kde.xwaylandvideobridge.desktop
+%{_kf6_appstreamdir}/org.kde.xwaylandvideobridge.appdata.xml
+%{_kf6_bindir}/xwaylandvideobridge
+%{_kf6_configdir}/autostart/org.kde.xwaylandvideobridge.desktop
+%{_kf6_debugdir}/xwaylandvideobridge.categories
+%{_kf6_iconsdir}/hicolor/scalable/apps/xwaylandvideobridge.svg
+%else
%{_kf5_applicationsdir}/org.kde.xwaylandvideobridge.desktop
%{_kf5_appstreamdir}/org.kde.xwaylandvideobridge.appdata.xml
%{_kf5_bindir}/xwaylandvideobridge
%{_kf5_configdir}/autostart/org.kde.xwaylandvideobridge.desktop
%{_kf5_debugdir}/xwaylandvideobridge.categories
%{_kf5_iconsdir}/hicolor/scalable/apps/xwaylandvideobridge.svg
+%endif
