pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/58816: sysutils/xfm: fix startup issue caused by incomplete tradcpp macro expansion



>Number:         58816
>Category:       pkg
>Synopsis:       sysutils/xfm: fix startup issue caused by incomplete tradcpp macro expansion
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 07 08:40:00 +0000 2024
>Originator:     RVP
>Release:        pkgsrc-current
>Organization:
>Environment:
NetBSD/amd64 10.99.12
>Description:
Fix for issue b) described here:

https://mail-index.netbsd.org/pkgsrc-users/2024/11/03/msg040503.html

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!)

Fix for issue a) is probably just to uninstall `pkg-config-0.29.2nb2'
Dunno how that got installed. Only one of either `pkgconf' or
`pkg-config' needs to be present. (One of the first packages
I install is `pkgconf'; never needed the other.)
>How-To-Repeat:
See mail.
>Fix:
--START patch--
diff -urN xfm-1.4.3.orig/lib/Xfm.cpp xfm-1.4.3/lib/Xfm.cpp
--- xfm-1.4.3.orig/lib/Xfm.cpp	2001-08-23 13:27:03.000000000 +0000
+++ xfm-1.4.3/lib/Xfm.cpp	2024-11-07 08:22:39.527896047 +0000
@@ -269,7 +269,7 @@
  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*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 @@
  	<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\
--END patch--



Home | Main Index | Thread Index | Old Index