12
0

Accepting request 1283553 from openSUSE:Factory

Resubmit 6.4 beta post TW revert

OBS-URL: https://build.opensuse.org/request/show/1283553
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-welcome?expand=0&rev=59
This commit is contained in:
Christophe Marin
2025-06-06 07:44:47 +00:00
committed by Git OBS Bridge
parent e45f96c325
commit ca91d8bc7c
5 changed files with 47 additions and 48 deletions

View File

@@ -13,45 +13,42 @@ sed -i "s#wallpapers/Next/contents/images/1920x1080.png#wallpapers/openSUSEdefau
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 {
Index: plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockActivities.qml
===================================================================
--- plasma-welcome-6.3.80git.20250401T013956~eef0830.orig/src/qml/mock/MockActivities.qml 2025-04-01 03:39:56.000000000 +0200
+++ plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockActivities.qml 2025-04-01 08:46:00.810327705 +0200
@@ -107,7 +107,7 @@
// 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"
- source: "file:" + Private.App.installPrefix + "/share/wallpapers/Next/contents/images/5120x2880.png"
+ source: "file:" + Private.App.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 c2c9754..c7dbf7d 100644
--- a/src/qml/mock/MockCard.qml
+++ b/src/qml/mock/MockCard.qml
@@ -22,7 +22,7 @@ Kirigami.AbstractCard {
Index: plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockCard.qml
===================================================================
--- plasma-welcome-6.3.80git.20250401T013956~eef0830.orig/src/qml/mock/MockCard.qml 2025-04-01 03:39:56.000000000 +0200
+++ plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockCard.qml 2025-04-01 08:46:34.753303169 +0200
@@ -23,7 +23,7 @@
property double backgroundScale: 1
property int blurRadius: 32
- 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 string wallpaper: "file:" + Private.App.installPrefix + "/share/wallpapers/Next/contents/images/5120x2880.png"
+ readonly property string wallpaper: "file:" + Private.App.installPrefix + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
readonly property int desktopWidth: 1024 * backgroundScale
readonly property int desktopHeight: 576 * backgroundScale
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 {
Index: plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockOverview.qml
===================================================================
--- plasma-welcome-6.3.80git.20250401T013956~eef0830.orig/src/qml/mock/MockOverview.qml 2025-04-01 03:39:56.000000000 +0200
+++ plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockOverview.qml 2025-04-01 08:46:52.706234697 +0200
@@ -20,7 +20,7 @@
// 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 string wallpaper: "file:" + Private.App.installPrefix + "/share/wallpapers/Next/contents/images/5120x2880.png"
+ readonly property string wallpaper: "file:" + Private.App.installPrefix + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
readonly property double scale: layout.scale
// Underlay
--
2.47.0

View File

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

View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmgaTgAACgkQ11dEg7tX
sY2JQA//aTjwB2bqgux+H/xg1JOeMIAdQKqRS9QXPOfBSG0DbOWgeaLutWEVZWNX
BOZ8eLTMor0vR8nCDV7N0jG2qhGavNHRguUhwDaDxac8yWBPeajTX6MDW0kctFNN
8qUsLzKZP7Et9+HD9/k9g6fdO4Gzsvu9MtSIXmMulN2AaV3e/lN/z0KTJC3iOpJh
z8OY1C6plVvfoBumVp42h95ZdQk4NggW89aF9+Rx1i/DjF6a4FT1UvBLM0r1tr0a
yGhBesfLlIP1OXCa8uw8DmP2lcqG0DS2ys9mTJoysnZFiL9KSfqbC0grOJkAa2Z4
rj/7X2BOFIZ2fN8rngCMSfCyppo52COuFEqiMSgV/G/9gQw8D6oLytkbW8VLOIr1
IbDKpk/W0psdFu/W0Ns5sYrp0NtrWs5B4EKpVCllatjio7CQEtub6NH0Azpk9YFR
MiuR59IFMZonRYPFzq9QSRCrCgvrEmasl4ErGvuaiQLc3ZH0P5QZSQWaWInv2N0p
bGvWq07nZ+SY9ngtSpIJcknwZAvi/EDVh6gPN688TXNNlqH7ijUTMW5ORpYmMWA2
j4GhCsETNRBfwh4yBL3WeqWkkS5jeCVi5WIFU5oF3M6apIkzgYhCwfjEJ/7rUUS6
orn8wiP7fMACQp0oAm9zWt16KpNF0Mh8ekJR134yaP1PXlo2yi8=
=V1Ss
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu May 29 21:23:14 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.3.91:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.3.91
- Changes since 6.3.90:
* Update version for new release 6.3.91
-------------------------------------------------------------------
Mon May 19 19:38:44 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.3.90:
* New feature release
* For more details see https://kde.org/announcements/plasma/6/6.3.90
- Too many changes to list here
-------------------------------------------------------------------
Tue May 6 20:13:00 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@@ -16,8 +16,8 @@
#
%define kf6_version 6.10.0
%define qt6_version 6.7.0
%define kf6_version 6.14.0
%define qt6_version 6.8.0
%define rname plasma-welcome
# Full Plasma 6 version (e.g. 6.0.0)
@@ -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.3.5
Version: 6.3.91
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: https://download.kde.org/unstable/plasma/%{version}/%{rname}-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
Source1: https://download.kde.org/unstable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-OPENSUSE
@@ -84,6 +84,8 @@ how to connect to the internet, install apps, customize the system, and more!
%install
%kf6_install
rm %{buildroot}%{_kf6_libdir}/libplasma-welcome-publicplugin.a
%find_lang plasma-welcome
%files
@@ -91,6 +93,8 @@ how to connect to the internet, install apps, customize the system, and more!
%{_kf6_applicationsdir}/org.kde.plasma-welcome.desktop
%{_kf6_appstreamdir}/org.kde.plasma-welcome.appdata.xml
%{_kf6_bindir}/plasma-welcome
%dir %{_kf6_qmldir}/org/kde/plasma
%{_kf6_qmldir}/org/kde/plasma/welcome/
%{_kf6_plugindir}/kf6/kded/kded_plasma-welcome.so
%files lang -f plasma-welcome.lang