From cef5f515f2ec7df442ed2550351c252b76425e58bd59c1faec93de30fe8fd285 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 16 Jun 2024 08:35:41 +0000 Subject: [PATCH] Plasma 6.1 maybe final, somewhat tested. KDE:Frameworks already publish disabled. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-welcome?expand=0&rev=16 --- 0001-Use-the-openSUSE-wallpaper.patch | 61 +++++++++++---------------- plasma-welcome-6.0.5.tar.xz | 3 -- plasma-welcome-6.0.5.tar.xz.sig | 16 ------- plasma-welcome-6.1.0.tar.xz | 3 ++ plasma-welcome-6.1.0.tar.xz.sig | 16 +++++++ plasma6-welcome.changes | 21 +++++++++ plasma6-welcome.spec | 6 +-- 7 files changed, 68 insertions(+), 58 deletions(-) delete mode 100644 plasma-welcome-6.0.5.tar.xz delete mode 100644 plasma-welcome-6.0.5.tar.xz.sig create mode 100644 plasma-welcome-6.1.0.tar.xz create mode 100644 plasma-welcome-6.1.0.tar.xz.sig diff --git a/0001-Use-the-openSUSE-wallpaper.patch b/0001-Use-the-openSUSE-wallpaper.patch index a85f2dc..d8ac7ae 100644 --- a/0001-Use-the-openSUSE-wallpaper.patch +++ b/0001-Use-the-openSUSE-wallpaper.patch @@ -1,45 +1,34 @@ -From 415dd3c73947089cd567754b3237017b7b4e5725 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Fri, 20 Jan 2023 10:27:14 +0100 +From fb7b5af1ef98643e84d40e58174d48ba22723253 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Fri, 12 Apr 2024 07:51:45 +0200 Subject: [PATCH] Use the openSUSE wallpaper This is unfortunately hardcoded. Use our default to more likely match what the user sees. --- - src/contents/ui/pages/Network.qml | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + src/qml/mock/MockDesktop.qml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/contents/ui/pages/Network.qml b/src/contents/ui/pages/Network.qml -index ed2c445..02cf3c9 100644 ---- a/src/contents/ui/pages/Network.qml -+++ b/src/contents/ui/pages/Network.qml -@@ -74,10 +74,10 @@ GenericPage { - Image { - anchors.fill: parent - fillMode: Image.PreserveAspectCrop -- source: "file:" + Controller.installPrefix() + "/share/wallpapers/Next/contents/images/1024x768.png" -+ source: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1280x1024.jpg" - // anchor the image to the bottom-right corner of the "screen" -- sourceClipRect: Qt.rect(1024-parent.width, -- 768-parent.height, -+ sourceClipRect: Qt.rect(1280-parent.width, -+ 1024-parent.height, - parent.width, - parent.height) - } -@@ -86,9 +86,9 @@ GenericPage { - Image { - anchors.fill: panelContainer - fillMode: Image.PreserveAspectCrop -- source: "file:" + Controller.installPrefix() + "/share/wallpapers/Next/contents/images/1024x768.png" -- sourceClipRect: Qt.rect(1024-panelContainer.width, -- 768-panelContainer.height, -+ source: "file:" + Controller.installPrefix() + "/share/wallpapers/openSUSEdefault/contents/images/1280x1024.jpg" -+ sourceClipRect: Qt.rect(1280-panelContainer.width, -+ 1024-panelContainer.height, - panelContainer.width, - panelContainer.height) +diff --git a/src/qml/mock/MockDesktop.qml b/src/qml/mock/MockDesktop.qml +index d9c906c..19c7b26 100644 +--- a/src/qml/mock/MockDesktop.qml ++++ b/src/qml/mock/MockDesktop.qml +@@ -14,12 +14,12 @@ Item { + property int backgroundAlignment: Qt.AlignRight | Qt.AlignBottom + +- 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: 1280 +- readonly property int desktopHeight: 800 ++ readonly property int desktopHeight: 1024 + + /* +- * 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 -- -2.41.0 +2.44.0 diff --git a/plasma-welcome-6.0.5.tar.xz b/plasma-welcome-6.0.5.tar.xz deleted file mode 100644 index d7f42f7..0000000 --- a/plasma-welcome-6.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c28632650dca030fd9a9365dbc56fe0898e6d4863c24625ad6e503c1cc23ec6 -size 909304 diff --git a/plasma-welcome-6.0.5.tar.xz.sig b/plasma-welcome-6.0.5.tar.xz.sig deleted file mode 100644 index 2cf530f..0000000 --- a/plasma-welcome-6.0.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZM0KYACgkQ11dEg7tX -sY3WQw/8CzREfyWY0SIMJ1YZ/uheVYYstbXLk+GoGveORjhC8tM5DF2ACRp+Y6tb -uFJBvgis9gCcy/pvt/xGEq/PEyDbuRKVCUT36KP9zrVYYpB1zbl7wnB9pnVVPm8O -KmH+l5/hMfGF0bUK9/EBM1Zn871lwLPIshdKa93TRwVv/YQ1o4DqhNKZX+AT+XFx -9T61mm38orGGTuHMh7AWIsmGqa4ax7aj5I2/hP/2Eu0HrRZru7V4+TOOCm8D4iUd -qxAeU6xbR3vBfOzcwe1CB8R1ALWt3yoSDYH49dC/C5BrTGjsblgYOlW1daPbs+ap -mSg4dQ3+9dCSZbrLUD4OscGIgx5u95rME9bxttucDTEZRQNiP62ZHVLLGk79+Tj2 -XsAlSDmOq83lPCLstjs+M+9/ShHS6/Ql7eLyRRb+tAUwV/1NujU7DIEuMhiGokmq -EZ6mGBZehyaK4KHYyeCDiSP5kaKlkfkJf3qz7HjQTNna9NJ9voyaRhk8BUSaF0du -ywmVOXs3hVKUDE7cdod/ejV0rvebxwlgMnfVV1gIf0TGjI/XzI4TqJRZoKfdBjJ4 -OSgbAJsTkAjLnJXpy81ic757vBlujPTuS0B5qDz+DDPjpP1ZzT6H3g4F+NBtKFrK -yg0fUZUmH0IEPWAfUyP464XgpasSkjRD0LsHmvIYy193xgMBPqQ= -=nT+d ------END PGP SIGNATURE----- diff --git a/plasma-welcome-6.1.0.tar.xz b/plasma-welcome-6.1.0.tar.xz new file mode 100644 index 0000000..8343dfd --- /dev/null +++ b/plasma-welcome-6.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18317cab08998b1504c5dd8914037a40ca95edb440f45c6137a66afdf8a2f700 +size 660572 diff --git a/plasma-welcome-6.1.0.tar.xz.sig b/plasma-welcome-6.1.0.tar.xz.sig new file mode 100644 index 0000000..6055b51 --- /dev/null +++ b/plasma-welcome-6.1.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZqy7IACgkQ11dEg7tX +sY3XKxAAtvn48F0LC/9DITEAmUDZksShYtkNx/CJb9GA/fOkZJ4n2EKQi/HXSz4z +TpZpuYYVB808W3pbS8yN4zgEshEhX6RENLyDsRILut+/KADokT3CuzA2HTgZ5lvN +8h8pkbWIqyqcw5T0wd1Hp6eO79wQS0aTS1D/Utlpove+a1Vs1tAfX4gsfRrXXKHu +a9wsTjk7MlrHjkZTmRpUDlrBYB0AZu0s68dJ8+H7nkawFirGsSkp2n2QrOxB6e6d +pWBGZBsMnS8/iH1kVEbuqw/GCH4lTL7mG9dy9kTwYlju9bHKdbb9qScdqthGabs1 +N9LRYQLy7rzEoNRfv4yE/PdPgXPSKqtYPAVuNI0WLYsJqiOb48zdUPrV0aw9GpCd +bpvm4ag/ihJeUlLwY8L2U27kNlf50pVF9EvJOVBjH/XG+YZ3YmgLJg0UjgPFjJDi ++T3LFh0vcscgUmrTI30T06LKeFiOO9YnWXDLRKZhkN7wPbXwRiUSPwCbvXyGyiI8 +YUWfV9ZvNV1tnYa6A0CWm5PukwKMfn91mkoqQ75L/nwJtfBINEFNIoHxKzUbnjrR +v956EIRPjdnrmvp2FooasqmUy7/qguSWMHMm7qVGUPS3C+Jj5pUZM1IWUMyOFgua +IyYslRMTqzTt7QC8MMh0SjU9gxRADZ4MIlDrIR71NOb5Vjm8gVw= +=qWqd +-----END PGP SIGNATURE----- diff --git a/plasma6-welcome.changes b/plasma6-welcome.changes index bc3385e..220ac26 100644 --- a/plasma6-welcome.changes +++ b/plasma6-welcome.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Jun 13 10:58:51 UTC 2024 - Fabian Vogt + +- Update to 6.1.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.0 +- Changes since 6.0.90: + * update version for new release + * appstream versions + * update version for new release +- Edit 0001-Use-the-openSUSE-wallpaper.patch, it's a .png file on + Tumbleweed now + +------------------------------------------------------------------- +Sat May 25 11:19:41 UTC 2024 - Fabian Vogt + +- Update to 6.0.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.0.90 +- Too many changes to list here + ------------------------------------------------------------------- Wed May 22 07:43:18 UTC 2024 - Fabian Vogt diff --git a/plasma6-welcome.spec b/plasma6-welcome.spec index f871a4f..caafb15 100644 --- a/plasma6-welcome.spec +++ b/plasma6-welcome.spec @@ -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.0.5 +Version: 6.1.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