CVS commit: pkgsrc/x11/libkscreen

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Apr 22 04:32:33 UTC 2022

Modified Files:
        pkgsrc/x11/libkscreen: Makefile distinfo
Added Files:
        pkgsrc/x11/libkscreen/patches: patch-src_edid.cpp

Log Message:
libkscreen: fix build with Qt 5.15.3

(We can't update to latest versions as our kf5 packaging is too old.)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libkscreen/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libkscreen/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libkscreen/patches/patch-src_edid.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libkscreen/Makefile
diff -u pkgsrc/x11/libkscreen/Makefile:1.9 pkgsrc/x11/libkscreen/Makefile:1.10
--- pkgsrc/x11/libkscreen/Makefile:1.9  Mon Apr 18 19:10:16 2022
+++ pkgsrc/x11/libkscreen/Makefile      Fri Apr 22 04:32:33 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2022/04/18 19:10:16 adam Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/22 04:32:33 gutteridge Exp $
 
 DISTNAME=      libkscreen-${PLASMAVER}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    x11
 
 HOMEPAGE=      https://www.kde.org/workspaces/plasmadesktop/

Index: pkgsrc/x11/libkscreen/distinfo
diff -u pkgsrc/x11/libkscreen/distinfo:1.4 pkgsrc/x11/libkscreen/distinfo:1.5
--- pkgsrc/x11/libkscreen/distinfo:1.4  Tue Oct 26 11:34:09 2021
+++ pkgsrc/x11/libkscreen/distinfo      Fri Apr 22 04:32:33 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:34:09 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/04/22 04:32:33 gutteridge Exp $
 
 BLAKE2s (libkscreen-5.18.5.tar.xz) = b8d07a4327de6e4d9171f509df13304acb5cc9e658692986f903189248e2fc50
 SHA512 (libkscreen-5.18.5.tar.xz) = 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
 Size (libkscreen-5.18.5.tar.xz) = 85532 bytes
+SHA1 (patch-src_edid.cpp) = 9fe3c0f1ec14f7077f2547c9bce7df3a0e554bd7

Added files:

Index: pkgsrc/x11/libkscreen/patches/patch-src_edid.cpp
diff -u /dev/null pkgsrc/x11/libkscreen/patches/patch-src_edid.cpp:1.1
--- /dev/null   Fri Apr 22 04:32:33 2022
+++ pkgsrc/x11/libkscreen/patches/patch-src_edid.cpp    Fri Apr 22 04:32:33 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_edid.cpp,v 1.1 2022/04/22 04:32:33 gutteridge Exp $
+
+Fix build with Qt 5.15.3.
+
+--- src/edid.cpp.orig  2020-05-05 14:47:08.000000000 +0000
++++ src/edid.cpp
+@@ -411,7 +411,7 @@ QString Edid::Private::edidParseString(c
+ 
+         for (int i = 0; i < text.length(); ++i) {
+             if (!text.at(i).isPrint()) {
+-                text[i] = '-';
++                text[i] = QLatin1Char('-');
+             }
+         }
+         return text;