CVS commit: pkgsrc/audio/kid3

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb  4 10:45:54 UTC 2023

Modified Files:
        pkgsrc/audio/kid3: distinfo
        pkgsrc/audio/kid3/patches: patch-src_app_qt_fixappdata.py

Log Message:
kid3: use upstream version of patch


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/audio/kid3/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/kid3/patches/patch-src_app_qt_fixappdata.py

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

Modified files:

Index: pkgsrc/audio/kid3/distinfo
diff -u pkgsrc/audio/kid3/distinfo:1.18 pkgsrc/audio/kid3/distinfo:1.19
--- pkgsrc/audio/kid3/distinfo:1.18     Wed Feb  1 20:13:31 2023
+++ pkgsrc/audio/kid3/distinfo  Sat Feb  4 10:45:53 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2023/02/01 20:13:31 wiz Exp $
+$NetBSD: distinfo,v 1.19 2023/02/04 10:45:53 wiz Exp $
 
 BLAKE2s (kid3-3.9.3.tar.gz) = 9b0d44b78542ac8b5ebd379f87a0762c9fbd0140679d49d3b5b34ab0e4fc5bb0
 SHA512 (kid3-3.9.3.tar.gz) = 03b9c13e8e9924796e9a993e5f92b05d5435893e3fbdeb7b7fc5ae52d3f9f98322ec6e76c7911814a409f6c6253fb5687d5d3ab5b3fa6db46142a3b6b824cd9b
 Size (kid3-3.9.3.tar.gz) = 2996599 bytes
-SHA1 (patch-src_app_qt_fixappdata.py) = 4dcac2d25798697217b3b9436a8aa37af7d5cd1c
+SHA1 (patch-src_app_qt_fixappdata.py) = 914ea74f15b14ad4cfd3de460ac3f2b7b396549f

Index: pkgsrc/audio/kid3/patches/patch-src_app_qt_fixappdata.py
diff -u pkgsrc/audio/kid3/patches/patch-src_app_qt_fixappdata.py:1.2 pkgsrc/audio/kid3/patches/patch-src_app_qt_fixappdata.py:1.3
--- pkgsrc/audio/kid3/patches/patch-src_app_qt_fixappdata.py:1.2        Wed Feb  1 20:13:31 2023
+++ pkgsrc/audio/kid3/patches/patch-src_app_qt_fixappdata.py    Sat Feb  4 10:45:53 2023
@@ -1,18 +1,19 @@
-$NetBSD: patch-src_app_qt_fixappdata.py,v 1.2 2023/02/01 20:13:31 wiz Exp $
+$NetBSD: patch-src_app_qt_fixappdata.py,v 1.3 2023/02/04 10:45:53 wiz Exp $
 
-Fix
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xd9 in position 305: ordinal not in range(128)
-
-https://bugs.kde.org/show_bug.cgi?id=465144
+https://invent.kde.org/multimedia/kid3/-/commit/cdc47207d2807f47222e904e441f95a523724ed1
 
 --- src/app/qt/fixappdata.py.orig      2023-01-12 03:56:49.000000000 +0000
 +++ src/app/qt/fixappdata.py
-@@ -5,7 +5,7 @@ import sys
+@@ -5,9 +5,9 @@ import sys
  
  
  def fix_appdata():
 -    for line in fileinput.input():
-+    for line in fileinput.input(encoding="utf-8"):
-         line = line.replace('kid3.desktop', 'kid3-qt.desktop')
-         sys.stdout.write(line)
+-        line = line.replace('kid3.desktop', 'kid3-qt.desktop')
+-        sys.stdout.write(line)
++    for line in fileinput.input(mode='rb'):
++        line = line.replace(b'kid3.desktop', b'kid3-qt.desktop')
++        sys.stdout.buffer.write(line)
  
+ if __name__ == '__main__':
+     fix_appdata()