[pkgsrc/trunk]: pkgsrc/devel/gnustep-objc Use <typeinfo> in all cases

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b4b8c415d58
branches:  trunk
changeset: 429205:4b4b8c415d58
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 17 13:32:23 2020 +0000

description:
Use <typeinfo> in all cases

diffstat:

 devel/gnustep-objc/distinfo                   |   6 +++---
 devel/gnustep-objc/patches/patch-objcxx_eh.cc |  24 ++++++++++++++----------
 devel/gnustep-objc/patches/patch-objcxx_eh.h  |  13 +++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)

diffs (94 lines):

diff -r 3a96ee84b85c -r 4b4b8c415d58 devel/gnustep-objc/distinfo
--- a/devel/gnustep-objc/distinfo       Fri Apr 17 13:31:46 2020 +0000
+++ b/devel/gnustep-objc/distinfo       Fri Apr 17 13:32:23 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2020/04/16 09:28:39 manu Exp $
+$NetBSD: distinfo,v 1.13 2020/04/17 13:32:23 joerg Exp $
 
 SHA1 (libobjc2-1.8.1.tar.gz) = 28b53704d481de4414bfe6ae94f2a84358ef766d
 RMD160 (libobjc2-1.8.1.tar.gz) = 1beaf2a2ee4ef1370bbb2fac4f7b1d233f0a9e09
 SHA512 (libobjc2-1.8.1.tar.gz) = 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
 Size (libobjc2-1.8.1.tar.gz) = 173635 bytes
 SHA1 (patch-GNUmakefile) = 0760597d10e72019f5159f9b14996bf7244e6f99
-SHA1 (patch-objcxx_eh.cc) = 329e6e41ab78bd9527051508934e89b1c9a71400
-SHA1 (patch-objcxx_eh.h) = e49fab21285c3a5aaaf6a79fff2105fa029ca90a
+SHA1 (patch-objcxx_eh.cc) = 8804d075cb46380165e40af5f4abd5d8d413b92a
+SHA1 (patch-objcxx_eh.h) = 68a3709ed9d029e6ae4c7a6cc375678ee7c21b1e
diff -r 3a96ee84b85c -r 4b4b8c415d58 devel/gnustep-objc/patches/patch-objcxx_eh.cc
--- a/devel/gnustep-objc/patches/patch-objcxx_eh.cc     Fri Apr 17 13:31:46 2020 +0000
+++ b/devel/gnustep-objc/patches/patch-objcxx_eh.cc     Fri Apr 17 13:32:23 2020 +0000
@@ -1,11 +1,18 @@
-$NetBSD: patch-objcxx_eh.cc,v 1.1 2020/04/16 09:28:39 manu Exp $
+$NetBSD: patch-objcxx_eh.cc,v 1.2 2020/04/17 13:32:23 joerg Exp $
 
-Workaround build failure due to redefinition
+Workaround build failure due to redefinition and include correct header.
 
---- objcxx_eh.cc.orig  2020-04-14 11:22:03.686048307 +0200
-+++ objcxx_eh.cc       2020-04-14 11:22:33.134026599 +0200
-@@ -14,8 +14,9 @@
- }
+--- objcxx_eh.cc.orig  2015-08-07 11:33:41.000000000 +0000
++++ objcxx_eh.cc
+@@ -3,6 +3,7 @@
+ #include "dwarf_eh.h"
+ #include "objcxx_eh.h"
+ #include <exception>
++#include <typeinfo>
+ 
+ extern "C" 
+ {
+@@ -15,6 +16,7 @@ namespace __cxxabiv1
  
  using __cxxabiv1::__class_type_info;
  
@@ -13,9 +20,7 @@
  namespace std
  {
        /**
-        * std::type_info defined with the GCC ABI.  This may not be exposed in
-@@ -47,8 +48,9 @@
-                                               const __class_type_info *target,
+@@ -48,6 +50,7 @@ namespace std
                                                void **thrown_object) const;
        };
  }
@@ -23,4 +28,3 @@
  
  using namespace std;
  
- 
diff -r 3a96ee84b85c -r 4b4b8c415d58 devel/gnustep-objc/patches/patch-objcxx_eh.h
--- a/devel/gnustep-objc/patches/patch-objcxx_eh.h      Fri Apr 17 13:31:46 2020 +0000
+++ b/devel/gnustep-objc/patches/patch-objcxx_eh.h      Fri Apr 17 13:32:23 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-objcxx_eh.h,v 1.1 2020/04/16 09:28:39 manu Exp $
+$NetBSD: patch-objcxx_eh.h,v 1.2 2020/04/17 13:32:23 joerg Exp $
 
 Workaround build failure due to redefinition
 
---- objcxx_eh.h.orig   2015-08-07 13:33:41.000000000 +0200
-+++ objcxx_eh.h        2020-04-14 11:19:51.950615777 +0200
-@@ -1,7 +1,12 @@
+--- objcxx_eh.h.orig   2015-08-07 11:33:41.000000000 +0000
++++ objcxx_eh.h
+@@ -1,6 +1,11 @@
  #ifdef __cplusplus
  extern "C" {
  #endif
@@ -16,9 +16,7 @@
  /**
   * Allocates a C++ exception.  This function is part of the Itanium C++ ABI and
   * is provided externally.
-  */
-@@ -24,9 +29,9 @@
-  * Frees an exception object allocated by __cxa_allocate_exception().  Part of
+@@ -25,7 +30,7 @@ __attribute__((weak)) DECLARE_PERSONALIT
   * the Itanium C++ ABI.
   */
  __attribute__((weak))
@@ -27,4 +25,3 @@
  /**
   * Tests whether a C++ exception contains an Objective-C object, and returns if
   * if it does.  The second argument is a pointer to a boolean value indicating
-  * whether this is a valid object.