[pkgsrc/trunk]: pkgsrc/multimedia/mkvtoolnix mkvtoolnix: Fix runtime crash on...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a92708a03f0
branches:  trunk
changeset: 316029:5a92708a03f0
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Dec 03 12:15:03 2018 +0000

description:
mkvtoolnix: Fix runtime crash on SunOS.  Bump PKGREVISION.

diffstat:

 multimedia/mkvtoolnix/Makefile                            |   3 +-
 multimedia/mkvtoolnix/distinfo                            |   3 +-
 multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp |  20 +++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r a2efa55abe1f -r 5a92708a03f0 multimedia/mkvtoolnix/Makefile
--- a/multimedia/mkvtoolnix/Makefile    Mon Dec 03 11:43:37 2018 +0000
+++ b/multimedia/mkvtoolnix/Makefile    Mon Dec 03 12:15:03 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.119 2018/12/02 17:13:41 adam Exp $
+# $NetBSD: Makefile,v 1.120 2018/12/03 12:15:03 jperkin Exp $
 
 DISTNAME=      mkvtoolnix-29.0.0
+PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  https://mkvtoolnix.download/sources/
 EXTRACT_SUFX=  .tar.xz
diff -r a2efa55abe1f -r 5a92708a03f0 multimedia/mkvtoolnix/distinfo
--- a/multimedia/mkvtoolnix/distinfo    Mon Dec 03 11:43:37 2018 +0000
+++ b/multimedia/mkvtoolnix/distinfo    Mon Dec 03 12:15:03 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2018/12/02 17:13:41 adam Exp $
+$NetBSD: distinfo,v 1.58 2018/12/03 12:15:03 jperkin Exp $
 
 SHA1 (mkvtoolnix-29.0.0.tar.xz) = c794cc9e37dc24207051c21eb8e7f4a2deef7cb6
 RMD160 (mkvtoolnix-29.0.0.tar.xz) = 174006d8e7aab417335c60bd168dc8698842689c
@@ -6,3 +6,4 @@
 Size (mkvtoolnix-29.0.0.tar.xz) = 7051380 bytes
 SHA1 (patch-Rakefile) = bac8a1e581725e329079ab0acccd83795d707594
 SHA1 (patch-build-config.in) = a9072de691ee3e011b472280dd276a67f1799fac
+SHA1 (patch-src_common_locale.cpp) = 46ba293fb0dee8af0e6e6fbe17c725a509101109
diff -r a2efa55abe1f -r 5a92708a03f0 multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mkvtoolnix/patches/patch-src_common_locale.cpp Mon Dec 03 12:15:03 2018 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_common_locale.cpp,v 1.1 2018/12/03 12:15:03 jperkin Exp $
+
+Remove broken SunOS section that is no longer needed.
+https://gitlab.com/mbunkus/mkvtoolnix/issues/2450
+
+--- src/common/locale.cpp.orig 2018-12-01 11:15:36.000000000 +0000
++++ src/common/locale.cpp
+@@ -292,12 +292,6 @@ get_local_charset() {
+   setlocale(LC_CTYPE, "");
+ #if defined(COMP_MINGW) || defined(COMP_MSC)
+   lc_charset = "CP" + to_string(GetACP());
+-#elif defined(SYS_SOLARIS)
+-  int i;
+-
+-  lc_charset = nl_langinfo(CODESET);
+-  if (parse_number(lc_charset, i))
+-    lc_charset = "ISO"s + lc_charset + "-US"s;
+ #elif HAVE_NL_LANGINFO
+   lc_charset = nl_langinfo(CODESET);
+ #elif HAVE_LOCALE_CHARSET