From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 1 17:40:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DEBAEF22 for ; Sat, 1 Jun 2013 17:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C38848C2 for ; Sat, 1 Jun 2013 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r51He0nN042794 for ; Sat, 1 Jun 2013 17:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r51He0oL042780; Sat, 1 Jun 2013 17:40:00 GMT (envelope-from gnats) Resent-Date: Sat, 1 Jun 2013 17:40:00 GMT Resent-Message-Id: <201306011740.r51He0oL042780@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nikola Lecic Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2D3FE9B1 for ; Sat, 1 Jun 2013 17:31:35 +0000 (UTC) (envelope-from nl@anthesphoria.net) Received: from anthesphoria.net (anthesphoria.net [204.109.61.206]) by mx1.freebsd.org (Postfix) with ESMTP id 0484E893 for ; Sat, 1 Jun 2013 17:31:34 +0000 (UTC) Received: from anthesphoria.net (localhost [127.0.0.1]) by anthesphoria.net (8.14.6/8.14.6) with ESMTP id r51GmMXV045393 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 1 Jun 2013 20:48:22 +0400 (MSK) (envelope-from nl@anthesphoria.net) Received: (from nl@localhost) by anthesphoria.net (8.14.6/8.14.6/Submit) id r51GmMMt045392; Sat, 1 Jun 2013 20:48:22 +0400 (MSK) (envelope-from nl) Message-Id: <201306011648.r51GmMMt045392@anthesphoria.net> Date: Sat, 1 Jun 2013 20:48:22 +0400 (MSK) From: Nikola Lecic To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179177: print/libotf: update to 0.9.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Nikola Lecic List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jun 2013 17:40:00 -0000 >Number: 179177 >Category: ports >Synopsis: print/libotf: update to 0.9.13 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 01 17:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Nikola Lecic >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD uranium 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: * update to 0.9.13 * new MASTER_SITES (Makefile) * new project's home (pkg_descr) * pet portlint * removing patches NOTES TO THE COMMITTER * this patch delete files/ and it's contents; patches went upstream * please close ports/179162 after committing this patch >How-To-Repeat: >Fix: --- libotf-0.9.13.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 319560) +++ Makefile (working copy) @@ -1,15 +1,11 @@ -# New ports collection makefile for: libotf -# Date created: 18 May 2004 -# Whom: Kimura Fuyuki -# +# Created by: Kimura Fuyuki # $FreeBSD$ -# PORTNAME= libotf -PORTVERSION= 0.9.12 +PORTVERSION= 0.9.13 CATEGORIES= print devel -MASTER_SITES= http://www.m17n.org/libotf/ \ - http://anthesphoria.net/FreeBSD/ports/distfiles/ +MASTER_SITES= ${MASTER_SITE_SAVANNAH}:m17n +MASTER_SITE_SUBDIR= m17n MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= Library for handling OpenType fonts @@ -17,7 +13,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_XORG= x11 xt xaw xmu -USE_GNOME= pkgconfig +USE_PKGCONFIG= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Index: distinfo =================================================================== --- distinfo (revision 319560) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libotf-0.9.12.tar.gz) = a4a04cccf84955242202a4a7e50314259030c1f1573675085ba1c5a95b529297 -SIZE (libotf-0.9.12.tar.gz) = 363974 +SHA256 (libotf-0.9.13.tar.gz) = 7bc466ba50425f95b52de12b4ad35320acefcef13ce67bf33edc14abdcfe6908 +SIZE (libotf-0.9.13.tar.gz) = 388832 Index: files/patch-example_otfdump.c =================================================================== --- files/patch-example_otfdump.c (revision 319560) +++ files/patch-example_otfdump.c (working copy) @@ -1,25 +0,0 @@ ---- example/otfdump.c 19 Mar 2010 12:27:02 -0000 1.27 -+++ example/otfdump.c 11 Feb 2011 02:52:37 -0000 1.28 -@@ -32,12 +32,8 @@ - - #include - --char *indent_spaces[] = -- { "", " ", " ", " ", " ", " ", " ", -- " ", " ", " " }; -- - /* Indented print. */ --#define IPRINT printf("\n%s", indent_spaces[indent]), printf -+#define IPRINT printf("\n%*s", indent * 2, ""), printf - - static void - dump_tag (OTF_Tag tag) -@@ -457,6 +453,8 @@ - static void - dump_anchor (int indent, OTF_Anchor *anchor) - { -+ if (anchor->offset == 0) -+ return; - IPRINT ("(Anchor (offset #x%04X) (AnchorFormat %d)", - anchor->offset, anchor->AnchorFormat); - indent++; Index: files/patch-src_otfopen.c =================================================================== --- files/patch-src_otfopen.c (revision 319560) +++ files/patch-src_otfopen.c (working copy) @@ -1,45 +0,0 @@ ---- src/otfopen.c 22 Sep 2010 03:46:17 -0000 1.62 -+++ src/otfopen.c 11 Feb 2011 02:55:05 -0000 1.63 -@@ -2336,8 +2336,9 @@ - } - for (i = 0; i < array->Count; i++) - for (j = 0; j < ClassCount; j++) -- if (read_anchor (otf, stream, offset + array->offset, -- &array->AnchorRecord[i].Anchor[j]) < 0) -+ if (array->AnchorRecord[i].Anchor[j].offset > 0 -+ && read_anchor (otf, stream, offset + array->offset, -+ &array->AnchorRecord[i].Anchor[j]) < 0) - return -1; - RESTORE_STREAM (stream, state); - return 0; -@@ -2437,7 +2438,7 @@ - unsigned ClassCount, OTF_LigatureAttach *attach) - { - char *errfmt = "LigatureAttach%s"; -- int errret = 1; -+ int errret = -1; - int i, j; - - SEEK_STREAM (stream, offset + attach->offset); -@@ -2483,8 +2484,10 @@ - for (i = 0; i < array->LigatureCount; i++) - READ_OFFSET (stream, array->LigatureAttach[i].offset); - for (i = 0; i < array->LigatureCount; i++) -- read_ligature_attach (otf, stream, offset + array->offset, -- class_count, array->LigatureAttach + i); -+ if (array->LigatureAttach[i].offset > 0 -+ && read_ligature_attach (otf, stream, offset + array->offset, -+ class_count, array->LigatureAttach + i) < 0) -+ return -1; - RESTORE_STREAM (stream, state); - return 0; - } -@@ -2625,7 +2628,7 @@ - read_coverage (otf, stream, offset, &subtable->Coverage); - read_coverage (otf, stream, offset, - &subtable->u.mark_mark1.Mark2Coverage); -- READ_UINT16 (stream, subtable->u.mark_base1.ClassCount); -+ READ_UINT16 (stream, subtable->u.mark_mark1.ClassCount); - read_mark_array (otf, stream, offset, - &subtable->u.mark_mark1.Mark1Array); - read_anchor_array (otf, stream, offset, Index: pkg-descr =================================================================== --- pkg-descr (revision 319560) +++ pkg-descr (working copy) @@ -9,4 +9,4 @@ The combination of libotf and the FreeType library (Ver. 2) realizes CTL (complex text layout) by OpenType fonts. -WWW: http://www.m17n.org/libotf/ +WWW: http://www.nongnu.org/m17n/ --- libotf-0.9.13.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: