CVS commit: pkgsrc/devel/gnustep-objc

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Apr 17 13:32:23 UTC 2020

Modified Files:
        pkgsrc/devel/gnustep-objc: distinfo
        pkgsrc/devel/gnustep-objc/patches: patch-objcxx_eh.cc patch-objcxx_eh.h

Log Message:
Use <typeinfo> in all cases


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/gnustep-objc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc \
    pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h

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

Modified files:

Index: pkgsrc/devel/gnustep-objc/distinfo
diff -u pkgsrc/devel/gnustep-objc/distinfo:1.12 pkgsrc/devel/gnustep-objc/distinfo:1.13
--- pkgsrc/devel/gnustep-objc/distinfo:1.12     Thu Apr 16 09:28:39 2020
+++ pkgsrc/devel/gnustep-objc/distinfo  Fri Apr 17 13:32:23 2020
@@ -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

Index: pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc
diff -u pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc:1.1 pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc:1.2
--- pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc:1.1    Thu Apr 16 09:28:39 2020
+++ pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc        Fri Apr 17 13:32:23 2020
@@ -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 @@ Workaround build failure due to redefini
  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 @@ Workaround build failure due to redefini
  
  using namespace std;
  
- 
Index: pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h
diff -u pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h:1.1 pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h:1.2
--- pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h:1.1     Thu Apr 16 09:28:39 2020
+++ pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h Fri Apr 17 13:32:23 2020
@@ -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 @@ Workaround build failure due to redefini
  /**
   * 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 @@ Workaround build failure due to redefini
  /**
   * 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.