Accepting request 1289919 from KDE:Frameworks

Plasma 6.4.2, untested (forwarded request 1289775 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1289919
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma6-welcome?expand=0&rev=28

0001-Use-the-openSUSE-wallpaper.patch

@@ -1,34 +1,54 @@
-From fb7b5af1ef98643e84d40e58174d48ba22723253 Mon Sep 17 00:00:00 2001
+From c6ff8dcf4ea993bc95aa00ae6f7e499d457a32bc Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
+From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 12 Apr 2024 07:51:45 +0200
+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.
+
+sed -i "s#wallpapers/Next/contents/images/1920x1080.png#wallpapers/openSUSEdefault/contents/images/1920x1200.png#g" src/qml/mock/*.qml
 ---
- src/qml/mock/MockDesktop.qml | 6 +++---
+ src/qml/mock/MockActivities.qml | 2 +-
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 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/MockDesktop.qml b/src/qml/mock/MockDesktop.qml
+Index: plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockActivities.qml
-index d9c906c..19c7b26 100644
+===================================================================
---- a/src/qml/mock/MockDesktop.qml
+--- plasma-welcome-6.3.80git.20250401T013956~eef0830.orig/src/qml/mock/MockActivities.qml	2025-04-01 03:39:56.000000000 +0200
-+++ b/src/qml/mock/MockDesktop.qml
++++ plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockActivities.qml	2025-04-01 08:46:00.810327705 +0200
-@@ -14,12 +14,12 @@ Item {
+@@ -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:" + Private.App.installPrefix + "/share/wallpapers/Next/contents/images/5120x2880.png"
++                    source: "file:" + Private.App.installPrefix + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
+                     mipmap: true
+                 }
  
-     property int backgroundAlignment: Qt.AlignRight | Qt.AlignBottom
+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/1280x800.png"
+-    readonly property string wallpaper: "file:" + Private.App.installPrefix + "/share/wallpapers/Next/contents/images/5120x2880.png"
-+    readonly property string wallpaper: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1280x1024.png"
++    readonly property string wallpaper: "file:" + Private.App.installPrefix + "/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png"
-     readonly property int desktopWidth: 1280
+     readonly property int desktopWidth: 1024 * backgroundScale
--    readonly property int desktopHeight: 800
+     readonly property int desktopHeight: 576 * backgroundScale
-+    readonly property int desktopHeight: 1024
  
-     /*
+Index: plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockOverview.qml
--     * 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
+--- plasma-welcome-6.3.80git.20250401T013956~eef0830.orig/src/qml/mock/MockOverview.qml	2025-04-01 03:39:56.000000000 +0200
-      * matches that of the mock as shown in the application and is not too large.
++++ plasma-welcome-6.3.80git.20250401T013956~eef0830/src/qml/mock/MockOverview.qml	2025-04-01 08:46:52.706234697 +0200
-      *
+@@ -20,7 +20,7 @@
-      * The background be positioned according to the alignment, and expand to fit
--- 
-2.44.0
  
+     // 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:" + 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

plasma-welcome-6.1.5.tar.xz

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

plasma-welcome-6.1.5.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmbgCLkACgkQ11dEg7tX
-sY0TQg/8CypPoVASd3sSFBfx2rG9Os7hSLKCQDSSQ468QVV8UkUqEvYzWsKCmh+U
-9wdcP+cVVRV9kAsBW6aX9a2sA3shjn9kzrP2StvQWKQ+cKB5rx4gd1nMD8c1Mdjb
-cIA2ICbBskElnjwFRpupR9mqWvlSLwoGvXcu/VlivDxfBDlctceE+VRQdV4x+Kwn
-XvajNOqP5pHLt4I7lLLcFbL7Sh98somLYLXlTyfa8/tQY3WbheSbW1NctMKv8DEW
-I8NIwarVfj+eQ1xaZAgJTXv10nqK6lwR5p6gV1MwC4XKEKTmGRW5UyJxk8qbC4C7
-NaMB0C9pQk+u5E3aa0yWLuf5szMJUv0ZldEI3PPLJ6cl4Qx6aLjkdJMnxlu57ghH
-2n7uS9V0KA5I9hj117RXBY4aP9JtiNliTWeA9j7bHCPXSoGodUY3ABw2ViFTipqi
-eKDUuj7Nhodmhb/WFTpCocspe2IKKNtJdkvD7amDup3tCmWvJR82k3bFX2FXbKgw
-fBQPLERiiXooMqvfsgmyICsXByQ63Rotby17oz7FJSOI3mJQaDAIvVVHXV0Xc3i5
-/LBbNcD4xivheGImnYfKswNCCseP+EezOy1Ex7sYRRcJNxWTbPGT6XFss7CyYSDG
-ik5tplckeCUj/Ki86ivy36fY+Ii0Uz68gijhIWDAEpjgVSnQ6DM=
-=nu5Y
------END PGP SIGNATURE-----

plasma-welcome-6.4.2.tar.xz

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

plasma-welcome-6.4.2.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmhjycQACgkQEZaMRJKM
+rvz7lQf/cnHKOTBV5P28zcO2d4Pmdrkc4UEMudGkij/C41bO33qFiUpSckWb4lM3
+8CvFYmWgLFOdmSfQ85n+u234F7U0EgEHLOSbtOyhfdTjfXZkMD9P1FTCxUR25fjj
+PPBSxL+lAN62y+pkutCPldMwemDmzswrMc3OB7uLCpRVzkmS4cpotk97EK6NsY7d
+xwU6K1F8swduqXag48HywgEBix3+g06jFsaFv2uBH0FTPsVxc/b8xku2ri5bBdWv
+k2PFXzWgTefq9T334cJ1aMCVEtz5xr3pwjLN3yXKWghatc2CIFGKbvtT7bGHCJV6
+vPzMBgD/O7s7d1lR9eH7bgod0R1psg==
+=gC0z
+-----END PGP SIGNATURE-----

plasma6-welcome.changes

@@ -1,3 +1,190 @@
+-------------------------------------------------------------------
+Tue Jul  1 13:11:35 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.4.2:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.4.2
+- Changes since 6.4.1:
+  * Update version for new release 6.4.2
+
+-------------------------------------------------------------------
+Tue Jun 24 11:56:03 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.4.1:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.4.1
+- Changes since 6.4.0:
+  * Update version for new release 6.4.1
+  * kde-ci: Fix CI Missing kcmutils dependency breaks CI.
+  * Don't break announcement URL on C locale (with e.g. musl libc)
+
+-------------------------------------------------------------------
+Thu Jun 12 10:37:56 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.4.0:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.4.0
+- Changes since 6.3.91:
+  * Update version for new release 6.4.0
+
+-------------------------------------------------------------------
+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>
+
+- Update to 6.3.5:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.3.5
+- Changes since 6.3.4:
+  * update version for new release
+
+-------------------------------------------------------------------
+Wed Apr  2 10:06:01 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.3.4
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/6/6.3.4
+- Changes since 6.3.3:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Mar 11 14:44:50 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.3.3:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.3.3
+- Changes since 6.3.2:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Feb 25 19:38:56 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.3.2:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.3.2
+- Changes since 6.3.1:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Feb 18 14:45:59 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.3.1:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.3.1
+- Changes since 6.3.0:
+  * update version for new release
+  * Fixes for the software renderer
+  * Setup single-instance earlier
+  * Remember window geometry (kde#499653)
+  * update version for new release
+
+-------------------------------------------------------------------
+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>
+
+- Update to 6.2.5:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.5
+- Changes since 6.2.4:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Nov 26 15:47:37 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.2.4:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.4
+- Changes since 6.2.3:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Nov  5 13:30:39 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.2.3:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.3
+- Changes since 6.2.2:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Oct 22 14:08:39 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.2.2:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.2
+- Changes since 6.2.1:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Oct 15 16:53:49 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.2.1:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.1
+- Changes since 6.2.0:
+  * update version for new release
+
+-------------------------------------------------------------------
+Sat Oct  5 10:44:34 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.2.0:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.0
+- Changes since 6.1.90:
+  * update version for new release
+  * enjoy/Supporters: Update supporters
+
+-------------------------------------------------------------------
+Tue Sep 17 14:54:33 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.1.90:
+  * New feature release
+  * For more details see https://kde.org/announcements/plasma/6/6.1.90
+- Too many changes to list here
+- Rebase 0001-Use-the-openSUSE-wallpaper.patch
+
 -------------------------------------------------------------------
 Tue Sep 10 14:55:03 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
 

plasma6-welcome.spec

@@ -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,8 +16,8 @@
 #
 
 
-%define kf6_version 6.2.0
+%define kf6_version 6.14.0
-%define qt6_version 6.6.0
+%define qt6_version 6.8.0
 
 %define rname plasma-welcome
 # Full Plasma 6 version (e.g. 6.0.0)
@@ -26,7 +26,7 @@
 %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}
 %bcond_without released
 Name:           plasma6-welcome
-Version:        6.1.5
+Version:        6.4.2
 Release:        0
 Summary:        Onboarding wizard for Plasma
 License:        GPL-2.0-only OR GPL-3.0-only
@@ -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