CVS commit: pkgsrc/games/xclannad

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/xclannad
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Wed, 4 Mar 2026 10:27:20 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Wed Mar  4 10:27:20 UTC 2026

Modified Files:
        pkgsrc/games/xclannad: Makefile distinfo
        pkgsrc/games/xclannad/patches: patch-font_font__peer__ft2.cc
            patch-scn2k_scn2k__cmd.cc patch-scn2k_scn2k__impl.cc
            patch-scn2k_scn2k__text.cc patch-system_file.cc patch-system_file.h
            patch-system_system__config.cc
Added Files:
        pkgsrc/games/xclannad/patches: patch-font_font__peer__x11.cc
            patch-music2_nwatowav.cc patch-music2_wavfile.cc
            patch-system_file__impl.h patch-window_event.cc
            patch-window_widget.cc

Log Message:
xclannad: fix SIGSEGV on netbsd-10 and also appease misc warnings

Tested on NetBSD/i3860 10.1 and NetBSD/evbarm-earmv7hf 11.0_RC1.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/xclannad/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/xclannad/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/xclannad/patches/patch-font_font__peer__ft2.cc \
    pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__impl.cc \
    pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__text.cc \
    pkgsrc/games/xclannad/patches/patch-system_file.cc \
    pkgsrc/games/xclannad/patches/patch-system_file.h \
    pkgsrc/games/xclannad/patches/patch-system_system__config.cc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/xclannad/patches/patch-font_font__peer__x11.cc \
    pkgsrc/games/xclannad/patches/patch-music2_nwatowav.cc \
    pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc \
    pkgsrc/games/xclannad/patches/patch-system_file__impl.h \
    pkgsrc/games/xclannad/patches/patch-window_event.cc \
    pkgsrc/games/xclannad/patches/patch-window_widget.cc
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc

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

Modified files:

Index: pkgsrc/games/xclannad/Makefile
diff -u pkgsrc/games/xclannad/Makefile:1.7 pkgsrc/games/xclannad/Makefile:1.8
--- pkgsrc/games/xclannad/Makefile:1.7  Sun Jan  4 09:19:19 2026
+++ pkgsrc/games/xclannad/Makefile      Wed Mar  4 10:27:19 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2026/01/04 09:19:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2026/03/04 10:27:19 tsutsui Exp $
 #
 
 DISTNAME=      xclannad-7hc
 PKGNAME=       xclannad-0.07hc
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    games
 #MASTER_SITES= http://www.creator.club.ne.jp/~jagarl/
 MASTER_SITES=  http://teokurebsd.org/netbsd/packages/distfiles/xclannad/

Index: pkgsrc/games/xclannad/distinfo
diff -u pkgsrc/games/xclannad/distinfo:1.5 pkgsrc/games/xclannad/distinfo:1.6
--- pkgsrc/games/xclannad/distinfo:1.5  Mon Dec 27 05:11:34 2021
+++ pkgsrc/games/xclannad/distinfo      Wed Mar  4 10:27:19 2026
@@ -1,20 +1,26 @@
-$NetBSD: distinfo,v 1.5 2021/12/27 05:11:34 dholland Exp $
+$NetBSD: distinfo,v 1.6 2026/03/04 10:27:19 tsutsui Exp $
 
 BLAKE2s (xclannad-7hc.tar.gz) = 313c00a10aaeba1fc7bcc69578f2976f5df00414636a27ee19d498cee52ae5ad
 SHA512 (xclannad-7hc.tar.gz) = 5d14c1ca6932d0a013e36c2af51d0d4de2cb73e4c438ccf2bebf03f223a62649203726cc552f975e3177ea614f79c1d2d0d36220116289f0bb8f65a74997ac27
 Size (xclannad-7hc.tar.gz) = 534245 bytes
 SHA1 (patch-Makefile.in) = 3586afaf131737ded3ac1b64bfa56b3c357f3269
