On Sat, Dec 15, 2018 at 03:08:26AM +0100, Charlene Wendling wrote: > Hi, > > Marc, i'm CC-ing you because there is a x11/xglobe diff with "surprising" > results (at the bottom).
Nothing surprising about it. Okay for that part. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/xglobe/Makefile,v > retrieving revision 1.77 > diff -u -p -u -p -r1.77 Makefile > --- Makefile 24 Oct 2018 14:28:14 -0000 1.77 > +++ Makefile 15 Dec 2018 00:25:47 -0000 > @@ -9,7 +9,7 @@ HOMEPAGE= http://www.shaderwrangler.com/ > MASTER_SITES= https://distfiles.nl/ > DISTNAME= xglobe-0.5p2 > PKGNAME= xglobe-0.5 > -REVISION= 43 > +REVISION= 44 > > MAINTAINER= Marc Espie <es...@openbsd.org> > > Index: patches/patch-desktopwidget_cpp > =================================================================== > RCS file: patches/patch-desktopwidget_cpp > diff -N patches/patch-desktopwidget_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-desktopwidget_cpp 15 Dec 2018 00:25:47 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > +Fix for ports-gcc-4.9: > +desktopwidget.cpp:34:5: error: '::exit' has not been declared > +Index: desktopwidget.cpp > +--- desktopwidget.cpp.orig > ++++ desktopwidget.cpp > +@@ -31,7 +31,7 @@ DesktopWidget::DesktopWidget(QWidget *parent, const ch > + if(!currentImage) > + { > + fprintf(stderr, "Not enough memory!\n"); > +- ::exit(1); > ++ std::exit(1); > + } > + // fprintf(stderr, "Desktop size: %dx%d\n",width(), height()); > + } > Index: patches/patch-desktopwidget_h > =================================================================== > RCS file: patches/patch-desktopwidget_h > diff -N patches/patch-desktopwidget_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-desktopwidget_h 15 Dec 2018 00:25:47 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > +Fix for ports-gcc-4.9: > +desktopwidget.cpp:34:5: error: '::exit' has not been declared > +Index: desktopwidget.h > +--- desktopwidget.h.orig > ++++ desktopwidget.h > +@@ -26,6 +26,7 @@ > + #include <qwidget.h> > + #include <qpixmap.h> > + #include <qpainter.h> > ++#include <cstdlib> > + > + class DesktopWidget : public QWidget > + { > Index: patches/patch-renderer_cpp > =================================================================== > RCS file: /cvs/ports/x11/xglobe/patches/patch-renderer_cpp,v > retrieving revision 1.5 > diff -u -p -u -p -r1.5 patch-renderer_cpp > --- patches/patch-renderer_cpp 23 Nov 2002 15:45:19 -0000 1.5 > +++ patches/patch-renderer_cpp 15 Dec 2018 00:25:47 -0000 > @@ -1,7 +1,8 @@ > $OpenBSD: patch-renderer_cpp,v 1.5 2002/11/23 15:45:19 espie Exp $ > ---- renderer.cpp.orig Sat Nov 23 16:34:35 2002 > -+++ renderer.cpp Sat Nov 23 16:34:49 2002 > -@@ -91,6 +91,8 @@ Renderer::Renderer(const QSize &size, co > +Index: renderer.cpp > +--- renderer.cpp.orig > ++++ renderer.cpp > +@@ -91,6 +91,8 @@ Renderer::Renderer(const QSize &size, const char *mapf > mapcloud = NULL; > track_clouds = NULL; > > @@ -10,7 +11,7 @@ $OpenBSD: patch-renderer_cpp,v 1.5 2002/ > renderedImage = new QImage(size, 32); > if(!renderedImage) > { > -@@ -98,8 +100,6 @@ Renderer::Renderer(const QSize &size, co > +@@ -98,8 +100,6 @@ Renderer::Renderer(const QSize &size, const char *mapf > ::exit(1); > } > > > > Charlène.
