CVS commit: pkgsrc/sysutils/xfm

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Feb 24 21:45:24 UTC 2020

Modified Files:
        pkgsrc/sysutils/xfm: Makefile distinfo
        pkgsrc/sysutils/xfm/patches: patch-src_TextField.c

Log Message:
Fix xfm segfault with newer Xaw3d. Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/xfm/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/xfm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/xfm/patches/patch-src_TextField.c

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.22 pkgsrc/sysutils/xfm/Makefile:1.23
--- pkgsrc/sysutils/xfm/Makefile:1.22   Mon Nov  4 21:28:59 2019
+++ pkgsrc/sysutils/xfm/Makefile        Mon Feb 24 21:45:24 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:59 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2020/02/24 21:45:24 bouyer Exp $
 
 DISTNAME=      xfm-1.4.3
-PKGREVISION=   5
+PKGREVISION=   6
 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.9 pkgsrc/sysutils/xfm/distinfo:1.10
--- pkgsrc/sysutils/xfm/distinfo:1.9    Mon Nov 26 06:52:22 2018
+++ pkgsrc/sysutils/xfm/distinfo        Mon Feb 24 21:45:24 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2018/11/26 06:52:22 dholland Exp $
+$NetBSD: distinfo,v 1.10 2020/02/24 21:45:24 bouyer Exp $
 
 SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2
 RMD160 (xfm-1.4.3.tar.gz) = b06c562b467e5085e5ecdd4273b64d554415ce69
@@ -14,4 +14,4 @@ SHA1 (patch-ad) = 64709ecb67e91d8677545a
 SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d
 SHA1 (patch-af) = 075d38b00064ef6a853e62268e07a0432b1a7710
 SHA1 (patch-ag) = 5c825371254e0056c5b932901bacc5599dd514d2
-SHA1 (patch-src_TextField.c) = 440ce47a2ba5e8cc2b6a70a5f487da84307df8ab
+SHA1 (patch-src_TextField.c) = 26cce4ffa1f1aa57a4d08b3465cfece48d0592ea

Index: pkgsrc/sysutils/xfm/patches/patch-src_TextField.c
diff -u pkgsrc/sysutils/xfm/patches/patch-src_TextField.c:1.1 pkgsrc/sysutils/xfm/patches/patch-src_TextField.c:1.2
--- pkgsrc/sysutils/xfm/patches/patch-src_TextField.c:1.1       Wed Oct 14 20:17:28 2015
+++ pkgsrc/sysutils/xfm/patches/patch-src_TextField.c   Mon Feb 24 21:45:24 2020
@@ -1,8 +1,20 @@
-$NetBSD: patch-src_TextField.c,v 1.1 2015/10/14 20:17:28 wiz Exp $
+$NetBSD: patch-src_TextField.c,v 1.2 2020/02/24 21:45:24 bouyer Exp $
 
---- src/TextField.c.orig       2000-04-04 15:05:36.000000000 +0000
-+++ src/TextField.c
-@@ -705,11 +705,6 @@ TextFieldClassRec textFieldClassRec = {
+--- src/TextField.c.orig       2020-02-24 17:23:51.228109581 +0100
++++ src/TextField.c    2020-02-24 17:24:38.970387116 +0100
+@@ -662,11 +662,7 @@
+ 
+ TextFieldClassRec textFieldClassRec = {
+   { /* core fields */
+-#ifdef XAW3D
+-    /* superclass             */      (WidgetClass) &threeDClassRec,
+-#else
+     /* superclass             */      (WidgetClass) &simpleClassRec,
+-#endif
+     /* class_name             */      "TextField",
+     /* widget_size            */      sizeof(TextFieldRec),
+     /* class_initialize               */      ClassInitialize,
+@@ -702,11 +698,6 @@
    { /* simple    fields */
      /* change_sensitive */            XtInheritChangeSensitive
    },
@@ -14,7 +26,7 @@ $NetBSD: patch-src_TextField.c,v 1.1 201
    { /* textField fields */
      /* empty                  */      0
    }
-@@ -2315,11 +2310,6 @@ ReDisplay(tfw,False);
+@@ -2312,11 +2303,6 @@
  if (TF.label)
        DrawLabel(tfw,False);