CVS commit: pkgsrc/x11/kdelibs4

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Sep 20 03:17:40 UTC 2020

Modified Files:
        pkgsrc/x11/kdelibs4: distinfo
        pkgsrc/x11/kdelibs4/patches: patch-kimgio_jp2.cpp

Log Message:
Fix Jasper fallout


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/kdelibs4/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/kdelibs4/patches/patch-kimgio_jp2.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/kdelibs4/distinfo
diff -u pkgsrc/x11/kdelibs4/distinfo:1.56 pkgsrc/x11/kdelibs4/distinfo:1.57
--- pkgsrc/x11/kdelibs4/distinfo:1.56   Sun Aug  9 00:01:09 2020
+++ pkgsrc/x11/kdelibs4/distinfo        Sun Sep 20 03:17:40 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2020/08/09 00:01:09 joerg Exp $
+$NetBSD: distinfo,v 1.57 2020/09/20 03:17:40 joerg Exp $
 
 SHA1 (kdelibs-4.14.38.tar.xz) = 2271f8b38cd5b6b55fa31c567271e3ca37ef641a
 RMD160 (kdelibs-4.14.38.tar.xz) = edf16e14842237950655bf44c073070c5bb7d74b
@@ -25,7 +25,7 @@ SHA1 (patch-kdecore_util_kshareddatacach
 SHA1 (patch-kdeui_icons_kiconcache.cpp) = c360192afd21efedc6dad8a6ccdd61573ee0dbac
 SHA1 (patch-khtml_dom_dom2_traversal.h) = b001fc3825fcfea8f25b7219057e59d5b87723e4
 SHA1 (patch-khtml_misc_AtomicString.cpp) = eff036bcd09e031651eba1e3a2136e313d184f2b
-SHA1 (patch-kimgio_jp2.cpp) = f2fa84cb1ab17697fd07c2507bba1ff21d1dc9ee
+SHA1 (patch-kimgio_jp2.cpp) = 165ff6b2e6176366739c78c1ca9dc2065c2d008d
 SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364
 SHA1 (patch-kinit_kinit.cpp) = 75dfe546c92169e692ddb45cd1a056a1b4042bb6
 SHA1 (patch-kio_CMakeLists.txt) = 3033fe7d31555e83f197f889cf1aa15949a3c14e

Index: pkgsrc/x11/kdelibs4/patches/patch-kimgio_jp2.cpp
diff -u pkgsrc/x11/kdelibs4/patches/patch-kimgio_jp2.cpp:1.1 pkgsrc/x11/kdelibs4/patches/patch-kimgio_jp2.cpp:1.2
--- pkgsrc/x11/kdelibs4/patches/patch-kimgio_jp2.cpp:1.1        Sun Aug  9 00:01:09 2020
+++ pkgsrc/x11/kdelibs4/patches/patch-kimgio_jp2.cpp    Sun Sep 20 03:17:40 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-kimgio_jp2.cpp,v 1.1 2020/08/09 00:01:09 joerg Exp $
+$NetBSD: patch-kimgio_jp2.cpp,v 1.2 2020/09/20 03:17:40 joerg Exp $
 
---- kimgio/jp2.cpp.orig        2020-08-08 22:34:50.646978346 +0000
+--- kimgio/jp2.cpp.orig        2017-11-05 01:51:22.000000000 +0000
 +++ kimgio/jp2.cpp
 @@ -103,13 +103,13 @@ static void jas_stream_initbuf(jas_strea
          stream->bufmode_ |= bufmode & JAS_STREAM_BUFMODEMASK;
@@ -14,7 +14,7 @@ $NetBSD: patch-kimgio_jp2.cpp,v 1.1 2020
  }
  
 -static int qiodevice_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+static int qiodevice_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
++static int qiodevice_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
  {
          QIODevice *io = (QIODevice*) obj;
          return io->write(buf, cnt);