zoneminder: Drop patches for files that no longer exist

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 14 13:33:27 2024 -0500
Changeset:	d31d2981a893e9f55f1fc29408040c427e33d777

Modified Files:
	zoneminder/distinfo
Removed Files:
	zoneminder/patches/patch-src_zm__thread.h
	zoneminder/patches/patch-src_zm__timer.h

Log Message:
zoneminder: Drop patches for files that no longer exist

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

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__thread.h | 91 -------------------------------
 zoneminder/patches/patch-src_zm__timer.h  | 28 ----------
 3 files changed, 121 deletions(-)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index ef375db018..1896fc058c 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -21,8 +21,6 @@ SHA1 (patch-src_zm__eventstream.cpp) = 63040024a69c9362e544e8950da57d831824f2f8
 SHA1 (patch-src_zm__monitor.cpp) = 5611aa37187bc9910ba1ccd9ddd5d0f421438b53
 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) = 0326a092f441a481975548a73d0c8f7af1fc702c
 SHA1 (patch-src_zm_comms_cpp) = bd3c3e6dd4d11ea0845d2da662e99169cd6e6680
 SHA1 (patch-src_zm_comms_h) = e9e25dced4ad54aa118f153fbd3390d1eb525e65
diff --git a/zoneminder/patches/patch-src_zm__thread.h b/zoneminder/patches/patch-src_zm__thread.h
deleted file mode 100644
index 696db6f84f..0000000000
--- a/zoneminder/patches/patch-src_zm__thread.h
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-src_zm__thread.h,v 1.4 2015/04/10 02:58:49 dsainty Exp $
-
-Fix build with Clang.
-
-pthread_t is opaque, and under NetBSD is a pointer.  It's being abused here,
-but the value is only used for logging, and casting pthread_self() is more
-portable than syscall(SYS_gettid).
-
-\todo Fix correctly upstream.
-
---- src/zm_thread.h.orig	2018-12-08 14:22:36.000000000 +0000
-+++ src/zm_thread.h
-@@ -22,19 +22,20 @@
- 
- #include <unistd.h>
- #include <pthread.h>
-+#include <stdint.h>
- #include <unistd.h>
--#ifdef HAVE_SYS_SYSCALL_H
--#include <sys/syscall.h>
--#endif // HAVE_SYS_SYSCALL_H
- #include "zm_exception.h"
- #include "zm_utils.h"
- #ifdef __FreeBSD__
- #include <sys/thr.h>
- #endif
-+#ifdef __NetBSD__
-+#include <lwp.h>
-+#endif
- 
- class ThreadException : public Exception {
- private:
--#ifndef SOLARIS
-+#ifndef USE_PTHREAD
-   pid_t pid() {
-     pid_t tid; 
- #ifdef __FreeBSD__ 
-@@ -44,6 +45,8 @@ private:
- #else 
-   #ifdef __FreeBSD_kernel__
-     if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
-+  #elif defined(__NetBSD__)
-+    tid = _lwp_self();
-   # else
-     tid=syscall(SYS_gettid); 
-   #endif
-@@ -54,7 +57,7 @@ private:
-   pthread_t pid() { return( pthread_self() ); }
- #endif
- public:
--  explicit ThreadException( const std::string &message ) : Exception( stringtf("(%d) ", (long int)pid())+message ) {
-+  explicit ThreadException( const std::string &message ) : Exception( stringtf("(%jd) ", (intmax_t)pid())+message ) {
-   }
- };
- 
-@@ -209,7 +212,7 @@ protected:
- 
-   Mutex mThreadMutex;
-   Condition mThreadCondition;
--#ifndef SOLARIS
-+#ifndef USE_PTHREAD
-   pid_t mPid;
- #else
-   pthread_t mPid;
-@@ -222,7 +225,7 @@ protected:
-   Thread();
-   virtual ~Thread();
- 
--#ifndef SOLARIS
-+#ifndef USE_PTHREAD
-   pid_t id() const {
-     pid_t tid; 
- #ifdef __FreeBSD__ 
-@@ -233,6 +236,8 @@ protected:
-   #ifdef __FreeBSD_kernel__
-     if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
- 
-+  #elif defined(__NetBSD__)
-+    tid = _lwp_self();
-   #else
-     tid=syscall(SYS_gettid); 
-   #endif
-@@ -257,7 +262,7 @@ public:
-   void join();
-   void kill( int signal );
-   bool isThread() {
--    return( mPid > -1 && pthread_equal( pthread_self(), mThread ) );
-+    return( /* mPid > -1 && */ pthread_equal( pthread_self(), mThread ) );
-   }
-   bool isStarted() const { return mStarted; }
-   bool isRunning() const { return mRunning; }
diff --git a/zoneminder/patches/patch-src_zm__timer.h b/zoneminder/patches/patch-src_zm__timer.h
deleted file mode 100644
index b1d0b56043..0000000000
--- a/zoneminder/patches/patch-src_zm__timer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_zm__timer.h,v 1.3 2015/04/10 02:58:49 dsainty Exp $
-
-Fix build with Clang.
-
-pthread_t is opaque, and under NetBSD is a pointer.  It's being abused here,
-but the value is only used for logging, and casting pthread_self() is more
-portable than syscall(SYS_gettid).
-
---- src/zm_timer.h.orig	2018-12-08 14:22:36.000000000 +0000
-+++ src/zm_timer.h
-@@ -33,7 +33,7 @@ private:
-   class TimerException : public Exception
-   {
-   private:
--#ifndef SOLARIS
-+#if !defined(SOLARIS) && !defined(__NetBSD__)
-     pid_t pid() {
-     pid_t tid;
- #ifdef __FreeBSD__
-@@ -53,7 +53,7 @@ private:
-   pthread_t pid() { return( pthread_self() ); }
- #endif
-   public:
--    explicit TimerException( const std::string &message ) : Exception( stringtf("(%d) ", (long int)pid())+message ) {
-+    explicit TimerException( const std::string &message ) : Exception( stringtf( ("(%d) "+message).c_str(), (long int)pid() ) ) {
-     }
-   };
-