cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update xglobe to 0.6.3

Browse Source 
Xglobe 0.6 is a port from Qt3 to Qt5. I had stared this rework to get rid of
KDE3/Qt3 form the ports tree. It should behave in general like the old version,
with some improvements.

The flavor could actually get out, no response from maintainer, spotted by
landry@

After many months of waiting, maintainer timeout!
This commit is contained in:
rsadowski 2020-12-06 08:32:12 +00:00
parent 6e5deff3c4
commit 7017608f34
8 changed files with 31 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
x11/xglobe/Makefile
View File

@ -1,67 +1,42 @@
# $OpenBSD: Makefile,v 1.80 2020/01/26 11:14:34 jasper Exp $
# $OpenBSD: Makefile,v 1.81 2020/12/06 08:32:12 rsadowski Exp $
COMMENT= display the Earth on X11
V= 0.6.3
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 <espie@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
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>

6
x11/xglobe/distinfo
View File

@ -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.3.tar.gz) = rlUWOxGk60KUGFRLV9emFVctsJlU05wZQrg6k1r2zvA=
SIZE (xglobe-0.6.3.tar.gz) = 4678592

15
x11/xglobe/patches/patch-desktopwidget_cpp
View File

@ -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());
}

14
x11/xglobe/patches/patch-desktopwidget_h
View File

@ -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
{

11
x11/xglobe/patches/patch-file_cpp
View File

@ -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;

22
x11/xglobe/patches/patch-renderer_cpp
View File

@ -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.;

4
x11/xglobe/pkg/PFRAG.no-no_map
View File

@ -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
@comment $OpenBSD: PFRAG.no-no_map,v 1.2 2020/12/06 08:32:12 rsadowski Exp $
share/xglobe/default_map.png

12
x11/xglobe/pkg/PLIST
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2018/05/17 10:23:12 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2020/12/06 08:32:12 rsadowski 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%%