From 0d0b09620e5183e8210c79725bb7383b0aba24da2818dd6bc8348e807706a943 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 11 Sep 2024 07:58:00 +0000 Subject: [PATCH] Plasma 6.1.5. sddm-kcm6 needed a patch change. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-openSUSE?expand=0&rev=26 --- .gitattributes | 23 +++ .gitignore | 1 + _service | 15 ++ _servicedata | 4 + layout.diff | 11 ++ panel.diff | 22 +++ ...e-84.87~git20240313T170730~9c664b7.obscpio | 3 + plasma-opensuse.obsinfo | 4 + plasma6-openSUSE.changes | 131 ++++++++++++++++ plasma6-openSUSE.spec | 143 ++++++++++++++++++ sddmtheme.diff | 11 ++ 11 files changed, 368 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _service create mode 100644 _servicedata create mode 100644 layout.diff create mode 100644 panel.diff create mode 100644 plasma-opensuse-84.87~git20240313T170730~9c664b7.obscpio create mode 100644 plasma-opensuse.obsinfo create mode 100644 plasma6-openSUSE.changes create mode 100644 plasma6-openSUSE.spec create mode 100644 sddmtheme.diff diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_service b/_service new file mode 100644 index 0000000..7933d68 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/openSUSE/plasma-opensuse.git + git + 84.87~git%ci~%h + plasma6-tumbleweed + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..aaf9a44 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/plasma-opensuse.git + 9c664b7d3e53a76147c5c74072f5ed446dfae42a diff --git a/layout.diff b/layout.diff new file mode 100644 index 0000000..59ec6ae --- /dev/null +++ b/layout.diff @@ -0,0 +1,11 @@ +diff --git a/usr/share/plasma/shells/org.kde.plasma.desktop/contents/main.js b/usr/share/plasma/look-and-feel/org.openSUSE.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +index e62f467..fabf4ef 100644 +--- a/usr/share/plasma/shells/org.kde.plasma.desktop/contents/main.js ++++ b/usr/share/plasma/look-and-feel/org.openSUSE.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +@@ -1,5 +1,5 @@ + +-loadTemplate("org.kde.plasma.desktop.defaultPanel") ++loadTemplate("org.opensuse.desktop.defaultPanel") + + var desktopsArray = desktopsForActivity(currentActivity()); + for( var j = 0; j < desktopsArray.length; j++) { diff --git a/panel.diff b/panel.diff new file mode 100644 index 0000000..43e3fdb --- /dev/null +++ b/panel.diff @@ -0,0 +1,22 @@ +--- /usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js 2023-11-13 12:52:56.000000000 -0500 ++++ /usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/contents/layout.js 2023-11-14 18:27:11.599802134 -0500 +@@ -1,6 +1,8 @@ + var panel = new Panel + var panelScreen = panel.screen + ++panel.floating = false ++ + // No need to set panel.location as ShellCorona::addPanel will automatically pick one available edge + + // For an Icons-Only Task Manager on the bottom, *3 is too much, *2 is too little +@@ -21,7 +21,9 @@ + } + } + +-panel.addWidget("org.kde.plasma.kickoff") ++var kickoff = panel.addWidget("org.kde.plasma.kickoff") ++kickoff.currentConfigGroup = ["General"] ++kickoff.writeConfig("icon", "start-here-branding") + //panel.addWidget("org.kde.plasma.showActivityManager") + panel.addWidget("org.kde.plasma.pager") + panel.addWidget("org.kde.plasma.icontasks") diff --git a/plasma-opensuse-84.87~git20240313T170730~9c664b7.obscpio b/plasma-opensuse-84.87~git20240313T170730~9c664b7.obscpio new file mode 100644 index 0000000..60227da --- /dev/null +++ b/plasma-opensuse-84.87~git20240313T170730~9c664b7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8200fd3ba96c04d21c3aed364fcd9df7dfd2092ef5f0249fa93ef6fb3c33daac +size 1415692 diff --git a/plasma-opensuse.obsinfo b/plasma-opensuse.obsinfo new file mode 100644 index 0000000..d9442b7 --- /dev/null +++ b/plasma-opensuse.obsinfo @@ -0,0 +1,4 @@ +name: plasma-opensuse +version: 84.87~git20240313T170730~9c664b7 +mtime: 1710346050 +commit: 9c664b7d3e53a76147c5c74072f5ed446dfae42a diff --git a/plasma6-openSUSE.changes b/plasma6-openSUSE.changes new file mode 100644 index 0000000..2f6ed7b --- /dev/null +++ b/plasma6-openSUSE.changes @@ -0,0 +1,131 @@ +------------------------------------------------------------------- +Tue Sep 10 14:54:47 UTC 2024 - Fabian Vogt + +- Update to 6.1.5 + +------------------------------------------------------------------- +Tue Aug 6 13:28:07 UTC 2024 - Fabian Vogt + +- Update to 6.1.4 + +------------------------------------------------------------------- +Tue Jul 16 13:24:56 UTC 2024 - Fabian Vogt + +- Update to 6.1.3 + +------------------------------------------------------------------- +Tue Jul 2 17:34:24 UTC 2024 - Fabian Vogt + +- Update to 6.1.2 + +------------------------------------------------------------------- +Tue Jun 25 17:14:23 UTC 2024 - Fabian Vogt + +- Update to 6.1.1 + +------------------------------------------------------------------- +Thu Jun 13 10:58:46 UTC 2024 - Fabian Vogt + +- Update to 6.1.0 +- Don't have plasma6-sddm-theme-openSUSE require + sddm-qt6-branding-openSUSE + +------------------------------------------------------------------- +Sat May 25 11:19:26 UTC 2024 - Fabian Vogt + +- Update to 6.0.90 +- Rebase panel.diff + +------------------------------------------------------------------- +Wed May 22 07:43:15 UTC 2024 - Fabian Vogt + +- Update to 6.0.5 + +------------------------------------------------------------------- +Wed Apr 17 08:13:23 UTC 2024 - Fabian Vogt + +- Update to 6.0.4 + +------------------------------------------------------------------- +Tue Apr 9 11:56:21 UTC 2024 - Antonio Larrosa + +- Modify sddmtheme.diff to change the extension of the openSUSE + branding wallpaper from jpg to png since the extension was + changed in TW (boo#1222546) +- Require the same wallpaper-branding version as used when building + to make sure the png file exists + +------------------------------------------------------------------- +Tue Mar 26 18:06:20 UTC 2024 - Fabian Vogt + +- Update to 6.0.3 + +------------------------------------------------------------------- +Wed Mar 13 16:08:25 UTC 2024 - Fabian Vogt + +- Update to version 84.87~git20240313T170730~9c664b7: + * Add opensuse_launcher_icon.js shell update script +- Clean up _servicedata + +------------------------------------------------------------------- +Wed Mar 13 09:10:16 UTC 2024 - Fabian Vogt + +- Update to 6.0.2 + +------------------------------------------------------------------- +Wed Mar 6 08:40:32 UTC 2024 - Fabian Vogt + +- Update to 6.0.1 + +------------------------------------------------------------------- +Tue Mar 5 10:56:59 UTC 2024 - Fabian Vogt + +- Obsolete Plasma 5 branding + +------------------------------------------------------------------- +Wed Feb 21 18:36:37 UTC 2024 - Fabian Vogt + +- Update to 6.0.0 + +------------------------------------------------------------------- +Wed Jan 31 17:37:47 UTC 2024 - Fabian Vogt + +- Update to 5.93.0 + +------------------------------------------------------------------- +Wed Jan 17 18:39:47 UTC 2024 - Fabian Vogt + +- Update to 5.92.0 + +------------------------------------------------------------------- +Fri Nov 24 14:04:49 UTC 2023 - fabian@ritter-vogt.de + +- Update to version 84.87~git20231124T150427~8b6e0ec: + * Remove font settings (except for fixed) from kdeglobals + +------------------------------------------------------------------- +Sat Nov 18 17:33:41 UTC 2023 - fabian@ritter-vogt.de + +- Update to version 84.87~git20231118T182337~13910c9: + * Recreate openSUSEdark color scheme based on breeze with accent color + +------------------------------------------------------------------- +Wed Nov 15 23:20:03 UTC 2023 - Fabian Vogt + +- Update to version 84.87~git20231116T001840~81362d1: + * Don't set usersWallpapers in plasmarc + * Set the default wallpaper in the LnF + * Remove icons from desktopthemes + * Make LNF and panel metadata.json compatible with Plasma 6 + * Make the SDDM theme Qt 6 compatible + * Add SDDM config to use the breeze-openSUSE theme + * Port splash screen to Qt 6 + * Convert desktopthemes from metadata.desktop to metadata.json + plasmarc + * Remove openSUSEdefault desktop theme + * Remove obsolete search providers + * Remove obsolete files and settings + +------------------------------------------------------------------- +Tue Nov 14 21:53:30 UTC 2023 - Fabian Vogt + +- Initial commit based on plasma5-openSUSE diff --git a/plasma6-openSUSE.spec b/plasma6-openSUSE.spec new file mode 100644 index 0000000..10a089b --- /dev/null +++ b/plasma6-openSUSE.spec @@ -0,0 +1,143 @@ +# +# spec file for package plasma6-openSUSE +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define wallpaper_branding_version %(rpm -q --queryformat '%%{VERSION}' wallpaper-branding-openSUSE) + +# Plasma 6 pulls in Qt 5 as well, tell qml-autoreqprov what to use +%global __qml_requires_opts --qtver 6 +%global plasma_version 6.1.5 +Name: plasma6-openSUSE +Version: 84.87~git20240313T170730~9c664b7 +Release: 0 +Summary: openSUSE Plasma 6 Branding Packages +License: CC-BY-SA-4.0 AND GPL-2.0-or-later +Group: System/GUI/KDE +URL: https://github.com/openSUSE/plasma-openSUSE +# We use diffs to be as close to upstream as possible and get +# fixes directly. For files that diverge too much from upstream, +# the .tar is the right place. +Source: plasma-opensuse-%{version}.tar.xz +# Diff between /usr/share/sddm/themes/breeze-openSUSE +# and /usr/share/sddm/themes/breeze +Source3: sddmtheme.diff +# Diff between /usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js +# and /usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/contents/layout.js +Source4: panel.diff +# Diff between /usr/share/plasma/shells/org.kde.plasma.desktop/contents/layout.js +# and /usr/share/plasma/look-and-feel/org.openSUSE.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +Source5: layout.diff +BuildRequires: fdupes +BuildRequires: kf6-breeze-icons +BuildRequires: kf6-filesystem +BuildRequires: plasma6-desktop >= %{plasma_version} +#!BuildIgnore: kio-extras +#!BuildIgnore: kwin6 +BuildRequires: plasma6-workspace >= %{plasma_version} +BuildRequires: rsync +BuildRequires: wallpaper-branding-openSUSE +BuildArch: noarch + +%description + +%package -n plasma6-branding-openSUSE +Summary: openSUSE settings for KDE Plasma 6 +Group: System/GUI/KDE +Requires: distribution-logos-openSUSE-icons +Requires: plasma6-theme-openSUSE +Provides: plasma5-defaults-openSUSE = %{version} +Obsoletes: plasma5-defaults-openSUSE < %{version} +Obsoletes: plasma5-workspace-branding-openSUSE < %{version} +Requires: (plasma6-sddm-theme-openSUSE if sddm) +Supplements: (plasma6-workspace and branding-openSUSE) + +%description -n plasma6-branding-openSUSE +This package changes the default settings of Plasma 6. + +%package -n plasma6-theme-openSUSE +Summary: Plasma 6 theme for openSUSE +Group: System/GUI/KDE +Requires: plasma6-desktop >= %{plasma_version} +Requires: plasma6-workspace >= %{plasma_version} +Requires: wallpaper-branding-openSUSE +Obsoletes: plasma5-theme-openSUSE < %{version} + +%description -n plasma6-theme-openSUSE +This package contains the Plasma 6 Look-and-feel package for openSUSE. + +%package -n plasma6-sddm-theme-openSUSE +Summary: SDDM theme for openSUSE +Group: System/GUI/KDE +Requires: wallpaper-branding-openSUSE = %{wallpaper_branding_version} +Provides: sddm-theme-openSUSE = %{version} +Obsoletes: sddm-theme-openSUSE < %{version} + +%description -n plasma6-sddm-theme-openSUSE +This package contains a version of the Breeze SDDM theme customized +for openSUSE and enables it by default. + +%prep +%setup -q -n plasma-opensuse-%{version} + +%build + +%install +# Defaults +cp -a config-files/* %{buildroot} +%fdupes %{buildroot}/%{_kf6_plasmadir}/desktoptheme + +# Look-and-feel package (copy over everything that is not already in the .tar, then apply patch if there is one) +rsync -av --ignore-existing %{_kf6_plasmadir}/look-and-feel/org.kde.breeze.desktop/ %{buildroot}%{_kf6_plasmadir}/look-and-feel/org.openSUSE.desktop/ + +# Same for the SDDM theme +rsync -av --ignore-existing %{_datadir}/sddm/themes/breeze/ %{buildroot}%{_datadir}/sddm/themes/breeze-openSUSE/ +pushd %{buildroot}%{_datadir}/sddm/themes/breeze-openSUSE +patch -p2 -i %{SOURCE3} +popd + +# Same for the default panel +rsync -av --ignore-existing %{_kf6_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/ %{buildroot}%{_kf6_plasmadir}/layout-templates/org.opensuse.desktop.defaultPanel/ +patch -o %{buildroot}%{_kf6_plasmadir}/layout-templates/org.opensuse.desktop.defaultPanel/contents/layout.js -i %{SOURCE4} %{_kf6_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js + +# And the desktop layout +mkdir -p %{buildroot}%{_kf6_plasmadir}/look-and-feel/org.openSUSE.desktop/contents/layouts/ +patch -o %{buildroot}%{_kf6_plasmadir}/look-and-feel/org.openSUSE.desktop/contents/layouts/org.kde.plasma.desktop-layout.js -i %{SOURCE5} %{_kf6_plasmadir}/shells/org.kde.plasma.desktop/contents/main.js +chmod 644 %{buildroot}%{_kf6_plasmadir}/look-and-feel/org.openSUSE.desktop/contents/layouts/org.kde.plasma.desktop-layout.js + +%files -n plasma6-branding-openSUSE +%license COPYING +# TODO: Move to /usr/etc/xdg, once confirmed this works everywhere +%config %{_kf6_configdir}/*rc +%config %{_kf6_configdir}/kdeglobals + +%files -n plasma6-theme-openSUSE +%license COPYING +%{_kf6_plasmadir}/ +%{_kf6_sharedir}/color-schemes/ +%{_kf6_sharedir}/icons/* + +%files -n plasma6-sddm-theme-openSUSE +%license COPYING +%dir %{_kf6_sharedir}/sddm/ +%dir %{_kf6_sharedir}/sddm/themes/ +%{_kf6_sharedir}/sddm/themes/breeze-openSUSE/ +%dir %{_prefix}/lib/sddm/ +%dir %{_prefix}/lib/sddm/sddm.conf.d/ +# This overrides 10-plasma.conf from sddm-qt6-branding-openSUSE +%{_prefix}/lib/sddm/sddm.conf.d/20-breeze-openSUSE.conf + +%changelog diff --git a/sddmtheme.diff b/sddmtheme.diff new file mode 100644 index 0000000..d357e21 --- /dev/null +++ b/sddmtheme.diff @@ -0,0 +1,11 @@ +diff --git a/breeze/theme.conf b/breeze-openSUSE/theme.conf +index 35c2a13..4d0709a 100644 +--- a/breeze/theme.conf ++++ b/breeze-openSUSE/theme.conf +@@ -4,5 +4,5 @@ + type=image + color=#1d99f3 + fontSize=10 +-background=/usr/share/wallpapers/Next/contents/images/5120x2880.png ++background=/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.png + needsFullUserModel=false