Re: UPDATE: x11/xglobe
On Sat Nov 07, 2020 at 09:39:10AM +0100, Landry Breuil wrote: > On Sat, Nov 07, 2020 at 07:42:56AM +0100, Rafael Sadowski wrote: > > 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 > > > > > > Update to 0.6.3. This version includes feedback from espie@ and ends > > with the following fixes/features: > > > > - Add support to override xwallpaper default options > > - Adjust error,infos and debug messages and bugfixes > > - Documentation > > maybe a dumb question, but does it make sense to keep the complexity > coming with the flavor ? > Good question, let the maintainer decide!
Re: UPDATE: x11/xglobe
On Sat, Nov 07, 2020 at 07:42:56AM +0100, Rafael Sadowski wrote: > 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 > > > Update to 0.6.3. This version includes feedback from espie@ and ends > with the following fixes/features: > > - Add support to override xwallpaper default options > - Adjust error,infos and debug messages and bugfixes > - Documentation maybe a dumb question, but does it make sense to keep the complexity coming with the flavor ?
Re: UPDATE: x11/xglobe
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
Update to 0.6.3. This version includes feedback from espie@ and ends
with the following fixes/features:
- Add support to override xwallpaper default options
- Adjust error,infos and debug messages and bugfixes
- Documentation
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile26 Jan 2020 11:14:34 - 1.80
+++ Makefile7 Nov 2020 06:40:00 -
@@ -2,66 +2,41 @@
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
-# 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
+
+MASTER_SITES= https://github.com/sizeofvoid/xglobe/releases/download/v${V}/
-MODULES= x11/qt3
+MODULES= devel/cmake \
+ x11/qt5
-MAKE_FLAGS=XGLOBE_DIR=${PREFIX}
+LIB_DEPENDS= x11/qt5/qtx11extras
-RUN_DEPENDS= geo/openbsd-developers
+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
Index: distinfo
===
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:07 - 1.4
+++ distinfo7 Nov 2020 06:40:00 -
@@ -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
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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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, "Des
Re: UPDATE: x11/xglobe
On Mon Jul 06, 2020 at 08:57:58AM +0200, Rafael Sadowski wrote:
> 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
>
>
Update to 0.6.2. I have only added MacOS support, so not *BSD relevant.
Index: Makefile
===
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile26 Jan 2020 11:14:34 - 1.80
+++ Makefile26 Sep 2020 07:19:46 -
@@ -2,66 +2,41 @@
COMMENT= display the Earth on X11
+V= 0.6.2
+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
-# 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
+
+MASTER_SITES= https://github.com/sizeofvoid/xglobe/releases/download/v${V}/
-MODULES= x11/qt3
+MODULES= devel/cmake \
+ x11/qt5
-MAKE_FLAGS=XGLOBE_DIR=${PREFIX}
+LIB_DEPENDS= x11/qt5/qtx11extras
-RUN_DEPENDS= geo/openbsd-developers
+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
Index: distinfo
===
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:07 - 1.4
+++ distinfo26 Sep 2020 07:19:46 -
@@ -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.2.tar.gz) = Bxc8h9wWmUb16O8m9HQNzSOGDwdmt/zgKccjIPR2Hkg=
+SIZE (xglobe-0.6.2.tar.gz) = 4677922
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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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());
Re: UPDATE: x11/xglobe
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 I fully intend to have a look considering how much time I spent on that port a few years ago.
Re: UPDATE: x11/xglobe
On Mon, Jul 06, 2020 at 08:57:58AM +0200, Rafael Sadowski wrote: > 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 Pretty cool stuff, i fully support this removal of REVISION=44 in the Makefile (and the potential removal of qt3) :D Landry
Re: UPDATE: x11/xglobe
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
--- Makefile26 Jan 2020 11:14:34 - 1.80
+++ Makefile6 Jul 2020 06:57:11 -
@@ -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
-# 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
Index: distinfo
===
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:07 - 1.4
+++ distinfo6 Jul 2020 06:57:11 -
@@ -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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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-d
UPDATE: x11/xglobe
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
Index: Makefile
===
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile26 Jan 2020 11:14:34 - 1.80
+++ Makefile5 Jul 2020 15:40:04 -
@@ -2,66 +2,43 @@
COMMENT= display the Earth on X11
+V= 0.6
+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
-# 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
Index: distinfo
===
RCS file: /cvs/ports/x11/xglobe/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:07 - 1.4
+++ distinfo5 Jul 2020 15:40:04 -
@@ -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.tar.gz) = dIWWL1nYHaZYxTt64ZjaPJ0XV7ir2jEgSBeY8Oi0oD0=
+SIZE (xglobe-0.6.tar.gz) = 4673936
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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
