diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-02-02 07:18:25 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-02-02 07:18:25 +0000 |
| commit | d96083cd8656f8bd11d6f740749991d62f2e530a (patch) | |
| tree | ccd78e0538dee2521a446e16211c124fe03c4a89 | |
| parent | 5659252320a8eae3fb428af7fb52dda56e5bab87 (diff) | |
| download | pkgsrc-d96083cd8656f8bd11d6f740749991d62f2e530a.tar.gz | |
Update to 0.2.2
* Update LICENSE
Changelog:
Not available.
| -rw-r--r-- | converters/libwpg/Makefile | 7 | ||||
| -rw-r--r-- | converters/libwpg/distinfo | 10 | ||||
| -rw-r--r-- | converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp | 22 |
3 files changed, 19 insertions, 20 deletions
diff --git a/converters/libwpg/Makefile b/converters/libwpg/Makefile index f84faa2c15f..a202aa625c5 100644 --- a/converters/libwpg/Makefile +++ b/converters/libwpg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2014/01/09 09:33:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2014/02/02 07:18:25 ryoon Exp $ -DISTNAME= libwpg-0.2.0 -PKGREVISION= 2 +DISTNAME= libwpg-0.2.2 CATEGORIES= converters graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwpg/} EXTRACT_SUFX= .tar.bz2 @@ -9,7 +8,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://libwpg.sourceforge.net/ COMMENT= Library for importing and converting Corel WordPerfect Graphics images -LICENSE= gnu-lgpl-v2 +LICENSE= gnu-lgpl-v2 OR mpl-2.0 USE_LANGUAGES= c c++ USE_LIBTOOL= yes diff --git a/converters/libwpg/distinfo b/converters/libwpg/distinfo index 43f9de07f55..5ed981d9dff 100644 --- a/converters/libwpg/distinfo +++ b/converters/libwpg/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2012/03/28 15:16:34 wiz Exp $ +$NetBSD: distinfo,v 1.5 2014/02/02 07:18:25 ryoon Exp $ -SHA1 (libwpg-0.2.0.tar.bz2) = 34a692566bda66488f83c635774d1bd92cee0fdf -RMD160 (libwpg-0.2.0.tar.bz2) = 0169a85c75040dd96b03702c5d2cd67dfded6d1f -Size (libwpg-0.2.0.tar.bz2) = 326684 bytes -SHA1 (patch-src_lib_WPG2Parser.cpp) = 13d38364aca904afa7a00712c6d89311dcb4b4b0 +SHA1 (libwpg-0.2.2.tar.bz2) = e9484e795259485ece9a984f60776704d55afeeb +RMD160 (libwpg-0.2.2.tar.bz2) = 4b631a8f3fcb261205b04c4b0849256d159e8f31 +Size (libwpg-0.2.2.tar.bz2) = 376802 bytes +SHA1 (patch-src_lib_WPG2Parser.cpp) = c5fad4ecdc445f13c97ba7a29f43f257b5487f41 diff --git a/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp b/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp index ede8a0014b1..cbd9ba6ce45 100644 --- a/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp +++ b/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp @@ -1,34 +1,34 @@ -$NetBSD: patch-src_lib_WPG2Parser.cpp,v 1.1 2012/03/28 15:16:35 wiz Exp $ +$NetBSD: patch-src_lib_WPG2Parser.cpp,v 1.2 2014/02/02 07:18:25 ryoon Exp $ Fix clang warning error: operator '?:' has lower precedence than '-'; '-' will be evaluated first [-Werror,-Wparentheses] ---- src/lib/WPG2Parser.cpp.orig 2010-11-09 08:36:36.000000000 +0000 +--- src/lib/WPG2Parser.cpp.orig 2013-04-18 13:13:16.000000000 +0000 +++ src/lib/WPG2Parser.cpp -@@ -783,7 +783,7 @@ void WPG2Parser::handleDPPenForeColor() +@@ -821,7 +821,7 @@ void WPG2Parser::handleDPPenForeColor() unsigned char red = (m_doublePrecision) ? readU16()>>8 : readU8(); unsigned char green = (m_doublePrecision) ? readU16()>>8 : readU8(); unsigned char blue = (m_doublePrecision) ? readU16()>>8 : readU8(); -- unsigned char alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8(); -+ unsigned char alpha = (0xff - (m_doublePrecision)) ? readU16()>>8 : readU8(); +- unsigned char alpha = 0xff - ((m_doublePrecision) ? readU16()>>8 : readU8()); ++ unsigned char alpha = (0xff - ((m_doublePrecision)) ? readU16()>>8 : readU8()); m_style.insert("svg:stroke-color", libwpg::WPGColor(red, green, blue, alpha).getColorString()); m_style.insert("svg:stroke-opacity", libwpg::WPGColor(red, green, blue, alpha).getOpacity(), WPX_PERCENT); -@@ -1106,7 +1106,7 @@ void WPG2Parser::handleDPBrushForeColor( +@@ -1157,7 +1157,7 @@ void WPG2Parser::handleDPBrushForeColor( unsigned char red = (m_doublePrecision) ? readU16()>>8 : readU8(); unsigned char green = (m_doublePrecision) ? readU16()>>8 : readU8(); unsigned char blue = (m_doublePrecision) ? readU16()>>8 : readU8(); -- unsigned char alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8(); -+ unsigned char alpha = (0xff - (m_doublePrecision)) ? readU16()>>8 : readU8(); +- unsigned char alpha = 0xff - ((m_doublePrecision) ? readU16()>>8 : readU8()); ++ unsigned char alpha = (0xff - ((m_doublePrecision)) ? readU16()>>8 : readU8()); WPG_DEBUG_MSG((" Foreground color (RGBA): %d %d %d %d\n", red, green, blue, alpha)); m_brushForeColor = libwpg::WPGColor(red, green, blue, alpha); -@@ -1131,7 +1131,7 @@ void WPG2Parser::handleDPBrushForeColor( +@@ -1182,7 +1182,7 @@ void WPG2Parser::handleDPBrushForeColor( unsigned char red = (m_doublePrecision) ? readU16()>>8 : readU8(); unsigned char green = (m_doublePrecision) ? readU16()>>8 : readU8(); unsigned char blue = (m_doublePrecision) ? readU16()>>8 : readU8(); -- unsigned char alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8(); -+ unsigned char alpha = (0xff - (m_doublePrecision)) ? readU16()>>8 : readU8(); +- unsigned char alpha = 0xff - ((m_doublePrecision) ? readU16()>>8 : readU8()); ++ unsigned char alpha = (0xff - ((m_doublePrecision)) ? readU16()>>8 : readU8()); libwpg::WPGColor color(red, green, blue, alpha); colors.push_back(color); WPG_DEBUG_MSG((" Color #%d (RGBA): %d %d %d %d\n", i+1, red, green, blue, alpha)); |