diff options
| author | dholland <dholland> | 2012-12-21 02:59:04 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-12-21 02:59:04 +0000 |
| commit | 2bfb659c919ddb11218e27826761db7bb6191a29 (patch) | |
| tree | 31f2b7bb7b4783c669d0c6ea4c42172f4767b261 /graphics/ivtools | |
| parent | 6c789f4291b16d8f83ad19d0899890f342581cfe (diff) | |
| download | pkgsrc-2bfb659c919ddb11218e27826761db7bb6191a29.tar.gz | |
Fix LP64 build.
Diffstat (limited to 'graphics/ivtools')
| -rw-r--r-- | graphics/ivtools/Makefile | 4 | ||||
| -rw-r--r-- | graphics/ivtools/distinfo | 7 | ||||
| -rw-r--r-- | graphics/ivtools/patches/patch-bd | 23 |
3 files changed, 28 insertions, 6 deletions
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index bef027dac6e..6a0f02cb72b 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:06 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2012/12/21 02:59:04 dholland Exp $ DISTNAME= ivtools-1.2.8 PKGREVISION= 1 @@ -12,8 +12,6 @@ COMMENT= Drawing editors for PostScript, TeX, and web graphics CONFLICTS+= dclock-[0-9]* -NOT_FOR_PLATFORM= ${LP64PLATFORMS} - DEPENDS+= pstoedit>=3.0:../../graphics/pstoedit DEPENDS+= wget>=1.0:../../net/wget diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo index 890acdf4542..21603037ee7 100644 --- a/graphics/ivtools/distinfo +++ b/graphics/ivtools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2012/12/18 18:23:40 markd Exp $ +$NetBSD: distinfo,v 1.21 2012/12/21 02:59:04 dholland Exp $ SHA1 (ivtools-1.2.8.tgz) = b494c726cf8784e0a5ca3a4092e5831d2d5b2bba RMD160 (ivtools-1.2.8.tgz) = 7f63f2b491202ba81c6d24234760d17d7f95ebc6 @@ -32,7 +32,7 @@ SHA1 (patch-az) = ec58b1583cf750031c848d0455250226f3d54d99 SHA1 (patch-ba) = bcc98482672d9c1642dd108fbecec16627d43345 SHA1 (patch-bb) = 8221a722579cc8921cd71e9ff8aedbf73a938e0b SHA1 (patch-bc) = be65c4c37689880cb66de15efd27ab2fa77d76d0 -SHA1 (patch-bd) = 7803f3d4dca0eeed2dbf4df3f55c81caf6970f1d +SHA1 (patch-bd) = faf9683d941c342eb1ce70fff541e9b8f2034ba1 SHA1 (patch-be) = 71397158e66fb694ad3482ab2c231daa26fa3631 SHA1 (patch-bf) = 60e8f16226e526e75da80652aaeb11b7f51c30a9 SHA1 (patch-bg) = 36113051de323a5483337b4821ffa1a8163f59bf @@ -41,3 +41,6 @@ SHA1 (patch-bi) = 477ce54baeb05a4c383c26af696ce18c07085e60 SHA1 (patch-bj) = d262c3a217b8f7838a08d6a0952417aeb3e525dd SHA1 (patch-bk) = 96edb15971da782c78fc2dd177bce5869cb68201 SHA1 (patch-bl) = 807a2b860184e990fbf5afcebf4a161c4c614741 +SHA1 (patch-src_Attribute_attrvalue.h) = 97be293d03aa7f9da5e0ca90580d91a33e43d418 +SHA1 (patch-src_ComUtil_comutil.arg) = 8e36309f9f0f357f8f55572788595417de549ccf +SHA1 (patch-src_ComUtil_symbols.c) = 69e7c2bc4f9863bc0d3c9ae5e9b97550619cfe16 diff --git a/graphics/ivtools/patches/patch-bd b/graphics/ivtools/patches/patch-bd index ff0370560b6..4c56fcdc3e8 100644 --- a/graphics/ivtools/patches/patch-bd +++ b/graphics/ivtools/patches/patch-bd @@ -1,4 +1,7 @@ -$NetBSD: patch-bd,v 1.3 2012/12/18 18:23:40 markd Exp $ +$NetBSD: patch-bd,v 1.4 2012/12/21 02:59:04 dholland Exp $ + +Fix LP64 build. It is not clear that these casts are correct; on the +other hand, it isn't clear if these code paths are ever used. --- src/Attribute/attrvalue.c.orig 2009-08-26 17:51:51.000000000 +0000 +++ src/Attribute/attrvalue.c @@ -19,3 +22,21 @@ $NetBSD: patch-bd,v 1.3 2012/12/18 18:23:40 markd Exp $ case AttributeValue::StreamType: return stream_mode() != 0; default: +@@ -552,7 +553,7 @@ unsigned int AttributeValue::uint_val() + case AttributeValue::SymbolType: + return (unsigned int) int_val(); + case AttributeValue::ObjectType: +- return (unsigned int)obj_val(); ++ return (unsigned int)(uintptr_t)obj_val(); + default: + return 0; + } +@@ -585,7 +586,7 @@ int AttributeValue::int_val() { + case AttributeValue::SymbolType: + return int_ref(); + case AttributeValue::ObjectType: +- return (int)obj_val(); ++ return (int)(intptr_t)obj_val(); + default: + return 0; + } |