From 591a04186547470ead163f955bc39ef9c87348c6 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 24 Sep 2023 17:08:06 +1300 Subject: [PATCH] duma: Drop 2_5_15 Drop duma 2_5_15 which was marked as obsolete in the last release. Signed-off-by: Chris Packham --- packages/duma/2_5_15/0000-cross-compile.patch | 35 ------- packages/duma/2_5_15/0001-separate_cpp.patch | 22 ----- .../duma/2_5_15/0002-cpp11-new-operator.patch | 97 ------------------- packages/duma/2_5_15/0003-cpp17_throw.patch | 73 -------------- packages/duma/2_5_15/chksum | 8 -- packages/duma/2_5_15/version.desc | 1 - 6 files changed, 236 deletions(-) delete mode 100644 packages/duma/2_5_15/0000-cross-compile.patch delete mode 100644 packages/duma/2_5_15/0001-separate_cpp.patch delete mode 100644 packages/duma/2_5_15/0002-cpp11-new-operator.patch delete mode 100644 packages/duma/2_5_15/0003-cpp17_throw.patch delete mode 100644 packages/duma/2_5_15/chksum delete mode 100644 packages/duma/2_5_15/version.desc diff --git a/packages/duma/2_5_15/0000-cross-compile.patch b/packages/duma/2_5_15/0000-cross-compile.patch deleted file mode 100644 index 6978eba6..00000000 --- a/packages/duma/2_5_15/0000-cross-compile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - GNUmakefile | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -93,10 +93,6 @@ - # also define 'WIN32' - - # some defaults: --CC=gcc --CXX=g++ --AR=ar --RANLIB=ranlib - INSTALL=install - RM=rm - RMFORCE=rm -f -@@ -471,7 +467,7 @@ - - createconf$(EXEPOSTFIX): createconf.o - - $(RMFORCE) createconf$(EXEPOSTFIX) -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) -+ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) - - tstheap$(EXEPOSTFIX): libduma.a tstheap.o - - $(RMFORCE) tstheap$(EXEPOSTFIX) -@@ -532,7 +528,7 @@ - # define rules how to build objects for createconf - # - createconf.o: -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ -+ $(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ - - - # diff --git a/packages/duma/2_5_15/0001-separate_cpp.patch b/packages/duma/2_5_15/0001-separate_cpp.patch deleted file mode 100644 index bd6c6ee2..00000000 --- a/packages/duma/2_5_15/0001-separate_cpp.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- - GNUmakefile | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -289,9 +289,13 @@ - dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \ - createconf.c - --OBJECTS=dumapp.o duma.o sem_inc.o print.o -+OBJECTS = duma.o sem_inc.o print.o -+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o - --SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o -+ifeq ($(DUMA_CPP),1) -+OBJECTS += dumapp.o -+SO_OBJECTS += dumapp_so.o -+endif - - # Make all the top-level targets the makefile knows about. - all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) diff --git a/packages/duma/2_5_15/0002-cpp11-new-operator.patch b/packages/duma/2_5_15/0002-cpp11-new-operator.patch deleted file mode 100644 index 4504cd75..00000000 --- a/packages/duma/2_5_15/0002-cpp11-new-operator.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- - dumapp.cpp | 12 ++++-------- - dumapp.h | 13 +++++++++---- - 2 files changed, 13 insertions(+), 12 deletions(-) - ---- a/dumapp.cpp -+++ b/dumapp.cpp -@@ -189,8 +189,7 @@ - * Single object form, no debug information - * (11) = (a) ; ASW - */ --void * DUMA_CDECL operator new( DUMA_SIZE_T size ) --throw(std::bad_alloc) -+void * DUMA_CDECL operator new( DUMA_SIZE_T size ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK); - } -@@ -253,8 +252,7 @@ - * Array object form, no debug information - * (21) = (a) ; AAW - */ --void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) --throw(std::bad_alloc) -+void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK); - } -@@ -320,8 +318,7 @@ - * Single object form with debug information - * (31) = (a) ; ASW - */ --void * DUMA_CDECL operator new( DUMA_SIZE_T size, const char *filename, int lineno ) --throw( std::bad_alloc ) -+void * DUMA_CDECL operator new( DUMA_SIZE_T size, const char *filename, int lineno ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_FILELINE); - } -@@ -373,8 +370,7 @@ - * Array object form with debug information - * (41) = (a) ; AAW - */ --void * DUMA_CDECL operator new[]( DUMA_SIZE_T size, const char *filename, int lineno ) --throw( std::bad_alloc ) -+void * DUMA_CDECL operator new[]( DUMA_SIZE_T size, const char *filename, int lineno ) NEW_THROW_SPEC - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_FILELINE); - } ---- a/dumapp.h -+++ b/dumapp.h -@@ -64,6 +64,11 @@ - #endif - #endif - -+#if __cplusplus <= 199711L -+#define NEW_THROW_SPEC throw(std::bad_alloc) -+#else -+#define NEW_THROW_SPEC -+#endif - - #ifndef DUMA_NO_CPP_SUPPORT - -@@ -81,7 +86,7 @@ - /* (12) = (b) ; ASN */ - /* (13) = (c) ; FSW */ - /* (14) = (d) ; FSN */ -- void * DUMA_CDECL operator new(DUMA_SIZE_T) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new(DUMA_SIZE_T) NEW_THROW_SPEC; - void * DUMA_CDECL operator new(DUMA_SIZE_T, const std::nothrow_t &) throw(); - void DUMA_CDECL operator delete(void *) throw(); - void DUMA_CDECL operator delete(void *, const std::nothrow_t &) throw(); -@@ -91,7 +96,7 @@ - /* (22) = (b) ; AAN */ - /* (23) = (c) ; FAW */ - /* (24) = (d) ; FAN */ -- void * DUMA_CDECL operator new[](DUMA_SIZE_T) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new[](DUMA_SIZE_T) NEW_THROW_SPEC; - void * DUMA_CDECL operator new[](DUMA_SIZE_T, const std::nothrow_t &) throw(); - void DUMA_CDECL operator delete[](void *) throw(); - void DUMA_CDECL operator delete[](void *, const std::nothrow_t &) throw(); -@@ -103,7 +108,7 @@ - /* (32) = (b) ; ASN */ - /* (33) = (c) ; FSW */ - /* (34) = (d) ; FSN */ -- void * DUMA_CDECL operator new(DUMA_SIZE_T, const char *, int) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new(DUMA_SIZE_T, const char *, int) NEW_THROW_SPEC; - void * DUMA_CDECL operator new(DUMA_SIZE_T, const std::nothrow_t &, const char *, int) throw(); - void DUMA_CDECL operator delete(void *, const char *, int) throw(); - void DUMA_CDECL operator delete(void *, const std::nothrow_t &, const char *, int) throw(); -@@ -113,7 +118,7 @@ - /* (42) = (b) ; AAN */ - /* (43) = (c) ; FAW */ - /* (44) = (d) ; FAN */ -- void * DUMA_CDECL operator new[](DUMA_SIZE_T, const char *, int) throw(std::bad_alloc); -+ void * DUMA_CDECL operator new[](DUMA_SIZE_T, const char *, int) NEW_THROW_SPEC; - void * DUMA_CDECL operator new[](DUMA_SIZE_T, const std::nothrow_t &, const char *, int) throw(); - void DUMA_CDECL operator delete[](void *, const char *, int) throw(); - void DUMA_CDECL operator delete[](void *, const std::nothrow_t &, const char *, int) throw(); diff --git a/packages/duma/2_5_15/0003-cpp17_throw.patch b/packages/duma/2_5_15/0003-cpp17_throw.patch deleted file mode 100644 index f468c5db..00000000 --- a/packages/duma/2_5_15/0003-cpp17_throw.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- - testoperators.cpp | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - ---- a/testoperators.cpp -+++ b/testoperators.cpp -@@ -37,26 +37,26 @@ - { - public: - /* 1x : SINGLE OBJECT FORM - NO DEBUG INFORMATION */ -- void * operator new( DUMA_SIZE_T ) throw(std::bad_alloc); -+ void * operator new( DUMA_SIZE_T ) NEW_THROW_SPEC; - void * operator new( DUMA_SIZE_T , const std::nothrow_t & ) throw(); - void operator delete( void * ) throw(); - void operator delete( void * , const std::nothrow_t & ) throw(); - - /* 2x : ARRAY OBJECT FORM - NO DEBUG INFORMATION */ -- void * operator new[]( DUMA_SIZE_T ) throw(std::bad_alloc); -+ void * operator new[]( DUMA_SIZE_T ) NEW_THROW_SPEC; - void * operator new[]( DUMA_SIZE_T , const std::nothrow_t & ) throw(); - void operator delete[]( void * ) throw(); - void operator delete[]( void *, const std::nothrow_t & ) throw(); - - #ifndef DUMA_NO_LEAKDETECTION - /* 3x : SINGLE OBJECT FORM - WITH DEBUG INFORMATION */ -- void * operator new( DUMA_SIZE_T, const char *, int ) throw( std::bad_alloc ); -+ void * operator new( DUMA_SIZE_T, const char *, int ) NEW_THROW_SPEC; - void * operator new( DUMA_SIZE_T, const std::nothrow_t &, const char *, int ) throw(); - void operator delete( void *, const char *, int ) throw(); - void operator delete( void *, const std::nothrow_t &, const char *, int ) throw(); - - /* 4x : ARRAY OBJECT FORM - WITH DEBUG INFORMATION */ -- void * operator new[]( DUMA_SIZE_T, const char *, int ) throw( std::bad_alloc ); -+ void * operator new[]( DUMA_SIZE_T, const char *, int ) NEW_THROW_SPEC; - void * operator new[]( DUMA_SIZE_T, const std::nothrow_t &, const char *, int ) throw(); - void operator delete[]( void *, const char *, int ) throw(); - void operator delete[]( void *, const std::nothrow_t &, const char *, int ) throw(); -@@ -70,7 +70,7 @@ - /* 1x : SINGLE OBJECT FORM - NO DEBUG INFORMATION */ - - void * optest::operator new( DUMA_SIZE_T s ) --throw(std::bad_alloc) -+NEW_THROW_SPEC - { - (void)s; - return ::new optest; -@@ -101,7 +101,7 @@ - - /* 2x : ARRAY OBJECT FORM - NO DEBUG INFORMATION */ - void * optest::operator new[]( DUMA_SIZE_T s ) --throw(std::bad_alloc) -+NEW_THROW_SPEC - { - return ::new optest[ s / sizeof(optest) ]; // "s / sizeof()" not correct but works for this test - } -@@ -129,7 +129,7 @@ - - /* 3x : SINGLE OBJECT FORM - WITH DEBUG INFORMATION */ - void * optest::operator new( DUMA_SIZE_T s, const char * f, int l ) --throw( std::bad_alloc ) -+NEW_THROW_SPEC - { - (void)s; - return ::new(f,l) optest; -@@ -157,7 +157,7 @@ - - /* 4x : ARRAY OBJECT FORM - WITH DEBUG INFORMATION */ - void * optest::operator new[]( DUMA_SIZE_T s, const char * f, int l ) --throw( std::bad_alloc ) -+NEW_THROW_SPEC - { - return ::new(f,l) optest[s / sizeof(optest)]; // "s / sizeof()" not correct but works for this test - } diff --git a/packages/duma/2_5_15/chksum b/packages/duma/2_5_15/chksum deleted file mode 100644 index 282f4fd3..00000000 --- a/packages/duma/2_5_15/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 VERSION_2_5_15.tar.gz 20e54945a96ad924af6353a095d2fa71 -sha1 VERSION_2_5_15.tar.gz 917b6ccc6963074464da723eb4df72f275a9b62d -sha256 VERSION_2_5_15.tar.gz ce49b1e17988edb871deff7a3499f695e62b6f33a888943ee66d06eb5f88a307 -sha512 VERSION_2_5_15.tar.gz 5f04d6ee096285d97f94935577266e1ec9a3967412cd3a816a486dd688e1e6bc2bfc76433f3748d2d1b15ed6307aae6bd6e246dec81797e4d245073b79c6e0b9 -md5 VERSION_2_5_15.zip 5c479350be89102a3d5f6b5c10844e0e -sha1 VERSION_2_5_15.zip 5158ffc263d7e9d9c30f6806e439aeef3b955fd3 -sha256 VERSION_2_5_15.zip 44ca93a6e4fe9a01b1eed833614f1af5b1c80fce58ba285818a71bd774673cf5 -sha512 VERSION_2_5_15.zip 05ecc501d8b999752beb7c2bfeccd5d9f1e302d824fd4ec0628c7af76a181a2b0cc22f8de9f3adbdab853acbef921b6c08c7467b4d6bd4b8970e98e1ec520db8 diff --git a/packages/duma/2_5_15/version.desc b/packages/duma/2_5_15/version.desc deleted file mode 100644 index fcfe3891..00000000 --- a/packages/duma/2_5_15/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes'