pkgsrc-WIP-changes archive

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

zoneminder: Drop undocumented patch that seems to break the build



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Sep 27 12:42:08 2022 -0400
Changeset:	7c0ef9c18332609333eedd0d7928fc794369bc2f

Modified Files:
	zoneminder/distinfo
Removed Files:
	zoneminder/patches/patch-src_zm__utils.cpp
	zoneminder/patches/patch-src_zm__utils.h

Log Message:
zoneminder: Drop undocumented patch that seems to break the build

There was a patch about stringtf signatures, but there was no patch
comment.  For now, just drop it.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7c0ef9c18332609333eedd0d7928fc794369bc2f

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

diffstat:
 zoneminder/distinfo                        |  2 --
 zoneminder/patches/patch-src_zm__utils.cpp | 28 ----------------------------
 zoneminder/patches/patch-src_zm__utils.h   | 14 --------------
 3 files changed, 44 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 9f5275abaf..7010ace4ad 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -20,8 +20,6 @@ SHA1 (patch-src_zm__rtp__ctrl.h) = 4e0fd8e80932de8d77b3386a356cc026ddc23113
 SHA1 (patch-src_zm__rtp__source.cpp) = 2488ae3655f529a71d8b98fa29a9e0435bbdf182
 SHA1 (patch-src_zm__thread.h) = 03e7cce589b62b95676a72df0d6707816c477ffa
 SHA1 (patch-src_zm__timer.h) = 18ab09cd1ce92c80c43d34a2f2f8b9fe614bedeb
-SHA1 (patch-src_zm__utils.cpp) = 49fc733e9ee79d2be4beebe2ec61398a0f292f30
-SHA1 (patch-src_zm__utils.h) = 02501e21103514c7bed76676156e23d4f165342e
 SHA1 (patch-src_zm_comms_cpp) = bd3c3e6dd4d11ea0845d2da662e99169cd6e6680
 SHA1 (patch-src_zm_comms_h) = e9e25dced4ad54aa118f153fbd3390d1eb525e65
 SHA1 (patch-src_zm_logger_cpp) = 79c604a7f85f03acb13e8bce1f4fe48d4cd98cca
diff --git a/zoneminder/patches/patch-src_zm__utils.cpp b/zoneminder/patches/patch-src_zm__utils.cpp
deleted file mode 100644
index f5b94086a2..0000000000
--- a/zoneminder/patches/patch-src_zm__utils.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_zm__utils.cpp,v 1.1 2013/03/24 16:47:47 joerg Exp $
-
-\todo Explain
-
---- src/zm_utils.cpp.orig	2018-12-08 14:22:36.000000000 +0000
-+++ src/zm_utils.cpp
-@@ -66,21 +66,6 @@ std::string replaceAll(std::string str, 
-   return str;
- }
- 
--const std::string stringtf( const char *format, ... )
--{
--  va_list ap;
--  char tempBuffer[8192];
--  std::string tempString;
--
--  va_start(ap, format );
--  vsnprintf( tempBuffer, sizeof(tempBuffer), format , ap );
--  va_end(ap);
--
--  tempString = tempBuffer;
--
--  return( tempString );
--}
--
- const std::string stringtf( const std::string format, ... )
- {
-   va_list ap;
diff --git a/zoneminder/patches/patch-src_zm__utils.h b/zoneminder/patches/patch-src_zm__utils.h
deleted file mode 100644
index 96af7dae0c..0000000000
--- a/zoneminder/patches/patch-src_zm__utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_zm__utils.h,v 1.2 2015/04/05 08:51:08 dsainty Exp $
-
-\todo Explain
-
---- src/zm_utils.h.orig	2018-12-08 14:22:36.000000000 +0000
-+++ src/zm_utils.h
-@@ -33,7 +33,6 @@ std::string trimSet(std::string str, std
- std::string replaceAll(std::string str, std::string from, std::string to);
- 
- const std::string stringtf( const char *format, ... );
--const std::string stringtf( const std::string &format, ... );
- 
- bool startsWith( const std::string &haystack, const std::string &needle );
- StringVector split( const std::string &string, const std::string &chars, int limit=0 );


Home | Main Index | Thread Index | Old Index