CVS commit: pkgsrc/games/xclannad

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Wed Mar  4 14:15:03 UTC 2026

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

Log Message:
xclannad: try to use SDL_WM_SetCaption() with utf-8 conversion

SDL 1.2.10 and later officially support it:
 https://libsdl.org/release/SDL-1.2.15/docs.html


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/xclannad/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/xclannad/patches/patch-window_picture.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.7 pkgsrc/games/xclannad/distinfo:1.8
--- pkgsrc/games/xclannad/distinfo:1.7  Wed Mar  4 12:38:01 2026
+++ pkgsrc/games/xclannad/distinfo      Wed Mar  4 14:15:03 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2026/03/04 12:38:01 tsutsui Exp $
+$NetBSD: distinfo,v 1.8 2026/03/04 14:15:03 tsutsui Exp $
 
 BLAKE2s (xclannad-7hc.tar.gz) = 313c00a10aaeba1fc7bcc69578f2976f5df00414636a27ee19d498cee52ae5ad
 SHA512 (xclannad-7hc.tar.gz) = 5d14c1ca6932d0a013e36c2af51d0d4de2cb73e4c438ccf2bebf03f223a62649203726cc552f975e3177ea614f79c1d2d0d36220116289f0bb8f65a74997ac27
@@ -22,6 +22,6 @@ SHA1 (patch-system_system__config.cc) = 
 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_picture.cc) = 01aec47b0206041652fbdabdf3a541f00079d326
 SHA1 (patch-window_widget.cc) = dbd5ac42bb2702a1efb32ac68bf9b5f91357006e
 SHA1 (patch-xlovesys.cc) = 88e227d3ad0ca49de6c4a373cda5c31fb9fcc8ce

Index: pkgsrc/games/xclannad/patches/patch-window_picture.cc
diff -u pkgsrc/games/xclannad/patches/patch-window_picture.cc:1.1 pkgsrc/games/xclannad/patches/patch-window_picture.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-window_picture.cc:1.1   Fri Jan  3 02:35:51 2020
+++ pkgsrc/games/xclannad/patches/patch-window_picture.cc       Wed Mar  4 14:15:03 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-window_picture.cc,v 1.1 2020/01/03 02:35:51 tsutsui Exp $
+$NetBSD: patch-window_picture.cc,v 1.2 2026/03/04 14:15:03 tsutsui Exp $
 
 - avoid unaligned copy for RISC cpus
+- try to use SDL_WM_SetCaption() with utf-8 conversion
 
 --- window/picture.cc.orig     2008-01-06 05:17:14.000000000 +0000
 +++ window/picture.cc
@@ -27,3 +28,22 @@ $NetBSD: patch-window_picture.cc,v 1.1 2
                        }
                        if (i == len) {
                                is_mask = NO_MASK;
+@@ -1009,8 +1009,16 @@ bool PicRoot::with_mask(Surface* s) {
+ #endif /* USE_X11 */
+ void PicRoot::SetWindowCaption(const char* caption) {
+ #if USE_X11
+-//    SDL_WM_SetCaption(caption, 0);
+-      // SDL�δؿ�Ǥ�2���ʸ�򥵥ݡ�����ʤ��Τǡ�Ʊ������Ƥ˽�
++      // SDL 1.2 �Ǥ� utf-8 ��ޤ����ꤹ��
++      // SetWindowCaption() �θƤӽФ�Ǥ� kconv() �� EUC �Ѵ�����Ƥ���
++      char *caption_utf8 = SDL_iconv_string("UTF-8", "euc-jp",
++          caption, strlen(caption) + 1);
++      if (caption_utf8 != NULL) {
++              SDL_WM_SetCaption(caption_utf8, 0);
++              SDL_free(caption_utf8);
++              return;
++      }
++      // �Ѵ���Ԥ�������Ʊ������Ƥ˥ե�����Хå�
+       SDL_SysWMinfo info;
+       memset(&info,0,sizeof(info));
+       SDL_VERSION(&(info.version));