On Sun Jul 05, 2020 at 05:40:31PM +0200, Rafael Sadowski wrote:
> Please find below a diff to update xglobe to 0.6. The original xglobe is
> dead upstream. I modernized it just for fun and with the motivation to
> get rid of Qt3/KDE3 from the ports tree. This is a complete rewrite in
> C++17/Qt5.
>
> Anyway, this is the first version after the reconstruction. For KDE and
> Linux it comes with Plasma support. For OpenBSD xwallpaper is required
> to draw the wallpaper.
>
> I will try to continue to work on it and am happy about feedback.
>
> Rafael
>
Bump to 0.6.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile 26 Jan 2020 11:14:34 -0000 1.80
+++ Makefile 6 Jul 2020 06:57:11 -0000
@@ -2,66 +2,43 @@
COMMENT= display the Earth on X11
+V= 0.6.1
+DISTNAME= xglobe-${V}
+
CATEGORIES= x11 geo
-HOMEPAGE= http://www.shaderwrangler.com/xglobe/
-#MASTER_SITES= ${HOMEPAGE}
-# Temporary release
-MASTER_SITES= https://distfiles.sigtrap.nl/
-DISTNAME= xglobe-0.5p2
-PKGNAME= xglobe-0.5
-REVISION= 44
+
+HOMEPAGE= https://github.com/sizeofvoid/xglobe
MAINTAINER= Marc Espie <es...@openbsd.org>
-# GPL, included map is free
+# GPLv2, included map is free
PERMIT_PACKAGE= Yes
-WANTLIB= X11 c m pthread ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Core Qt5DBus Qt5Gui Qt5Widgets
+WANTLIB += Qt5X11Extras SM X11 Xext c m
-MODULES= x11/qt3
+MASTER_SITES= https://github.com/sizeofvoid/xglobe/releases/download/v${V}/
-MAKE_FLAGS= XGLOBE_DIR=${PREFIX}
+MODULES= devel/cmake \
+ x11/qt5
-RUN_DEPENDS= geo/openbsd-developers
+LIB_DEPENDS= x11/qt5/qtx11extras
+
+RUN_DEPENDS= geo/openbsd-developers \
+ x11/xwallpaper
+BUILD_DEPENDS= x11/xwallpaper
FLAVORS= no_map
FLAVOR?=
.if ${FLAVOR:Mno_map}
-DISTFILES= ${DISTNAME}-no-map${EXTRACT_SUFX}
-
-# Kludge install for no map around
-pre-install:
- @touch ${WRKSRC}/map.bmp
-
-post-install::
- @rm ${PREFIX}/lib/xglobe/map.bmp
+CONFIGURE_ARGS = -DENABLE_INSTALL_MAPS=OFF
+.else
+CONFIGURE_ARGS = -DENABLE_INSTALL_MAPS=ON
.endif
+WRKDIST= ${WRKDIR}/xglobe
-MAKE_FLAGS+= QT_INCLUDE_DIR=${MODQT_INCDIR}
-MAKE_FLAGS+= QT_LIB_DIR=${MODQT_LIBDIR}
-
-MAKE_FLAGS+= CPP="${CXX}" LINK="${CXX}"
-MAKE_FLAGS+= OPTIONS="${CXXFLAGS} -pthread -fno-exceptions -funroll-loops"
-MAKE_FLAGS+= LFLAGS='-pthread'
-MAKE_FLAGS+= LIBS='-lX11 -lqt-mt -lm'
-
-# for linking against libpng
-MAKE_FLAGS+= 'LIB_DIRS=-L$$(QT_LIB_DIR) -L$$(X11_LIB_DIR) -L$(LOCALBASE)/lib'
-MAKE_FLAGS+= COPTS='${COPTS}'
-
-NO_TEST= Yes
-
-post-install::
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xglobe
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xglobe
- ${INSTALL_DATA} ${WRKSRC}/README.maps ${PREFIX}/share/doc/xglobe
+post-install:
${INSTALL_SCRIPT} ${FILESDIR}/getcloudmap ${PREFIX}/bin
- ln -sf ${TRUEPREFIX}/share/markers/OpenBSD
${PREFIX}/lib/xglobe/OpenBSD-markers
-
-SUPDISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-no-map${EXTRACT_SUFX}
-
-FAKE_FLAGS= XGLOBE_DIR=${WRKINST}${PREFIX}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:16:07 -0000 1.4
+++ distinfo 6 Jul 2020 06:57:11 -0000
@@ -1,4 +1,2 @@
-SHA256 (xglobe-0.5p2-no-map.tar.gz) =
OHweWixJvGs6YMVkBxxOZAgn5vkB23O1CBVSgdnIH1g=
-SHA256 (xglobe-0.5p2.tar.gz) = nXI1HqCwV5zLv6ik+YwdBbJRYUGeyW66Rv/etowhrI0=
-SIZE (xglobe-0.5p2-no-map.tar.gz) = 125689
-SIZE (xglobe-0.5p2.tar.gz) = 1066277
+SHA256 (xglobe-0.6.1.tar.gz) = wfSdSLsBbKkGgb+1suXx/6/Af2MBn9p2MmKsiFVOz5A=
+SIZE (xglobe-0.6.1.tar.gz) = 4673981
Index: patches/patch-desktopwidget_cpp
===================================================================
RCS file: patches/patch-desktopwidget_cpp
diff -N patches/patch-desktopwidget_cpp
--- patches/patch-desktopwidget_cpp 17 Dec 2018 18:49:50 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-desktopwidget_cpp,v 1.1 2018/12/17 18:49:50 jca Exp $
-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
--- patches/patch-desktopwidget_h 17 Dec 2018 18:49:50 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-desktopwidget_h,v 1.1 2018/12/17 18:49:50 jca Exp $
-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-file_cpp
===================================================================
RCS file: patches/patch-file_cpp
diff -N patches/patch-file_cpp
--- patches/patch-file_cpp 30 Sep 2002 15:01:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-file_cpp,v 1.1 2002/09/30 15:01:37 naddy Exp $
---- file.cpp.orig Mon Sep 30 17:01:06 2002
-+++ file.cpp Mon Sep 30 17:01:19 2002
-@@ -3,6 +3,7 @@
- #include <qstring.h>
- #include <qfile.h>
- #include <qfileinfo.h>
-+#include <stdlib.h>
-
- static const char *userdir;
-
Index: patches/patch-renderer_cpp
===================================================================
RCS file: patches/patch-renderer_cpp
diff -N patches/patch-renderer_cpp
--- patches/patch-renderer_cpp 17 Dec 2018 18:49:50 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-renderer_cpp,v 1.6 2018/12/17 18:49:50 jca Exp $
-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;
-
-+ map = loadImage(mapfile ? mapfile : "map.bmp");
-+
- renderedImage = new QImage(size, 32);
- if(!renderedImage)
- {
-@@ -98,8 +100,6 @@ Renderer::Renderer(const QSize &size, const char *mapf
- ::exit(1);
- }
-
-- map = loadImage(mapfile ? mapfile : "map.bmp");
--
- // fprintf(stderr, "Map size: %dx%d\n", map->width(), map->height());
-
- this->radius = 1000.;
Index: pkg/PFRAG.no-no_map
===================================================================
RCS file: /cvs/ports/x11/xglobe/pkg/PFRAG.no-no_map,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PFRAG.no-no_map
--- pkg/PFRAG.no-no_map 22 May 2000 14:01:10 -0000 1.1
+++ pkg/PFRAG.no-no_map 6 Jul 2020 06:57:11 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.no-no_map,v 1.1 2000/05/22 14:01:10 espie Exp $
-lib/xglobe/map.bmp
+share/xglobe/default_map.png
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/xglobe/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 17 May 2018 10:23:12 -0000 1.5
+++ pkg/PLIST 6 Jul 2020 06:57:11 -0000
@@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2018/05/17 10:23:12 espie Exp $
bin/getcloudmap
@bin bin/xglobe
-lib/xglobe/
-lib/xglobe/OpenBSD-markers
-lib/xglobe/xglobe-markers
share/doc/xglobe/
-share/doc/xglobe/README
-share/doc/xglobe/README.maps
+share/doc/xglobe/README.md
+share/doc/xglobe/README.xglobe-0.5
+share/doc/xglobe/README.xglobe-0.5.maps
+share/xglobe/
+share/xglobe/xglobe-markers
!%%no_map%%