-SHA1 (patch-font_font__peer__ft2.cc) = cb40078c701d1bf6c5113d21890ed8d9fbb18b62
+SHA1 (patch-font_font__peer__ft2.cc) = 7e9201fdfee175233e28bb149b11fd76f3d008eb
+SHA1 (patch-font_font__peer__x11.cc) = d7fa18ecc70c957f7e387b272f6906d4ea83f409
 SHA1 (patch-font_text__stream.cc) = 27b2812c199f69f4d58cc9324c9aa56b713b5abe
 SHA1 (patch-music2_music.cc) = fe8c90d9901a86dc6c799a1482ffe8ca7ca53c98
-SHA1 (patch-scn2k_scn2k__cmd.cc) = 6a516de79f5ded1f3fd6ceb716dfffda3ec20309
+SHA1 (patch-music2_nwatowav.cc) = 52cbbb0a7ba116cacbae8c56f67b1dba9e9ab94c
+SHA1 (patch-music2_wavfile.cc) = f302900d87162ff25a561e968ea25bc51c072261
+SHA1 (patch-scn2k_scn2k__cmd.cc) = 887a170571f2eebbc323ac7e4534ddf8ebcb1d1d
 SHA1 (patch-scn2k_scn2k__grp.cc) = cf0c7efa5fcac698873665b9b51f98b62344fb1d
-SHA1 (patch-scn2k_scn2k__impl.cc) = 197b876d15608ba65cf4ea527bf7e108d3007ad5
-SHA1 (patch-scn2k_scn2k__text.cc) = aef8170b267a5a2b3f9ddbe9246fbdab8d0856cb
-SHA1 (patch-system_file.cc) = dd68b7bd6ec97961e1e367bbbb505ee3e6f0347e
-SHA1 (patch-system_file.h) = f5a759c4716b8ecdb84672de017cb92dbe36e058
-SHA1 (patch-system_system__config.cc) = 28707a1e9f489f655db18595cead0aa908175b53
+SHA1 (patch-scn2k_scn2k__impl.cc) = e9a97e1b10dfdd50b92313176259a9c2ebc3951b
+SHA1 (patch-scn2k_scn2k__text.cc) = 8b7d96729d0eec629ced8461f8f6b272a3f7624d
+SHA1 (patch-system_file.cc) = 2d63371ae48ec73cf6fbc6f6bc93069d6360e064
+SHA1 (patch-system_file.h) = 8f5ff920167015112bf98df9a2123b1eb8ccc4f6
+SHA1 (patch-system_file__impl.h) = 22efb27fe5135c921542416a6ca0ac85b378daca
+SHA1 (patch-system_system__config.cc) = 0db7eaeb60b540c0c5afc480f820a4f07e200f7f
 SHA1 (patch-window_SDL__rotozoom.cc) = 7f21616ba4889df0b70fa11c57eb378c3a3ac369
 SHA1 (patch-window_button.cc) = 301d30641ee6342803e2d5307118d25b31d165cc
+SHA1 (patch-window_event.cc) = 7468049d02e3a7f40a4de23e590bbb29f0f458a9
 SHA1 (patch-window_picture.cc) = dacce976d13167f18a5a3186840f6625277c3bfc
+SHA1 (patch-window_widget.cc) = dbd5ac42bb2702a1efb32ac68bf9b5f91357006e
 SHA1 (patch-xlovesys.cc) = 88e227d3ad0ca49de6c4a373cda5c31fb9fcc8ce

Index: pkgsrc/games/xclannad/patches/patch-font_font__peer__ft2.cc
diff -u pkgsrc/games/xclannad/patches/patch-font_font__peer__ft2.cc:1.1 pkgsrc/games/xclannad/patches/patch-font_font__peer__ft2.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-font_font__peer__ft2.cc:1.1     Fri Jan  3 02:35:51 2020
+++ pkgsrc/games/xclannad/patches/patch-font_font__peer__ft2.cc Wed Mar  4 10:27:19 2026
@@ -1,17 +1,24 @@
-$NetBSD: patch-font_font__peer__ft2.cc,v 1.1 2020/01/03 02:35:51 tsutsui Exp $
+$NetBSD: patch-font_font__peer__ft2.cc,v 1.2 2026/03/04 10:27:19 tsutsui Exp $
 
