CVS commit: [pkgsrc-2024Q3] pkgsrc/sysutils/xfm

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Nov  7 23:15:23 UTC 2024

Modified Files:
        pkgsrc/sysutils/xfm [pkgsrc-2024Q3]: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xfm/patches [pkgsrc-2024Q3]: patch-lib_Xfm.cpp

Log Message:
Pullup ticket #6917 - requested by nia
sysutils/xfm: Bug fix

Revisions pulled up:
- sysutils/xfm/Makefile                                         1.25
- sysutils/xfm/distinfo                                         1.13
- sysutils/xfm/patches/patch-lib_Xfm.cpp                        1.1

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Thu Nov  7 15:29:32 UTC 2024

   Modified Files:
        pkgsrc/sysutils/xfm: Makefile distinfo
   Added Files:
        pkgsrc/sysutils/xfm/patches: patch-lib_Xfm.cpp

   Log Message:
   xfm: fix startup issue caused by incomplete tradcpp macro expansion

   from RVP via PR pkg/58816


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.26.1 pkgsrc/sysutils/xfm/Makefile
cvs rdiff -u -r1.12 -r1.12.24.1 pkgsrc/sysutils/xfm/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/sysutils/xfm/patches/patch-lib_Xfm.cpp

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

Modified files:

Index: pkgsrc/sysutils/xfm/Makefile
diff -u pkgsrc/sysutils/xfm/Makefile:1.24 pkgsrc/sysutils/xfm/Makefile:1.24.26.1
--- pkgsrc/sysutils/xfm/Makefile:1.24   Sat Aug 28 09:22:23 2021
+++ pkgsrc/sysutils/xfm/Makefile        Thu Nov  7 23:15:23 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2021/08/28 09:22:23 nia Exp $
+# $NetBSD: Makefile,v 1.24.26.1 2024/11/07 23:15:23 maya Exp $
 
 DISTNAME=      xfm-1.4.3
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    sysutils x11
 MASTER_SITES=  http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 

Index: pkgsrc/sysutils/xfm/distinfo
diff -u pkgsrc/sysutils/xfm/distinfo:1.12 pkgsrc/sysutils/xfm/distinfo:1.12.24.1
--- pkgsrc/sysutils/xfm/distinfo:1.12   Tue Oct 26 11:20:27 2021
+++ pkgsrc/sysutils/xfm/distinfo        Thu Nov  7 23:15:23 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:20:27 nia Exp $
+$NetBSD: distinfo,v 1.12.24.1 2024/11/07 23:15:23 maya Exp $
 
 BLAKE2s (xfm-1.4.3.tar.gz) = ece0dee8a58ad46846032a88afb071d13a7c07760305c070d1b00dadba2ad8d3
 SHA512 (xfm-1.4.3.tar.gz) = 8d81a50c474712745d1d1fe6e84d772fd2faba6db31bec2bade799923d9455d772cd1b7cc68bd8014e0ab9f2840117ead0eb959945f800e13a62824d82c8955d
@@ -12,4 +12,5 @@ SHA1 (patch-ad) = 64709ecb67e91d8677545a
 SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d
 SHA1 (patch-af) = 075d38b00064ef6a853e62268e07a0432b1a7710
 SHA1 (patch-ag) = 5c825371254e0056c5b932901bacc5599dd514d2
+SHA1 (patch-lib_Xfm.cpp) = c50c58b038df1fe72194014c6049100afa4f57d3
 SHA1 (patch-src_TextField.c) = 26cce4ffa1f1aa57a4d08b3465cfece48d0592ea

Added files:

Index: pkgsrc/sysutils/xfm/patches/patch-lib_Xfm.cpp
diff -u /dev/null pkgsrc/sysutils/xfm/patches/patch-lib_Xfm.cpp:1.1.2.2
--- /dev/null   Thu Nov  7 23:15:23 2024
+++ pkgsrc/sysutils/xfm/patches/patch-lib_Xfm.cpp       Thu Nov  7 23:15:23 2024
@@ -0,0 +1,40 @@
+$NetBSD: patch-lib_Xfm.cpp,v 1.1.2.2 2024/11/07 23:15:23 maya Exp $
+
+Add a <space> so that HIST_TRANSLATION() is recognized as a macro
+rather than as a continuation of the previous line.
+
+(Really, this should be fixed properly by using a general-purpose
+macro processor like m4(1) rather than abusing tradcpp(1) on files
+which are just _not_ C source code!)
+
+https://gnats.netbsd.org/58816
+
+--- lib/Xfm.cpp.orig   2001-08-23 13:27:03.000000000 +0000
++++ lib/Xfm.cpp
+@@ -269,7 +269,7 @@ Xfm*Text*baseTranslations : #override \n
+  Ctrl<Key>J : no-op() \n
+ #else
+ Xfm*TextField.baseTranslations:#override\n\
+-HIST_TRANSLATION(FocusSet(), ) \
++ HIST_TRANSLATION(FocusSet(), ) \
+ Shift <Key>Tab:FocusTraverse(b)\n\
+       <Key>Tab:FocusTraverse()\n\
+       <FocusIn>:Detail_NotifyAncestor(CursorState,a)\n\
+@@ -328,7 +328,7 @@ Xfm*awform*icon box.baseTranslations: #o
+ Xfm*file window*folderlabel.baseTranslations: #override\n\
+   <Enter>           : trackCursor()\n\
+   <Leave>           : trackCursor()\n\
+-HIST_TRANSLATION(,) \
++ HIST_TRANSLATION(,) \
+   <Btn1Up>(2)         : fileRefresh()\n
+ Xfm*file window*viewport.baseTranslations:#override\n\
+   <Enter>: trackCursor()\n <Leave>: trackCursor()\n
+@@ -416,7 +416,7 @@ LOG_TRANSLATION \
+       <Key>q                  : notify(*file*quit)\n
+ #else
+ Xfm*file window*folderlabel.baseTranslations: #override\n\
+-HIST_TRANSLATION(,)\
++ HIST_TRANSLATION(,)\
+   <Btn1Up>(2)         : fileRefresh()\n
+ Xfm*file window*icon box*file_icon.baseTranslations: #override\n\
+   <Enter>             : fileMaybeHighlight()\n\