Date: Wed, 18 Jan 2017 11:21:41 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431784 - in head/x11-toolkits/fltk-devel: . files Message-ID: <201701181121.v0IBLfNv090932@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Jan 18 11:21:41 2017 New Revision: 431784 URL: https://svnweb.freebsd.org/changeset/ports/431784 Log: x11-toolkits/fltk-devel: unbreak with clang 4.0 src/Fl_Tree_Item.cxx:552:38: error: ordered comparison between pointer and zero ('Fl_Tree_Item *' and 'int') if ( from_parent->deparent(from) < 0 ) // deparent self from current parent ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 216046 Obtained from: upstream (branch-1.3) Approved by: portmgr blanket MFH: 2017Q1 (r431752 followup) Added: head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx (contents, props changed) Modified: head/x11-toolkits/fltk-devel/Makefile (contents, props changed) Modified: head/x11-toolkits/fltk-devel/Makefile ============================================================================== --- head/x11-toolkits/fltk-devel/Makefile Wed Jan 18 09:40:49 2017 (r431783) +++ head/x11-toolkits/fltk-devel/Makefile Wed Jan 18 11:21:41 2017 (r431784) @@ -3,7 +3,7 @@ PORTNAME= fltk DISTVERSION= 1.3.x-r${SNAPSHOT_VERS} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://fltk.org/pub/${PORTNAME}/snapshots/ PKGNAMESUFFIX= -devel Added: head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx Wed Jan 18 11:21:41 2017 (r431784) @@ -0,0 +1,16 @@ +------------------------------------------------------------------------ +r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines + +Fix return value test, as pointed out by Albrecht. + +--- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC ++++ src/Fl_Tree_Item.cxx +@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite + } else { // different parent? + if ( to > to_parent->children() ) // try to prevent a reparent() error + return -4; +- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent ++ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent + return -5; + if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to' + to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701181121.v0IBLfNv090932>