From e97fa54e65949e4394ac2694431097eb7ca09d6f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 29 Mar 2024 19:24:07 +0100 Subject: [PATCH] rebuilt with qt6 and qt5 theme compatibility [release 0.21.0-2mamba;Sun Mar 10 2024] --- sddm.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/sddm.spec b/sddm.spec index 6e9777b..b48ae6c 100644 --- a/sddm.spec +++ b/sddm.spec @@ -3,7 +3,7 @@ Name: sddm Epoch: 1 Version: 0.21.0 -Release: 1mamba +Release: 2mamba Summary: QML based X11 and Wayland display manager Group: Graphical Desktop/Applications/Environment Vendor: openmamba @@ -18,12 +18,15 @@ License: GPL BuildRequires: glibc-devel BuildRequires: libXau-devel BuildRequires: libgcc +BuildRequires: libglvnd-devel BuildRequires: libpam-devel BuildRequires: libstdc++6-devel BuildRequires: libsystemd-devel BuildRequires: libxcb-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtdeclarative-devel ## AUTOBUILDREQ-END BuildRequires: cmake Requires: surface-tools @@ -40,13 +43,24 @@ QML based X11 and Wayland display manager. %patch 2 -p1 %build -%cmake -d build +%cmake -d build \ + -DBUILD_WITH_QT6=ON \ + %make +cd .. +%cmake -d build5 + +cmake --build src/greeter +cmake --build components + %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build +%makeinstall -C build5/src/greeter +%makeinstall -C build5/components + install -d -m0775 %{buildroot}%{_localstatedir}/lib/sddm install -d -m0755 %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d @@ -105,12 +119,15 @@ fi %{_sysconfdir}/pam.d/sddm-greeter %{_bindir}/sddm %{_bindir}/sddm-greeter +%{_bindir}/sddm-greeter-qt6 %{_unitdir}/sddm.service %{_sysusersdir}/sddm.conf %{_tmpfilesdir}/sddm.conf %{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf %dir %{_prefix}/lib/sddm/sddm.conf.d %{_prefix}/lib/sddm/sddm.conf.d/default.conf +%dir %{_qt6_qmldir}/SddmComponents +%{_qt6_qmldir}/SddmComponents/* %dir %{_libdir}/qt5/qml/SddmComponents %{_libdir}/qt5/qml/SddmComponents/* %{_prefix}/libexec/sddm-helper* @@ -127,11 +144,14 @@ fi %{_datadir}/sddm/themes/maldives/* %dir %{_datadir}/sddm/themes/maya %{_datadir}/sddm/themes/maya/* -%{_datadir}/sddm/translations-qt5/*.qm +%{_datadir}/sddm/translations-qt6/*.qm %attr(-,sddm,sddm) %dir %{_localstatedir}/lib/sddm %doc LICENSE %changelog +* Sun Mar 10 2024 Silvan Calarco 0.21.0-2mamba +- rebuilt with qt6 and qt5 theme compatibility + * Wed Feb 28 2024 Automatic Build System 0.21.0-1mamba - automatic version update by autodist