CVS commit: pkgsrc/games/xclannad

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Dec 27 05:11:34 UTC 2021

Modified Files:
        pkgsrc/games/xclannad: distinfo
        pkgsrc/games/xclannad/patches: patch-scn2k_scn2k__cmd.cc

Log Message:
games/xclannad: fix broken build on netbsd-current


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/xclannad/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    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/distinfo
diff -u pkgsrc/games/xclannad/distinfo:1.4 pkgsrc/games/xclannad/distinfo:1.5
--- pkgsrc/games/xclannad/distinfo:1.4  Tue Oct 26 10:44:32 2021
+++ pkgsrc/games/xclannad/distinfo      Mon Dec 27 05:11:34 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:44:32 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/12/27 05:11:34 dholland Exp $
 
 BLAKE2s (xclannad-7hc.tar.gz) = 313c00a10aaeba1fc7bcc69578f2976f5df00414636a27ee19d498cee52ae5ad
 SHA512 (xclannad-7hc.tar.gz) = 5d14c1ca6932d0a013e36c2af51d0d4de2cb73e4c438ccf2bebf03f223a62649203726cc552f975e3177ea614f79c1d2d0d36220116289f0bb8f65a74997ac27
@@ -7,7 +7,7 @@ SHA1 (patch-Makefile.in) = 3586afaf13173
 SHA1 (patch-font_font__peer__ft2.cc) = cb40078c701d1bf6c5113d21890ed8d9fbb18b62
 SHA1 (patch-font_text__stream.cc) = 27b2812c199f69f4d58cc9324c9aa56b713b5abe
 SHA1 (patch-music2_music.cc) = fe8c90d9901a86dc6c799a1482ffe8ca7ca53c98
-SHA1 (patch-scn2k_scn2k__cmd.cc) = b0710214e612a45fed159169ee36c0ab0126ab81
+SHA1 (patch-scn2k_scn2k__cmd.cc) = 6a516de79f5ded1f3fd6ceb716dfffda3ec20309
 SHA1 (patch-scn2k_scn2k__grp.cc) = cf0c7efa5fcac698873665b9b51f98b62344fb1d
 SHA1 (patch-scn2k_scn2k__impl.cc) = 197b876d15608ba65cf4ea527bf7e108d3007ad5
 SHA1 (patch-scn2k_scn2k__text.cc) = aef8170b267a5a2b3f9ddbe9246fbdab8d0856cb

Index: pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc
diff -u pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc:1.2 pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc:1.3
--- pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc:1.2 Thu Mar 26 02:33:34 2020
+++ pkgsrc/games/xclannad/patches/patch-scn2k_scn2k__cmd.cc     Mon Dec 27 05:11:34 2021
@@ -1,7 +1,10 @@
-$NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.2 2020/03/26 02:33:34 joerg Exp $
+$NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.3 2021/12/27 05:11:34 dholland 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)
 
 --- scn2k/scn2k_cmd.cc.orig    2008-08-31 09:52:12.000000000 +0000
 +++ scn2k/scn2k_cmd.cc
@@ -67,7 +70,67 @@ $NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.2
                                else s++;
                        }
                        SetSys(i);
