diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-05-29 12:29:00 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-05-29 12:29:00 +0000 |
| commit | 018b46f03a665fb2f4a7de9d37e7d8680d018e74 (patch) | |
| tree | 09445d891a2d311b54e695dea6127f501519490e /graphics | |
| parent | bfae1f5ccc3bb7accac882a98eb98d1071c1198a (diff) | |
| download | pkgsrc-018b46f03a665fb2f4a7de9d37e7d8680d018e74.tar.gz | |
Fix runtime crash of otfview command on NetBSD. Bump PKGREVISION
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/libotf/Makefile | 3 | ||||
| -rw-r--r-- | graphics/libotf/distinfo | 3 | ||||
| -rw-r--r-- | graphics/libotf/patches/patch-example_otfview.c | 37 |
3 files changed, 41 insertions, 2 deletions
diff --git a/graphics/libotf/Makefile b/graphics/libotf/Makefile index 7aba30b5940..8ab9bfaf41a 100644 --- a/graphics/libotf/Makefile +++ b/graphics/libotf/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2018/05/07 07:55:33 dholland Exp $ +# $NetBSD: Makefile,v 1.18 2019/05/29 12:29:00 ryoon Exp $ DISTNAME= libotf-0.9.16 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.savannah.gnu.org/releases/m17n/ diff --git a/graphics/libotf/distinfo b/graphics/libotf/distinfo index 8e3799d7859..a83fefb4c01 100644 --- a/graphics/libotf/distinfo +++ b/graphics/libotf/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2018/05/07 07:55:33 dholland Exp $ +$NetBSD: distinfo,v 1.11 2019/05/29 12:29:00 ryoon Exp $ SHA1 (libotf-0.9.16.tar.gz) = ee3037f468a5381de89846ee1c78320964cfbf78 RMD160 (libotf-0.9.16.tar.gz) = ddea1124409fa97a58386251aa70b961c11b9374 SHA512 (libotf-0.9.16.tar.gz) = 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4 Size (libotf-0.9.16.tar.gz) = 423979 bytes SHA1 (patch-configure) = 5d43a445f6950ac14e5a91f37b25601d951868c2 +SHA1 (patch-example_otfview.c) = 1fec42a22bef9ecfefc9656b4f69ec6c95715bb6 diff --git a/graphics/libotf/patches/patch-example_otfview.c b/graphics/libotf/patches/patch-example_otfview.c new file mode 100644 index 00000000000..45d33a83077 --- /dev/null +++ b/graphics/libotf/patches/patch-example_otfview.c @@ -0,0 +1,37 @@ +$NetBSD: patch-example_otfview.c,v 1.1 2019/05/29 12:29:00 ryoon Exp $ + +* Fix a runtime crash on NetBSD. + +--- example/otfview.c.orig 2015-09-02 13:39:25.000000000 +0000 ++++ example/otfview.c +@@ -28,6 +28,7 @@ write to the Free Software Foundation, I + #include <sys/stat.h> + #include <unistd.h> + #include <libgen.h> ++#include <sys/param.h> + + #include "config.h" + #ifdef HAVE_ALLOCA_H +@@ -1603,7 +1604,10 @@ ExposeProc (Widget w, XEvent *event, Str + { + XTextProperty text_prop; + char *pname = "otfview"; +- char *fname = basename (filename); ++ char *tmpfname = basename (filename); ++ size_t len = strlen(tmpfname); ++ char fname[MAXPATHLEN]; ++ snprintf(fname, len + 1, "%s", tmpfname); + char *name = alloca (strlen (fname) + 3 + strlen (pname) + 1); + + sprintf (name, "%s - %s", pname, fname); +@@ -1735,7 +1739,9 @@ main (int argc, char **argv) + char title[256]; + Arg arg[1]; + +- filename = basename (filename); ++ char *tmpfilename = basename (filename); ++ size_t len = strlen(tmpfilename); ++ snprintf(filename, len + 1, "%s", tmpfilename); + sprintf (title, "%s family:%s style:%s", + filename, face->family_name, face->style_name); + XtSetArg (arg[0], XtNtitle, title); |