CVS commit: pkgsrc/multimedia/subtitleeditor

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu May 14 19:30:42 UTC 2020

Modified Files:
        pkgsrc/multimedia/subtitleeditor: Makefile distinfo
Added Files:
        pkgsrc/multimedia/subtitleeditor/patches:
            patch-plugins_subtitleformats_sami_sami.cc patch-src_document.cc
            patch-src_vp_gstplayer.cc

Log Message:
Can't have two functions with the signature of a copy constructor.
Don't assign NUL to a pointer. Avoid C++ UDL. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/multimedia/subtitleeditor/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/subtitleeditor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_subtitleformats_sami_sami.cc \
    pkgsrc/multimedia/subtitleeditor/patches/patch-src_document.cc \
    pkgsrc/multimedia/subtitleeditor/patches/patch-src_vp_gstplayer.cc

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

Modified files:

Index: pkgsrc/multimedia/subtitleeditor/Makefile
diff -u pkgsrc/multimedia/subtitleeditor/Makefile:1.48 pkgsrc/multimedia/subtitleeditor/Makefile:1.49
--- pkgsrc/multimedia/subtitleeditor/Makefile:1.48      Tue Mar 10 22:10:42 2020
+++ pkgsrc/multimedia/subtitleeditor/Makefile   Thu May 14 19:30:42 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2020/03/10 22:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2020/05/14 19:30:42 joerg Exp $
 
 DISTNAME=      subtitleeditor-0.54.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=kitone/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/multimedia/subtitleeditor/distinfo
diff -u pkgsrc/multimedia/subtitleeditor/distinfo:1.9 pkgsrc/multimedia/subtitleeditor/distinfo:1.10
--- pkgsrc/multimedia/subtitleeditor/distinfo:1.9       Fri Oct 18 18:33:18 2019
+++ pkgsrc/multimedia/subtitleeditor/distinfo   Thu May 14 19:30:42 2020
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.9 2019/10/18 18:33:18 nia Exp $
+$NetBSD: distinfo,v 1.10 2020/05/14 19:30:42 joerg Exp $
 
 SHA1 (subtitleeditor-0.54.0.tar.gz) = 23e455bc70adfd8761c0d1fe112e95f65fed6776
 RMD160 (subtitleeditor-0.54.0.tar.gz) = fffcbad1723d353d291fe6cde15efc3ed9205d7e
 SHA512 (subtitleeditor-0.54.0.tar.gz) = 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
 Size (subtitleeditor-0.54.0.tar.gz) = 1783077 bytes
 SHA1 (patch-configure) = 582178786148b92ab20d19a1fdc8529b58e40242
+SHA1 (patch-plugins_subtitleformats_sami_sami.cc) = d9fffa01d4775c170df46c24c719a4f520e0f608
+SHA1 (patch-src_document.cc) = 278609130457e82a7a4f75c1941675475485b2fe
+SHA1 (patch-src_vp_gstplayer.cc) = aae33047650dd28013bafe27e205ad7b45761940

Added files:

Index: pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_subtitleformats_sami_sami.cc
diff -u /dev/null pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_subtitleformats_sami_sami.cc:1.1
--- /dev/null   Thu May 14 19:30:42 2020
+++ pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_subtitleformats_sami_sami.cc Thu May 14 19:30:42 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_subtitleformats_sami_sami.cc,v 1.1 2020/05/14 19:30:42 joerg Exp $
+
+--- plugins/subtitleformats/sami/sami.cc.orig  2020-05-13 22:48:36.225341679 +0000
++++ plugins/subtitleformats/sami/sami.cc
+@@ -263,7 +263,7 @@ public:
+                                       {
+                                               inptr = (char *)(line.c_str());
+                                               p = tmptext;
+-                                              p = '\0';
++                                              *p = '\0';
+ 
+                                               state = SAMI_STATE_INIT;
+                                               continue;
Index: pkgsrc/multimedia/subtitleeditor/patches/patch-src_document.cc
diff -u /dev/null pkgsrc/multimedia/subtitleeditor/patches/patch-src_document.cc:1.1
--- /dev/null   Thu May 14 19:30:42 2020
+++ pkgsrc/multimedia/subtitleeditor/patches/patch-src_document.cc      Thu May 14 19:30:42 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_document.cc,v 1.1 2020/05/14 19:30:42 joerg Exp $
+
+--- src/document.cc.orig       2020-05-13 22:31:40.710310072 +0000
++++ src/document.cc
+@@ -78,7 +78,7 @@ Document::Document()
+ /*
+  * Constructor by copy
+  */
+-Document::Document(Document &src, bool copy_subtitles = true )
++Document::Document(Document &src, bool copy_subtitles)
+ :CommandSystem(*this), m_subtitles(*this), m_styles(*this), m_subtitleView(NULL)
+ {
+       m_timing_mode = src.m_timing_mode;
Index: pkgsrc/multimedia/subtitleeditor/patches/patch-src_vp_gstplayer.cc
diff -u /dev/null pkgsrc/multimedia/subtitleeditor/patches/patch-src_vp_gstplayer.cc:1.1
--- /dev/null   Thu May 14 19:30:42 2020
+++ pkgsrc/multimedia/subtitleeditor/patches/patch-src_vp_gstplayer.cc  Thu May 14 19:30:42 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_vp_gstplayer.cc,v 1.1 2020/05/14 19:30:42 joerg Exp $
+
+--- src/vp/gstplayer.cc.orig   2020-05-13 22:35:58.988861353 +0000
++++ src/vp/gstplayer.cc
+@@ -257,7 +257,7 @@ bool GstPlayer::seek(long start, long en
+       gint64 gend = end * Gst::MILLI_SECOND;
+ 
+       se_debug_message(SE_DEBUG_VIDEO_PLAYER,
+-                      "pipeline->seek(%" GST_TIME_FORMAT", %"GST_TIME_FORMAT")", 
++                      "pipeline->seek(%" GST_TIME_FORMAT", %" GST_TIME_FORMAT ")",
+                       GST_TIME_ARGS(gstart), GST_TIME_ARGS(gend));
+ 
+       bool ret = m_pipeline->seek(