-@@ -682,8 +682,8 @@ int Cmd::GetLeftToken(const char*& d, Va
+@@ -533,59 +533,6 @@ bool Flags::Exec(Cmd& cmd) {
+                               cmd.cmd4 = 0;
+                       }
+ 
+-#if 0
+-@@@
+-save 27
+-�Ȥ��ᥬ�ͤΤȤ���
+-- ���֥������ȴ�Ϣ��seen9061:0 �ƤӽФ��ǹ��طʲ�򤫤��ͤ�Ȥ����Ѥˤʤ�
+-@@@
+-��ؤ��ִ�����̾������ꡣ0x51e ���ɤߤ���������֥ե����뤴�Ȥ���¸�����Ϥ��ʤΤǼ����ͤ��뤳��
+-���0-3 (4 �ʹߤϻȤäƤʤ��ˤǡ�����������˿�������ʤ�
+-StrVar ���ĥ��������뤳��
+-����ͤϤ�����
+-Text¦��Ǽ�ᡢ�����֥ե�����Ǥ�Ʊ���褦�ˤ��٤�����ʤ�
+-        args:0,"��"
+-        args:1,"���"
+-        args:2,"��"
+-        args:3,"�˿����"
+-        args:4,"���餯��"
+-        args:5,"���ꤵ��"
+-
+-
+-106737 :  0x23 - cmd 01-04:051f:00[ 2] 
+-        args:0,"�Ų�"
+-106758 : line 1712
+-106761 :  0x23 - cmd 01-04:051f:00[ 2] 
+-        args:2,"�Ų�"
+-106782 : line 1713
+-106785 :  0x23 - cmd 01-04:051f:00[ 2] 
+-        args:4,"���ꤵ��"
+-
+-47382 :  0x23 - cmd 01-04:051e:00[ 2] 
+-        args:4,V<18>[0](=0)
+-
+-47408 :  0x23 - cmd 01-0a:0004:00[ 2] 
+-        args:V<18>[0](=0),"���ꤵ��"
+-47437 : expr: V<0>[1000](=0)=V<sys>
+-47451 :  0x23 - cmd 01-0a:0004:00[ 2] 
+-        args:V<18>[0](=0),"���餯��"
+-47480 : expr: V<0>[1001](=0)=V<sys>
+-47494 :         V<0>[1000](=0)==0(=true)-> 47589
+-47526 :  0x23 - cmd 01-04:0514:00[ 2] 
+-        args:0,V<18>[0](=0)           /* NAME.A �򵢤� */
+-47552 :  0x23 - cmd 01-0a:0002:00[ 2] 
+-        args:V<18>[0](=0),"����"
+-47577 :         jmp -> 47672
+-47589 :         V<0>[1001](=0)==0(=true)-> 47672
+-47621 :  0x23 - cmd 01-04:0514:00[ 2] 
+-        args:1,V<18>[0](=0)           /* NAME.B �򵢤� */
+-47647 :  0x23 - cmd 01-0a:0002:00[ 2] 
+-        args:V<18>[0](=0),"����"
+-47672 : pos. 279
+-47675 :  0x23 - cmd 01-0a:0064:00[ 1] 
+-        args:V<18>[0](=0)
+-
+-#endif
+                       cmd.cmd_type = CMD_TEXT;
+                       break;
+               }
+@@ -682,8 +629,8 @@ int Cmd::GetLeftToken(const char*& d, Va
                d += 2;
                var_flag = false;
        }
@@ -78,7 +141,7 @@ $NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.2
                // numerical atom
                d += 6;
                value = read_little_endian_int(d-4);
-@@ -1001,7 +1001,7 @@ dprintf("enum.<");
+@@ -1001,7 +948,7 @@ dprintf("enum.<");
                        int count = GetArgs(d);
                        args[pt] = VarInfo(count);
  dprintf(">");
@@ -87,7 +150,16 @@ $NetBSD: patch-scn2k_scn2k__cmd.cc,v 1.2
                        /* �Ȥ��륳�ޥ�ɤ� 01-21:004b, 01-28:0064 �Τ����줫��R,C,PB,LO)
                        ** �����Υ��ޥ�ɤ�
                        ** arg1: ����ե�����̾
-@@ -1714,10 +1714,10 @@ int main(int argc, char** argv) {
+@@ -1220,7 +1167,7 @@ void Cmd::GetSelection(const char*& d) {
+       return;
+ }
+ 
+-static char* op_str3[11] = { "+=", "-=", "*=", "/=", "%=", "&=", "|=", "^=", "<<=", ">>=", "="};
++static const char* op_str3[11] = { "+=", "-=", "*=", "/=", "%=", "&=", "|=", "^=", "<<=", ">>=", "="};
+ void Cmd::GetCmd(Flags& flags_orig, const char*& d ) {
+       if (d == 0) { SetError(); return;}
+       if (cmd_type != CMD_NOP) return;
+@@ -1714,10 +1661,10 @@ int main(int argc, char** argv) {
                        Cmd cmd(flags, system_version); cmd.ClearError();
  
                        /* end? */