svn commit: r431844 - in branches/2017Q1/x11-toolkits: fltk fltk-devel fltk-devel/files fltk/files

[Jan Beich]

Author: jbeich
Date: Thu Jan 19 05:18:24 2017
New Revision: 431844
URL: https://svnweb.freebsd.org/changeset/ports/431844

Log:
  MFH: r431752 r431784
  
  x11-toolkits/fltk{,-devel}: unbreak with clang 4.0
  
  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
  Approved by:	ports-secteam (feld, junovitch)

Added:
  branches/2017Q1/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx
     - copied unchanged from r431784, head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx
  branches/2017Q1/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx
     - copied unchanged from r431752, head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx
Modified:
  branches/2017Q1/x11-toolkits/fltk-devel/Makefile
  branches/2017Q1/x11-toolkits/fltk/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/x11-toolkits/fltk-devel/Makefile
==============================================================================
--- branches/2017Q1/x11-toolkits/fltk-devel/Makefile	Thu Jan 19 05:13:54 2017	(r431843)
+++ branches/2017Q1/x11-toolkits/fltk-devel/Makefile	Thu Jan 19 05:18:24 2017	(r431844)
@@ -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

Copied: branches/2017Q1/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx (from r431784, head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx	Thu Jan 19 05:18:24 2017	(r431844, copy of r431784, head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx)
@@ -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

Modified: branches/2017Q1/x11-toolkits/fltk/Makefile
==============================================================================
--- branches/2017Q1/x11-toolkits/fltk/Makefile	Thu Jan 19 05:13:54 2017	(r431843)
+++ branches/2017Q1/x11-toolkits/fltk/Makefile	Thu Jan 19 05:18:24 2017	(r431844)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fltk
 PORTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source

Copied: branches/2017Q1/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx (from r431752, head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx	Thu Jan 19 05:18:24 2017	(r431844, copy of r431752, head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx)
@@ -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