Accepting request 1244613 from KDE:Frameworks

Plasma 6.3

OBS-URL: https://build.opensuse.org/request/show/1244613
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma6-welcome?expand=0&rev=18
This commit is contained in:
Ana Guerrero 2025-02-10 16:27:25 +00:00 committed by Git OBS Bridge
commit 2f4d3fd524
7 changed files with 95 additions and 44 deletions

View File

@ -1,33 +1,57 @@
From f0375048f336740dd2239369df7be18a619ec8e8 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Sun, 11 Aug 2024 21:21:11 +0200
From c6ff8dcf4ea993bc95aa00ae6f7e499d457a32bc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 11 Jan 2025 19:21:42 +0100
Subject: [PATCH] Use the openSUSE wallpaper
This is unfortunately hardcoded. Use our default to more likely match what
the user sees.
---
src/qml/mock/MockCard.qml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
sed -i "s#wallpapers/Next/contents/images/1920x1080.png#wallpapers/openSUSEdefault/contents/images/1920x1200.png#g" src/qml/mock/*.qml
---
src/qml/mock/MockActivities.qml | 2 +-
src/qml/mock/MockCard.qml | 2 +-
src/qml/mock/MockOverview.qml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/qml/mock/MockActivities.qml b/src/qml/mock/MockActivities.qml
index 0b9a00b..284fed9 100644
--- a/src/qml/mock/MockActivities.qml
+++ b/src/qml/mock/MockActivities.qml
@@ -107,7 +107,7 @@ Item {
// We're intentionally ignoring our 16:10 desktop wallpaper (MockDesktop) - whilst that fits the square
// window, we want to maximise what we can fit in our limited height and be more representative of what
// a user will see - most use a 16:9 display.
- source: "file:" + Controller.installPrefix() + "/share/wallpapers/Next/contents/images/1920x1080.png"
+ source: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
mipmap: true
}
diff --git a/src/qml/mock/MockCard.qml b/src/qml/mock/MockCard.qml
index 356e96a..cc29eb5 100644
index c2c9754..c7dbf7d 100644
--- a/src/qml/mock/MockCard.qml
+++ b/src/qml/mock/MockCard.qml
@@ -21,12 +21,12 @@ Kirigami.AbstractCard {
property int backgroundAlignment: Qt.AlignRight | Qt.AlignBottom
@@ -22,7 +22,7 @@ Kirigami.AbstractCard {
property double backgroundScale: 1
property int blurRadius: 32
- readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/Next/contents/images/1280x800.png"
+ readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1280x1024.png"
readonly property int desktopWidth: wallpaperImage.sourceSize.width
readonly property int desktopHeight: wallpaperImage.sourceSize.height
- readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/Next/contents/images/1920x1080.png"
+ readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
readonly property int desktopWidth: 1024 * backgroundScale
readonly property int desktopHeight: 576 * backgroundScale
/*
- * 1280x800 is chosen to look good at normal window sizes: The aspect closely
+ * 1280x1024 is chosen to look good at normal window sizes: The aspect closely
* matches that of the mock as shown in the application and is not too large.
*
* The background be positioned according to the alignment, and expand to fit
diff --git a/src/qml/mock/MockOverview.qml b/src/qml/mock/MockOverview.qml
index 37e3156..9aca7c4 100644
--- a/src/qml/mock/MockOverview.qml
+++ b/src/qml/mock/MockOverview.qml
@@ -21,7 +21,7 @@ Item {
// We're intentionally ignoring our 16:10 desktop wallpaper (MockDesktop) - whilst that fits the square
// window, we want to be more representative of what a user will see - most use a 16:9 display.
- readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/Next/contents/images/1920x1080.png"
+ readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
readonly property double scale: layout.scale
// Underlay
--
2.46.0
2.47.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9a2ae0cad82ef9feae7471f625628d7df7098255ea8ee71fab78ed48539261a
size 693712

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmdy7UgACgkQ11dEg7tX
sY2tpw//Vw1guzXUhDQVSemBdqwG14ZD3BlqWA+2tRTN5EeB4tdEl+oF78ZnMJAx
1bGLz9rHm8if4WaZH5zhADXO0xWvtqM7YGSFGMA9MUylPtxdHL5OvbBDoGUjdzAV
3a1BrijTX0yEkUYtpM4uMBXsWxC0RlNPypoFUCI8IAlQTNn9whjcttPdKidnXVv2
j88h+78i7DJFMeZHGiCu9tknvIuTxPFPh2g3tsS8ygMwbDgfJZk1NvGSAQ3COrWJ
R9wMqVoIXMtiRB1mNgpN1tuUlZSp716U7NEzcz4HKl/TLqKMaCbiGzwbzFzxqq6S
VbeYMrZZWyWeI5zVeAf95qDhZtjetonxPGcAibcxV4QNyCADERplNPlFSSAntQeK
PzCL8K1cDgQMUTyOVjTx8h8Dh1GcSDvQH95fzTDXJjdBJv0fcyw1b75myMTKIt1m
HtA78s36y4s3UlGLeuehZNIt+fIlEedDJt/H9Kr71NR8a7kD+j75rIgbF8Hm42N0
XpRpvrFZb7gcTZjs8CggjYRDovHaHyvy5IAIH/7Ijdfe527XL5CBRgH4nOxWdwxO
Kc6wrlsKn2UEg2hIerbZNnZoHFCnrbVYZ1V9UwNkfg/rdP+PJPlc2sXN1KLDgDJe
UhZGhQsYHJA2xEh3iMyHJeJezMcG3LvH1Ste5J7zB1wt+cBBry8=
=/FKX
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7e884178c1cd1aa0ac26073bd9cf124d0a3be3926c0240b7974778067211984
size 703132

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmekluQACgkQ11dEg7tX
sY2uVA//YAD2VXiXkVX0o72hynX4VTxQscUFszfKIoDivdNe5uPQU7E7MbgcQWen
n4lOmmPZFSqlnFfrdZ61D5qrJDyowDFk3AyqezNQe2gpJ6GgUQQmT1t03twdlFzh
4wtVayRRtLo/G7li9WPDX7V0aSXTx4V5/GjKnShKIygNxdjN98y717S69ITO3Unt
EmzEnhuXahe7Rdx2BedA3QxYyFurAlyXUZE/SJvLdhQglFJjVGD8qdjKFGt7YJOZ
iWuFIQDQFN6Kk3cQOfPrmtKETMKEMNag3JPwMl8suvegFp3AD2dUcPZ3og+WsCIb
8kcWiHcte38hE902CZ0tn3XdlWznKogKudEzqnsPkzzTUMDzx+wBB4AJezjiDk/X
+2QWfF1XQcei3elaYPlk9neoYfj1lO4BG9DHb+7BicX/qMuXD7hDDd6bhNhBW9h3
HxkuvMXIMlsSGn2o9L3Xu5j5gZQjAg+A9DuJDk3hewAMwdCfksm7PaTHh10YycHC
e4ls3hhAItAzfwky8bvfHatiaVqqsq2QLt4xO8PLJ42QprpAPkpWRE7NMh2tYSER
M+eEhdsqreXQyhAy2b66JjdNAQMCNbeJ5YxJTgmD4+l9DwWjC6OOdKij9BJBFMqY
newT1cDrsVH+dJdxH1uM1cEKg77WRhCRIc3C3eeEGK7gGwp56Ic=
=+40j
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Thu Feb 6 13:47:13 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.3.0:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.3.0
- Changes since 6.2.91:
* update version for new release
-------------------------------------------------------------------
Thu Jan 23 13:46:58 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.91:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.2.91
- Changes since 6.2.90:
* update version for new release
* enjoy/Supporters: Update supporters
-------------------------------------------------------------------
Sat Jan 11 18:29:04 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.90:
* New feature release
* For more details see https://kde.org/announcements/plasma/6/6.2.90
- Too many changes to list here
-------------------------------------------------------------------
Tue Dec 31 20:50:29 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package plasma6-welcome
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
#
%define kf6_version 6.5.0
%define kf6_version 6.10.0
%define qt6_version 6.7.0
%define rname plasma-welcome
@ -26,14 +26,14 @@
%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}
%bcond_without released
Name: plasma6-welcome
Version: 6.2.5
Version: 6.3.0
Release: 0
Summary: Onboarding wizard for Plasma
License: GPL-2.0-only OR GPL-3.0-only
URL: https://invent.kde.org/plasma/plasma-welcome
Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
Source: %{rname}-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
Source1: %{rname}-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-OPENSUSE