-Add and fix default font paths.
+- Add and fix default font paths.
+- Appease -Wwrite-strings warnings
 
 --- font/font_peer_ft2.cc.orig 2008-08-31 09:54:15.000000000 +0000
 +++ font/font_peer_ft2.cc
-@@ -52,12 +52,13 @@ static FontLibrary *library = NULL;
- static char *default_paths[] = {
+@@ -49,15 +49,16 @@ typedef struct _FontLibrary {
+ 
+ static FontLibrary *library = NULL;
+ 
+-static char *default_paths[] = {
++static const char *default_paths[] = {
    ".",
    "/",
 -  "/usr/X11R6/lib/X11/fonts/TrueType",
+-  "/usr/local/share/fonts/TrueType",
+-  "/usr/local/share/fonts/truetype",
 +  "/usr/X11R7/lib/X11/fonts/TTF",
-   "/usr/local/share/fonts/TrueType",
-   "/usr/local/share/fonts/truetype",
++  "/usr/pkg/share/fonts/TrueType",
++  "/usr/pkg/share/fonts/truetype",
    "/usr/share/fonts/TrueType",
    "/usr/share/fonts/truetype",
    "/usr/share/fonts/tt",
Index: pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__impl.cc
diff -u pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__impl.cc:1.1 pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__impl.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__impl.cc:1.1        Thu Mar 26 02:33:34 2020
+++ pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__impl.cc    Wed Mar  4 10:27:20 2026
@@ -1,7 +1,19 @@
-$NetBSD: patch-scn2k_scn2k__impl.cc,v 1.1 2020/03/26 02:33:34 joerg Exp $
+$NetBSD: patch-scn2k_scn2k__impl.cc,v 1.2 2026/03/04 10:27:20 tsutsui Exp $
 
---- scn2k/scn2k_impl.cc.orig   2020-03-26 01:19:18.835162701 +0000
+- appease -Wwrite-strings warnings
+- appease -Wconversion-null warning
+
+--- scn2k/scn2k_impl.cc.orig   2008-08-31 09:52:11.000000000 +0000
 +++ scn2k/scn2k_impl.cc
+@@ -138,7 +138,7 @@ err:
+       fprintf(stderr,"Cannot open scenario number %d\n",new_scn_number);
+       throw std::invalid_argument("Scn2k::OpenScript");
+ 
+-      return false;
++      return NULL;
+ }
+ bool Scn2k::ChangeScript(int new_scn_number, int call_no) {
+       int old_scn_number = scn_number;
 @@ -1268,7 +1268,7 @@ void Scn2k::LoadImpl(const char* save) {
                        sscanf(save, "Point=%d", &save_point);
                } else if (strncmp(save, "Title=", 6) == 0) {
Index: pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__text.cc
diff -u pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__text.cc:1.1 pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__text.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__text.cc:1.1        Fri Jan  3 02:35:51 2020
+++ pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__text.cc    Wed Mar  4 10:27:20 2026
@@ -1,7 +1,9 @@
-$NetBSD: patch-scn2k_scn2k__text.cc,v 1.1 2020/01/03 02:35:51 tsutsui Exp $
+$NetBSD: patch-scn2k_scn2k__text.cc,v 1.2 2026/03/04 10:27:20 tsutsui Exp $
 
 - don't assume signed char for arm and powerpc
 - explicitly use NULL to pass NULL pointer via varargs
+- appease -Wwrite-strings warnings
+- fix a missing return value that causes SIGSEGV on netbsd-10 with gcc10
 
 --- scn2k/scn2k_text.cc.orig   2008-08-31 15:26:43.000000000 +0000
 +++ scn2k/scn2k_text.cc
@@ -32,7 +34,24 @@ $NetBSD: patch-scn2k_scn2k__text.cc,v 1.
        }
        text_stream.Add(str_top);
        return;
-@@ -1874,7 +1874,7 @@ void TextWindow::MakeWaku(PicContainer& 
+@@ -1538,7 +1538,7 @@ void movebtn_drag(int from_x, int from_y
+       fprintf(stderr,"drag.\n");
+ }
+ #define BTNCNT 10
+-static char* btnname[BTNCNT] = {
++static const char* btnname[BTNCNT] = {
+       "MOVE",
+       "CLEAR",
+       "READJUMP",
+@@ -1780,6 +1780,7 @@ BacklogItem& BacklogItem::operator =(con
+       koe = p.koe;
+       face = p.face;
+       text = p.text;
++      return *this;
+ }
+ void BacklogItem::SetSavepos(int p) {
+       Clear();
+@@ -1874,7 +1875,7 @@ void TextWindow::MakeWaku(PicContainer& 
                }
                int x, y, w, h;
                sprintf(key, "#WAKU.%03d.000.%s_BOX", waku_no, btnname[i]);
@@ -41,7 +60,7 @@ $NetBSD: patch-scn2k_scn2k__text.cc,v 1.
                int sx, sy, sdx, sdy, cnt;
                const char* d = data + 9 + btnpos[i]*24*8;
                sx = read_little_endian_int(d);
-@@ -1901,7 +1901,7 @@ TextWindow::TextWindow(PicContainer& par
+@@ -1901,7 +1902,7 @@ TextWindow::TextWindow(PicContainer& par
        sprintf(key, "#WINDOW.%03d.MOJI_REP", win_no);  if (config.GetParam(key, 2, &rep1, &rep2) == -1) return;
        sprintf(key, "#WINDOW.%03d.MOJI_CNT", win_no);  if (config.GetParam(key, 2, &cntw, &cnth) == -1) return;
        sprintf(key, "#WINDOW.%03d.POS", win_no);       if (config.GetParam(key, 3, &posd, &posx, &posy) == -1) return;
Index: pkgsrc/games/xclannad/patches/patch-system_file.cc
diff -u pkgsrc/games/xclannad/patches/patch-system_file.cc:1.1 pkgsrc/games/xclannad/patches/patch-system_file.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-system_file.cc:1.1      Fri Jan  3 02:35:51 2020
+++ pkgsrc/games/xclannad/patches/patch-system_file.cc  Wed Mar  4 10:27:20 2026
@@ -1,10 +1,59 @@
-$NetBSD: patch-system_file.cc,v 1.1 2020/01/03 02:35:51 tsutsui Exp $
+$NetBSD: patch-system_file.cc,v 1.2 2026/03/04 10:27:20 tsutsui Exp $
 
 - avoid unaligned copy for RISC cpus (XXX: handle NetBSD only)
+- fix a missing return value warning
+- appease -Wwrite-strings warnings
 
 --- system/file.cc.orig        2008-08-31 09:52:12.000000000 +0000
 +++ system/file.cc
-@@ -1161,14 +1161,8 @@ public:
+@@ -93,7 +93,7 @@ FILESEARCH::ARCTYPE FILESEARCH::default_
+       ATYPE_DIR, ATYPE_DIR, ATYPE_DIR, ATYPE_DIR,
+       ATYPE_DIR, ATYPE_DIR
+ };
+-char* FILESEARCH::default_dirnames[TYPEMAX] = {
++const char* FILESEARCH::default_dirnames[TYPEMAX] = {
+       0, 0, "", "pdt", 
+       "seen.txt", "allanm.anl", "allard.ard", "allcur.cur", 
+       0, 0, "koe", "bgm", "mov", "gan"};
+@@ -107,7 +107,7 @@ char* FILESEARCH::default_dirnames[TYPEM
+ **    Find ������Τ�Read��������Ƥ�����롣
+ */
+ 
+-ARCFILE::ARCFILE(char* aname) {
++ARCFILE::ARCFILE(const char* aname) {
+       struct stat sb;
+       /* �ѿ��� */
+       arcname = 0;
+@@ -614,8 +614,9 @@ void FILESEARCH::SetFileInformation(FILE
+       /* Ŭ��˽�� */
+       if (filenames[type] != 0 &&
+               filenames[type] != default_dirnames[type]) delete[] filenames[type];
+-      filenames[type] = new char[strlen(filename)+1];
+-      strcpy(filenames[type], filename);
++      char *p = new char[strlen(filename)+1];
++      strcpy(p, filename);
++      filenames[type] = p;
+       is_archived[type] = is_arc;
+       searcher[type] = MakeARCFILE(is_arc, filename);
+       if (searcher[type] && next_arc)
+@@ -645,7 +646,7 @@ void FILESEARCH::AppendFileInformation(F
+       return;
+ }
+ 
+-ARCFILE* FILESEARCH::MakeARCFILE(ARCTYPE tp, char* filename) {
++ARCFILE* FILESEARCH::MakeARCFILE(ARCTYPE tp, const char* filename) {
+       ARCFILE* arc = 0;
+       char* file;
+       if (filename == 0) goto err;
+@@ -1067,6 +1068,7 @@ bool G00CONV::Read(char* image) {
+       if (type == 0) return Read_Type0(image);
+       else if (type == 1) return Read_Type1(image);
+       else if (type == 2) return Read_Type2(image);
++      return false;
+ }
+ 
+ /* ����Ū�� LZ ���̤�Ÿ����� */
+@@ -1161,14 +1163,8 @@ public:
                lsrc += 2;
        }
        static void Copy1Pixel(const char*& lsrc, char*& ldest) {
@@ -21,7 +70,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
                lsrc += 3; ldest += 4;
        }
        static int IsRev(void) { return 0; }
-@@ -1246,13 +1240,7 @@ public:
+@@ -1246,13 +1242,7 @@ public:
                lsrc += 2;
        }
        static void Copy1Pixel(const char*& lsrc, char*& ldest) {
@@ -36,7 +85,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
                lsrc += 3; ldest += 3;
        }
        static int IsRev(void) { return 1; }
-@@ -1279,7 +1267,7 @@ bool PDTCONV::Read(char* image) {
+@@ -1279,7 +1269,7 @@ bool PDTCONV::Read(char* image) {
        int i; int len = width*height;
        src = buf; dest = image;
        for (i=0; i<len; i++) {
@@ -45,7 +94,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
                src++;
                dest += 4;
        }
-@@ -1328,9 +1316,12 @@ bool PDTCONV::Read_PDT11(char* image) {
+@@ -1328,9 +1318,12 @@ bool PDTCONV::Read_PDT11(char* image) {
                cur += 4;
        }
        src = image + width*height;
@@ -61,7 +110,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
        return true;
  }
  
-@@ -1475,8 +1466,8 @@ bool G00CONV::Read_Type1(char* image) {
+@@ -1475,8 +1468,8 @@ bool G00CONV::Read_Type1(char* image) {
        srcend = uncompress_data + uncompress_size;
        dest = image; destend = image + width*height*4;
        while(dest < destend && src < srcend) {
@@ -72,7 +121,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
        }
        delete[] uncompress_data;
        return true;
-@@ -1541,16 +1532,17 @@ bool G00CONV::Read_Type2(char* image) {
+@@ -1541,16 +1534,17 @@ bool G00CONV::Read_Type2(char* image) {
  
  void G00CONV::Copy_32bpp(char* image, int x, int y, const char* src, int bpl, int h) {
        int i;
@@ -94,7 +143,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
        }
  }
  
-@@ -1560,10 +1552,10 @@ void GRPCONV::CopyRGBA_rev(char* image, 
+@@ -1560,10 +1554,10 @@ void GRPCONV::CopyRGBA_rev(char* image, 
        int len = width * height;
        int i;
        unsigned char* s = (unsigned char*)buf;
@@ -108,7 +157,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
        }
        return;
  }
-@@ -1576,9 +1568,10 @@ void GRPCONV::CopyRGBA(char* image, cons
+@@ -1576,9 +1570,10 @@ void GRPCONV::CopyRGBA(char* image, cons
        /* ���Ѵ���Ԥ� */
        int len = width * height;
        int i;
@@ -121,7 +170,7 @@ $NetBSD: patch-system_file.cc,v 1.1 2020
                buf += 4;
        }
        return;
-@@ -1588,10 +1581,10 @@ void GRPCONV::CopyRGB(char* image, const
+@@ -1588,10 +1583,10 @@ void GRPCONV::CopyRGB(char* image, const
        int len = width * height;
        int i;
        unsigned char* s = (unsigned char*)buf;
Index: pkgsrc/games/xclannad/patches/patch-system_file.h
diff -u pkgsrc/games/xclannad/patches/patch-system_file.h:1.1 pkgsrc/games/xclannad/patches/patch-system_file.h:1.2
--- pkgsrc/games/xclannad/patches/patch-system_file.h:1.1       Fri Jan  3 02:35:51 2020
+++ pkgsrc/games/xclannad/patches/patch-system_file.h   Wed Mar  4 10:27:20 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-system_file.h,v 1.1 2020/01/03 02:35:51 tsutsui Exp $
+$NetBSD: patch-system_file.h,v 1.2 2026/03/04 10:27:20 tsutsui Exp $
 
 - make stream little endian read/write functions inline
+- appease -Wwrite-strings warning
 
 --- system/file.h.orig 2008-01-06 05:17:13.000000000 +0000
 +++ system/file.h
@@ -34,3 +35,25 @@ $NetBSD: patch-system_file.h,v 1.1 2020/
        int c = read_little_endian_short(buf);
        unsigned char *p = (unsigned char *) buf;
        unsigned int unum = (unsigned int) number;
+@@ -132,10 +132,10 @@ private:
+       ARCFILE* searcher[TYPEMAX];
+       /* ������¸�߰��֤� information */
+       ARCTYPE is_archived[TYPEMAX];
+-      char* filenames[TYPEMAX];
++      const char* filenames[TYPEMAX];
+       /* �ǥե���Ȥ� information */
+       static ARCTYPE default_is_archived[TYPEMAX];
+-      static char* default_dirnames[TYPEMAX];
++      static const char* default_dirnames[TYPEMAX];
+ public:
+       FILESEARCH(void);
+       ~FILESEARCH();
+@@ -147,7 +147,7 @@ public:
+       /* ʣ��Υե�������Ĥη��˴�Ϣ��� */
+       void AppendFileInformation(FILETYPE type, ARCTYPE is_arc,
+               char* filename);
+-      ARCFILE* MakeARCFILE(ARCTYPE tp, char* filename);
++      ARCFILE* MakeARCFILE(ARCTYPE tp, const char* filename);
+       /* fname �ǻ��ꤵ�̾��Υե�����򸡺� */
+       class ARCINFO* Find(FILETYPE type, const char* fname, const char* ext=0);
+       /* �������Υե�����򤹤٤ƥꥹ��å�
Index: pkgsrc/games/xclannad/patches/patch-system_system__config.cc
diff -u pkgsrc/games/xclannad/patches/patch-system_system__config.cc:1.1 pkgsrc/games/xclannad/patches/patch-system_system__config.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-system_system__config.cc:1.1    Fri Jan  3 02:35:51 2020
+++ pkgsrc/games/xclannad/patches/patch-system_system__config.cc        Wed Mar  4 10:27:20 2026
@@ -1,9 +1,19 @@
-$NetBSD: patch-system_system__config.cc,v 1.1 2020/01/03 02:35:51 tsutsui Exp $
+$NetBSD: patch-system_system__config.cc,v 1.2 2026/03/04 10:27:20 tsutsui Exp $
 
-Fix casts in printfs that cause build error on LP64 machines.
+- Fix casts in printfs that cause build error on LP64 machines.
+- Appease -Wwrite-strings warnings
 
 --- system/system_config.cc.orig       2008-08-31 09:52:12.000000000 +0000
 +++ system/system_config.cc
+@@ -212,7 +212,7 @@ public:
+               return;
+       }
+       const char* PatchOriginal(const char* data) {
+-              static char* table = "?\"',.:;=<>";
++              static const char* table = "?\"',.:;=<>";
+               if (new_data) delete[] new_data;
+               if (old_data) delete[] old_data;
+               new_data = 0; old_data = 0;
 @@ -367,14 +367,14 @@ public:
                        fprintf(f, ") ");
                }

Index: pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc
diff -u pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc:1.3 pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc:1.4
--- pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc:1.3 Mon Dec 27 05:11:34 2021
+++ pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc     Wed Mar  4 10:27:20 2026
@@ -1,10 +1,11 @@
-$NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.3 2021/12/27 05:11:34 dholland Exp $
+$NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.4 2026/03/04 10:27:20 tsutsui Exp $
 
 - don't assume signed char for arm and powerpc
 - fix wrong casts
 - silence const warning
 - remove chunk of text in #if 0 that doesn't necessarily tokenize
   (depending apparently on character set settings)
+- appease -Wwrite-strings warnings
 
 --- scn2k/scn2k_cmd.cc.orig    2008-08-31 09:52:12.000000000 +0000
 +++ scn2k/scn2k_cmd.cc
@@ -141,6 +142,15 @@ $NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.3
                // numerical atom
                d += 6;
                value = read_little_endian_int(d-4);
+@@ -720,7 +667,7 @@ int Cmd::GetLeftToken(const char*& d, Va
+       return value;
+ }
+ 
+-static char* op_str[70] = {
++static const char* op_str[70] = {
+ //     0      1      2      3      4      5      6      7      8     9
+       "+",   "-",   "*",   "/",   "%",   "&",   "|",   "^",   "<<",  ">>",    // +00
+       "err.","err.","err.","err.","err.","err.","err.","err.","err.","err.",  // +10
 @@ -1001,7 +948,7 @@ dprintf("enum.<");
                        int count = GetArgs(d);
                        args[pt] = VarInfo(count);

Added files:

Index: pkgsrc/games/xclannad/patches/patch-font_font__peer__x11.cc
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-font_font__peer__x11.cc:1.1
--- /dev/null   Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-font_font__peer__x11.cc Wed Mar  4 10:27:19 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-font_font__peer__x11.cc,v 1.1 2026/03/04 10:27:19 tsutsui Exp $
+
+- appease -Wwrite-strings warnings
+
+--- font/font_peer_x11.cc.orig 2026-03-03 20:57:59.750955737 +0000
++++ font/font_peer_x11.cc
+@@ -212,7 +212,7 @@ void PeerX11::InitDisplay(Display* _d) {
+ void PeerX11::OpenDisplay(void) {
+       if (display) return;
+ 
+-      char* display_name = getenv("DISPLAY");
++      const char* display_name = getenv("DISPLAY");
+       if (display_name == 0) display_name = ":0";
+ 
+       display = XOpenDisplay(display_name);
Index: pkgsrc/games/xclannad/patches/patch-music2_nwatowav.cc
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-music2_nwatowav.cc:1.1
--- /dev/null   Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-music2_nwatowav.cc      Wed Mar  4 10:27:19 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-music2_nwatowav.cc,v 1.1 2026/03/04 10:27:19 tsutsui Exp $
+
+- appease -Wwrite-strings warnings
+
+--- music2/nwatowav.cc.orig    2026-03-03 21:00:34.951069159 +0000
++++ music2/nwatowav.cc
+@@ -626,7 +626,7 @@ int main(int argc, char** argv) {
+       if (strstr(argv[1], ".nwk") != 0 || strstr(argv[1], ".ovk") != 0) {
+               bool is_ovk;
+               int headblk_sz;
+-              char* out_ext;
++              const char* out_ext;
+ 
+               char* outpath = new char[strlen(argv[1])+10];
+               char buf[1024];
Index: pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc:1.1
--- /dev/null   Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc       Wed Mar  4 10:27:19 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-music2_wavfile.cc,v 1.1 2026/03/04 10:27:19 tsutsui Exp $
+
+- appease -Wwrite-strings warnings
+
+--- music2/wavfile.cc.orig     2008-08-31 09:52:12.000000000 +0000
++++ music2/wavfile.cc
+@@ -105,7 +105,7 @@ typedef  struct
+ 
+ 
+ static void waveFormatCopy( WAVEFORMAT* wav, char *ptr );
+-static char*  findchunk (char* s1, char* s2, size_t n) ;
++static char*  findchunk (char* s1, const char* s2, size_t n) ;
+ 
+ static int  WaveHeaderCheck  (char *wave_buf,int* channels, u_long* samplerate, int* samplebits, u_long* samples,u_long* datastart)
+ {     
+@@ -176,7 +176,7 @@ static int  WaveHeaderCheck  (char *wave
+ } ; /* WaveHeaderCheck*/
+ 
+ 
+-static char* findchunk  (char* pstart, char* fourcc, size_t n)
++static char* findchunk  (char* pstart, const char* fourcc, size_t n)
+ {     char    *pend ;
+       int             k, test ;
+ 
Index: pkgsrc/games/xclannad/patches/patch-system_file__impl.h
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-system_file__impl.h:1.1
--- /dev/null   Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-system_file__impl.h     Wed Mar  4 10:27:20 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-system_file__impl.h,v 1.1 2026/03/04 10:27:20 tsutsui Exp $
+
+- appease -Wwrite-strings warnings
+
+--- system/file_impl.h.orig    2026-03-03 20:52:57.460204971 +0000
++++ system/file_impl.h
+@@ -61,7 +61,7 @@ protected:
+       virtual ARCINFO* MakeARCINFO(ARCFILE_ATOM&);
+       iterator SearchName(const char* f, const char* ext=0);
+ public:
+-      ARCFILE(char* fname);
++      ARCFILE(const char* fname);
+       void SetNext(ARCFILE* _next) { next = _next;}
+       ARCFILE* Next(void) { return next; }
+       void Init(void);
Index: pkgsrc/games/xclannad/patches/patch-window_event.cc
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-window_event.cc:1.1
--- /dev/null   Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-window_event.cc Wed Mar  4 10:27:20 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-window_event.cc,v 1.1 2026/03/04 10:27:20 tsutsui Exp $
+
+- appease "initialized and declared 'extern'" warnings
+
+--- window/event.cc.orig       2026-03-03 20:56:29.343444901 +0000
++++ window/event.cc
+@@ -35,8 +35,8 @@
+ 
+ using namespace std;
+ 
+-extern bool save_req = false, load_req = false, grpdump_req = false; //  scn2k/scn2k_impl.cc: �������������ɤǤ���褦��
+-extern bool pressAreq=false,pressFreq=false,pressDreq=false;
++bool save_req = false, load_req = false, grpdump_req = false; //  scn2k/scn2k_impl.cc: �������������ɤǤ���褦��
++bool pressAreq=false,pressFreq=false,pressDreq=false;
+ namespace Event {
+ /* Impl: struct Event::Video */
+ 
Index: pkgsrc/games/xclannad/patches/patch-window_widget.cc
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-window_widget.cc:1.1
--- /dev/null   Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-window_widget.cc        Wed Mar  4 10:27:20 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-window_widget.cc,v 1.1 2026/03/04 10:27:20 tsutsui Exp $
+
+- appease -Wwrite-strings warning
+
+--- window/widget.cc.orig      2026-03-03 20:57:17.461689932 +0000
++++ window/widget.cc
+@@ -37,7 +37,7 @@ void DSurfaceMove(Surface* src, const Re
+ 
+ //static char* wdefault_font_orig = "msgothic.ttc;times.ttf;";
+ static std::map<int, XKFont::HorizLayout*> size_to_layout;
+-static char* wdefault_font_orig = "times.ttf;msgothic.ttc";
++static const char* wdefault_font_orig = "times.ttf;msgothic.ttc";
+ static std::string wdefault_font = wdefault_font_orig;
+ 
+ void SetFont(const char* font) {

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index