Christophe Marin
2025-05-30 15:49:18 +00:00
committed by Git OBS Bridge
parent 9bfcc886db
commit 46ed032cd3
7 changed files with 78 additions and 15 deletions

View File

@@ -0,0 +1,45 @@
From 656dfcf370a75ef22962de11a23512e67210f44c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 30 May 2025 00:34:48 +0200
Subject: [PATCH] Revert "hdrcalibrator: install the image instead of including
it in the module"
This reverts commit a7ae8cf2de28636179867206574ef4cda47b6a1e.
---
hdrcalibrator/CMakeLists.txt | 3 ++-
hdrcalibrator/ui/Main.qml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hdrcalibrator/CMakeLists.txt b/hdrcalibrator/CMakeLists.txt
index 1fd4eaa4..ab11f855 100644
--- a/hdrcalibrator/CMakeLists.txt
+++ b/hdrcalibrator/CMakeLists.txt
@@ -6,10 +6,11 @@ qt_add_qml_module(hdrcalibrator
URI org.kde.hdrcalibrator
QML_FILES
ui/Main.qml
+ RESOURCES
+ "ui/images/graz.png"
DEPENDENCIES
QtQuick
)
-install(FILES "ui/images/graz.png" DESTINATION "${KDE_INSTALL_DATADIR}/kscreen")
qt6_generate_wayland_protocol_client_sources(hdrcalibrator
FILES ${WaylandProtocols_DATADIR}/staging/color-management/color-management-v1.xml
diff --git a/hdrcalibrator/ui/Main.qml b/hdrcalibrator/ui/Main.qml
index 2982d773..a85c5e1d 100644
--- a/hdrcalibrator/ui/Main.qml
+++ b/hdrcalibrator/ui/Main.qml
@@ -204,7 +204,7 @@ Window {
Image {
width: parent.width
height: parent.height
- source: StandardPaths.locate(StandardPaths.GenericDataLocation, "kscreen/graz.png")
+ source: "images/graz.png"
fillMode: Image.PreserveAspectFit
}
}
--
2.49.0

View File

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

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmglzpkACgkQEZaMRJKM
rvwdbQf/T4IiJHkqm78a4+qKYrSK7dm8hbcuoHzLYNgAx9ikOua1Vadv4SI+lGNJ
aZDNDUQ81xNQfYC//DgB0i+pvJdhcSDmzZosji6tTeksnO4kutch13zUwDQBnhL9
2rDXBMmaxfBg2VhC9Ahyj+zFh7SzPJ9UunhzhuqVz/5qIm4Y88e8kHBZUr03p6fQ
iM3ANOqlhrOzokW+F/1eT2osLMH3MYFwG/gbLS/RA0/sB39Bv6dEbSVH1t1czHHW
XxP4REF/XK3KeY89hFqyd2fhsrdHb40f8IEvJOF1GTjprLeGWrHtkaoddIOMd/BU
WrA0nYVIClf86rq9ve0e/19MDZfnrA==
=LDTZ
-----END PGP SIGNATURE-----

3
kscreen-6.3.91.tar.xz Normal file
View File

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

11
kscreen-6.3.91.tar.xz.sig Normal file
View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmg4L8kACgkQEZaMRJKM
rvzhNwf/RY2mCnnIBHUMdYTwGqqYstRqf4IfqNhf36PyfqKJzeD86xQHBJEaN5qx
h+HW2CufUTGSthQoUYj5K6vJfeO1/rt4xzfE7UvLE1nmRXKNJSfoBR1IiBVpAazz
lWQLgfTyMGNyNFD+07jYNb4zupHwh25OQ+sjTKwwhUObkkUiBY/wUQJ1boZClO/p
4VqLjpht+cOrDiqc0Q38HT3uaL51DYZUBefHOFHpGJXHoGFetehY8WrwlkUpz4jy
AQIHQ7hEzwj30yCxHlO3S2HidrmoWx1auifNeQChnFc2FEbXA5hHM0djVOz9TI3a
d8JLmvh0Vd+0Q2aAhP8OKQgMYX28aw==
=2jnq
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu May 29 21:19:55 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
* kcm: hide color profile selection entirely with HDR (kde#502675)
* kcm: reload kwin config when tearing option is changed (kde#504634,kde#496970)
* hdrcalibrator: work around QWindow::requestUpdate not working with basic render loop (kde#504347)
* hdrcalibrator: install the image instead of including it in the module
* hdrcalibrator: prevent applying output configurations more often than necessary
- Revert upstream commit to get same behaviour as git master:
* 0001-Revert-hdrcalibrator-install-the-image-instead-of-in.patch
-------------------------------------------------------------------
Mon May 19 19:35:26 UTC 2025 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@@ -24,7 +24,7 @@
%define rname kscreen
%bcond_without released
Name: kscreen6
Version: 6.3.90
Version: 6.3.91
Release: 0
# Full Plasma 6 version (e.g. 6.0.0)
%{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}
@@ -40,6 +40,8 @@ Source2: plasma.keyring
%endif
# Converted using 'magick hdrcalibrator/ui/images/graz.{png,avif}' to save some space: 31MiB -> 262KiB
Source3: graz.avif
# PATCH-FIX-UPSTREAM we use an .avif like in the master branch
Patch1: 0001-Revert-hdrcalibrator-install-the-image-instead-of-in.patch
BuildRequires: fdupes
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: pkgconfig