From owner-freebsd-ports@FreeBSD.ORG  Fri Oct 18 18:23:47 2013
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9D99D49B
 for <freebsd-ports@freebsd.org>; Fri, 18 Oct 2013 18:23:47 +0000 (UTC)
 (envelope-from t.sowa@ttmath.org)
Received: from rent-cms.pl (rent-cms.pl [87.98.234.64])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6116025E7
 for <freebsd-ports@freebsd.org>; Fri, 18 Oct 2013 18:23:46 +0000 (UTC)
Received: from s100.slimaczek.pl (dynamic-78-8-247-71.ssp.dialog.net.pl
 [78.8.247.71])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by rent-cms.pl (postfix) with ESMTPSA id E0931309A13A
 for <freebsd-ports@freebsd.org>; Fri, 18 Oct 2013 20:12:49 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ttmath.org; s=ttmath;
 t=1382119970; bh=ZX0KoAxfF/xjMp+I4IJyHZbm//xbGr9c38xyq4rCrmc=;
 h=Date:From:To:Subject;
 b=y/ITtQnV0NYpO+/xqGr8qZgAPVzSJ7HcEpNP40A6L6c77qHiFfqicC+FRaxNOj8kz
 IRKPw5GzCDxJJXauIkA4cd0tofjXXjCmQ0I4BbfDByz9NxKpw0FSbLXtGT8JUxyAYd
 jsB4rkLQA17XShZtFRmIQXX/4KC1apjC3M6tg/7S/pqFIJtAzAkFAp5oFyTNtXQdNL
 ZOLJ78G2QrMQeTN/T5U/l8Hg6MSxCY+4oHCQ4reRTb9ByhyLycdWdfPhcZln6ioyXf
 HPYUAQrQ9qUFz4d5Z9IofjCkSYewpsvhnle2SOVYZkHyxZfETTiaO82bIP4EvSQPze
 BuYC044X9x55g==
Message-ID: <52617B3C.9070608@ttmath.org>
Date: Fri, 18 Oct 2013 20:17:32 +0200
From: Tomasz Sowa <t.sowa@ttmath.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.0
MIME-Version: 1.0
To: FreeBSD Ports ML <freebsd-ports@freebsd.org>
Subject: graphics/inkscape commit r330754
X-Enigmail-Version: 1.5.2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 18:23:47 -0000

Hi

Thank you for the update for compiling with clang. I have got a question
about one function:
void sp_item_rm_unsatisfied_cns(SPItem &item)
from src/sp-item-rm-unsatisfied-cns.cpp

before patching it is:
void sp_item_rm_unsatisfied_cns(SPItem &item)
{
    if (item.constraints.empty()) {
        return;
    }
    std::vector<Inkscape::SnapCandidatePoint> snappoints;
    sp_item_snappoints(&item, snappoints, NULL);
    for (unsigned i = item.constraints.size(); i--;) {
        g_assert( i < item.constraints.size() );
        SPGuideConstraint const &cn = item.constraints[i];
        int const snappoint_ix = cn.snappoint_ix;
        g_assert( snappoint_ix < int(snappoints.size()) );
        if (!approx_equal( sp_guide_distance_from_pt(cn.g,
snappoints[snappoint_ix].getPoint()), 0) ) {
            remove_last(cn.g->attached_items, SPGuideAttachment(&item,
cn.snappoint_ix));
            g_assert( i < item.constraints.size() );
            vector<SPGuideConstraint>::iterator const
ei(&item.constraints[i]);
            item.constraints.erase(ei);
        }
    }
}

but after patching the last erase() is changed to:
item.constraints.erase(item.constraints.begin() + 1);

and this is not the same, it propably should be:
item.constraints.erase(item.constraints.begin() + i);

-- 
Tomek