diff options
| author | joerg <joerg> | 2016-12-16 00:08:03 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2016-12-16 00:08:03 +0000 |
| commit | 881950579b465364b754b5939ee3ce5884ef1440 (patch) | |
| tree | 2cce12afcf5158ff874fabe7282f053f1930b8dc /x11 | |
| parent | 2e9c9c3c97717ac743e75d099494a9c717a88c77 (diff) | |
| download | pkgsrc-881950579b465364b754b5939ee3ce5884ef1440.tar.gz | |
Change reparent failure check to something more logical. Bump revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk13/Makefile | 4 | ||||
| -rw-r--r-- | x11/fltk13/distinfo | 3 | ||||
| -rw-r--r-- | x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile index 04ab3d55eb0..d6181531e8a 100644 --- a/x11/fltk13/Makefile +++ b/x11/fltk13/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2016/02/17 06:05:41 dbj Exp $ +# $NetBSD: Makefile,v 1.24 2016/12/16 00:08:03 joerg Exp $ DISTNAME= fltk-1.3.3-source -PKGREVISION= 2 +PKGREVISION= 3 PKGNAME= ${DISTNAME:S/-source//} VERS= ${DISTNAME:S/fltk-//:S/-source//} CATEGORIES= x11 diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo index a9163bd057b..0e33cf22514 100644 --- a/x11/fltk13/distinfo +++ b/x11/fltk13/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2016/01/26 08:47:28 dbj Exp $ +$NetBSD: distinfo,v 1.9 2016/12/16 00:08:03 joerg Exp $ SHA1 (fltk-1.3.3-source.tar.gz) = 873aac49b277149e054b9740378e2ca87b0bd435 RMD160 (fltk-1.3.3-source.tar.gz) = a1736ec7da1ff751153e09bc5b5136d2fa95c18b @@ -14,6 +14,7 @@ SHA1 (patch-ae) = 88da94679399b3a8710c23b7f41a7debc8bc92b8 SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f SHA1 (patch-ag) = 61e6d166d0910e02558bacea629f7fb736f7304c SHA1 (patch-src_Fl.cxx) = 169ed990645180694b7cce5baad72a28ac4fcb7a +SHA1 (patch-src_Fl__Tree__Item.cxx) = 39c0c4cbb905caef8cb2ff4159fa12c42ed890d6 SHA1 (patch-src_Fl_cocoa.mm) = 878038c611623b5337634e43d756bfb291872b18 SHA1 (patch-src_Fl_grab.cxx) = 08e2ddabf55c7de46558681ec651acc134182e01 SHA1 (patch-src_Fl_x.cxx) = ca7e4b98c52a84d0bc23ecf33fc30f94c0d16d35 diff --git a/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx b/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx new file mode 100644 index 00000000000..72c9a025ab4 --- /dev/null +++ b/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Fl__Tree__Item.cxx,v 1.1 2016/12/16 00:08:03 joerg Exp $ + +Ordering a pointer with 0 doesn't make sense, so check for failing deparent. + +--- src/Fl_Tree_Item.cxx.orig 2016-12-10 23:21:18.934820703 +0000 ++++ 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) ) // 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 |