diff options
| author | rh <rh@pkgsrc.org> | 2012-10-22 22:10:14 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2012-10-22 22:10:14 +0000 |
| commit | bd684206f70ce98a645cfa2a9c1a009c2e4872ba (patch) | |
| tree | cab11e0bd9f9d8509e68df015f751e02d463bc8a /devel/ObjectiveLib | |
| parent | 50211b57382698bd3d3c835a0a654bf6da37bea9 (diff) | |
| download | pkgsrc-bd684206f70ce98a645cfa2a9c1a009c2e4872ba.tar.gz | |
Make ObjectiveLib compile with libobjc2. Bump PKGREVISION
Diffstat (limited to 'devel/ObjectiveLib')
| -rw-r--r-- | devel/ObjectiveLib/Makefile | 3 | ||||
| -rw-r--r-- | devel/ObjectiveLib/distinfo | 4 | ||||
| -rw-r--r-- | devel/ObjectiveLib/patches/patch-aa | 31 | ||||
| -rw-r--r-- | devel/ObjectiveLib/patches/patch-ab | 15 |
4 files changed, 51 insertions, 2 deletions
diff --git a/devel/ObjectiveLib/Makefile b/devel/ObjectiveLib/Makefile index 0daa25e10ee..09d09e7435b 100644 --- a/devel/ObjectiveLib/Makefile +++ b/devel/ObjectiveLib/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:08 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2012/10/22 22:10:14 rh Exp $ # PKGNAME= ObjectiveLib-1.0.0 DISTNAME= objectivelib-1.0.0 +PKGREVISION= 1 CATEGORIES= devel gnustep MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=objectivelib/} diff --git a/devel/ObjectiveLib/distinfo b/devel/ObjectiveLib/distinfo index e7d722c371e..206df4b1ee6 100644 --- a/devel/ObjectiveLib/distinfo +++ b/devel/ObjectiveLib/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.2 2009/04/17 21:28:39 rh Exp $ +$NetBSD: distinfo,v 1.3 2012/10/22 22:10:14 rh Exp $ SHA1 (objectivelib-1.0.0.tar.gz) = 904046406f63285d2a0e5f6b279f711b34e16ad6 RMD160 (objectivelib-1.0.0.tar.gz) = 688b8430ea1a16482b52506157b58dedbfd35c0c Size (objectivelib-1.0.0.tar.gz) = 833390 bytes +SHA1 (patch-aa) = 3604f398bba598878f731a19aab6ba55006b833d +SHA1 (patch-ab) = bceb865ac5c72d47dfa219411836c047bfae1510 diff --git a/devel/ObjectiveLib/patches/patch-aa b/devel/ObjectiveLib/patches/patch-aa new file mode 100644 index 00000000000..ad3ee23bd33 --- /dev/null +++ b/devel/ObjectiveLib/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1 2012/10/22 22:10:15 rh Exp $ + +Make this compile with libobjc2. + +--- ObjectOutStream.m.orig 2007-03-25 18:12:15.000000000 +0000 ++++ ObjectOutStream.m +@@ -257,11 +257,11 @@ + { + [pointerMap assign: cls]; + [stream writeByte: WIRE_TYPE_CLASS_NAME]; +- len = strlen(cls->name); ++ len = strlen(class_getName(cls)); + [stream writeInt16: len]; +- [stream completelyWriteBytes: (const uint8_t*)cls->name count: len]; +- [stream writeInt: class_get_version(cls)]; +- spr = class_get_super_class(cls); ++ [stream completelyWriteBytes: (const uint8_t*)class_getName(cls) count: len]; ++ [stream writeInt: class_getVersion(cls)]; ++ spr = class_getSuperclass(cls); + if (spr == cls || spr == NULL || [pointerMap lookUp: spr] != UINT32_MAX) + break; + cls = spr; +@@ -363,7 +363,7 @@ + else + { + RAISE_EXCEPTION(OLInputOutputException, +- @"The object of type %s does not respond to writeSelfToStream: or to encodeWithCoder:", ((Class)[object class])->name); ++ @"The object of type %s does not respond to writeSelfToStream: or to encodeWithCoder:", class_getName((Class)[object class])); + } + [pointerMap assign: object]; + } diff --git a/devel/ObjectiveLib/patches/patch-ab b/devel/ObjectiveLib/patches/patch-ab new file mode 100644 index 00000000000..9ed297bfd8c --- /dev/null +++ b/devel/ObjectiveLib/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2012/10/22 22:10:15 rh Exp $ + +Make this compile with libobjc2. + +--- ObjectInStream.m.orig 2007-03-25 18:12:15.000000000 +0000 ++++ ObjectInStream.m +@@ -437,7 +437,7 @@ NSString* const OLClassNotFoundException + else + { + RAISE_EXCEPTION(OLInputOutputException, +- @"Instances of the class \"%s\" do not respond to either initWithObjectInStream: or initWithCoder:", cls->name); ++ @"Instances of the class \"%s\" do not respond to either initWithObjectInStream: or initWithCoder:", class_getName(cls)); + } + object = [cls alloc]; + object = initWithStream ? |