XyGrib: update to 1.1.2.
This commit is contained in:
Andrew Benson
maxice8
parent
759281f7b8
commit
1eba3ff9d2
3 changed files with 11 additions and 104 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd /usr/libexec/XyGrib
|
||||
./bin/XyGrib
|
||||
cd /usr/share/XyGrib
|
||||
./XyGrib
|
||||
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
https://github.com/opengribs/XyGrib/commit/a687a2b9ddbd988661ba000b9a2685e7493bc92c.patch
|
||||
|
||||
From a687a2b9ddbd988661ba000b9a2685e7493bc92c Mon Sep 17 00:00:00 2001
|
||||
From: Menno <menno__@xs4all.nl>
|
||||
Date: Sun, 10 Jun 2018 00:31:06 +0200
|
||||
Subject: [PATCH] remove references to qwt from Makefiles
|
||||
|
||||
---
|
||||
Makefile | 12 +-----------
|
||||
src/xyGrib.pro | 4 ++--
|
||||
2 files changed, 3 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f7b81e1..46c1e0c 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -2,19 +2,16 @@ QMAKE=/usr/bin/qmake
|
||||
|
||||
INSTALLDIR=$(HOME)/XyGrib
|
||||
MACQTBIN=/usr/local/Qt-5.3.2/bin/
|
||||
-QWTDIR=src/qwt-6.1.3
|
||||
|
||||
all: XyGrib
|
||||
|
||||
-SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp \
|
||||
- src/qwt*/src/*.cpp src/qwt*/src/*.h
|
||||
+SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp
|
||||
|
||||
mac: $(SRC)
|
||||
rm -f ./XyGrib
|
||||
rm -fr ./XyGrib.app
|
||||
rm -f src/Makefile
|
||||
cd src/g2clib; make -f makefile.osx
|
||||
- cd $(QWTDIR)/src; $(MACQTBIN)/qmake; make -j6
|
||||
cd src; $(MACQTBIN)/qmake; make -j6
|
||||
|
||||
macclean:
|
||||
@@ -22,8 +19,6 @@ macclean:
|
||||
rm -fr XyGrib.app
|
||||
rm -f src/XyGrib
|
||||
rm -f src/release/XyGrib.exe
|
||||
- rm -f $(QWTDIR)/lib/*
|
||||
- cd $(QWTDIR)/src; $(MACQTBIN)/qmake; make clean
|
||||
cd src; $(MACQTBIN)/qmake; make clean
|
||||
|
||||
clean:
|
||||
@@ -34,15 +29,12 @@ clean:
|
||||
cd src; $(QMAKE); make clean
|
||||
|
||||
veryclean: clean
|
||||
- rm -f $(QWTDIR)/lib/*
|
||||
- cd $(QWTDIR)/src; $(QMAKE); make clean
|
||||
rm -f src/g2clib/libg2c.a
|
||||
rm -f src/g2clib/*.o
|
||||
|
||||
XyGrib: $(SRC)
|
||||
@ echo
|
||||
rm -f ./XyGrib
|
||||
- cd $(QWTDIR)/src; $(QMAKE); make -j6
|
||||
cd src/g2clib; make
|
||||
cd src; $(QMAKE); make -j6
|
||||
@ echo "-----------------------------------"
|
||||
@@ -64,5 +56,3 @@ install: XyGrib
|
||||
echo 'bin/XyGrib $$*' >> ./XyGrib
|
||||
chmod 755 ./XyGrib
|
||||
cp -af XyGrib $(INSTALLDIR)
|
||||
-
|
||||
-
|
||||
diff --git a/src/xyGrib.pro b/src/xyGrib.pro
|
||||
index 2523af8..30879ed 100644
|
||||
--- a/src/xyGrib.pro
|
||||
+++ b/src/xyGrib.pro
|
||||
@@ -8,7 +8,7 @@ TEMPLATE = app
|
||||
TARGET = XyGrib
|
||||
|
||||
DEPENDPATH += . util map GUI
|
||||
-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
|
||||
+INCLUDEPATH += . util map GUI g2clib
|
||||
|
||||
# ----------------------------------------------------
|
||||
# platform specific
|
||||
@@ -36,7 +36,7 @@ else {
|
||||
}
|
||||
}
|
||||
|
||||
-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
|
||||
+LIBS += -lbz2 -lz -lproj -lnova
|
||||
LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order!
|
||||
|
||||
# ----------------------------------------------------
|
||||
|
|
@ -1,27 +1,22 @@
|
|||
# Template file for 'XyGrib'
|
||||
pkgname=XyGrib
|
||||
version=1.0.1
|
||||
revision=2
|
||||
wrksrc="${pkgname}-${version}-src"
|
||||
version=1.1.2
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
build_style=gnu-makefile
|
||||
hostmakedepends="qt5-devel"
|
||||
makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel qwt-devel"
|
||||
build_style=cmake
|
||||
hostmakedepends="qt5-devel pkg-config"
|
||||
makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel qwt-devel libopenjpeg2-devel"
|
||||
short_desc="Weather data visulization"
|
||||
maintainer="Andrew Benson <abenson+void@gmail.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://opengribs.org/"
|
||||
distfiles="https://github.com/opengribs/XyGrib/releases/download/v${version}/XyGrib-${version}-src.tgz"
|
||||
checksum=2309505161577a6bf4787b8b9e7ead4ca9dfdb05b3e655b4583d69bdb9f2be9e
|
||||
distfiles="https://github.com/opengribs/XyGrib/archive/v${version}.tar.gz"
|
||||
checksum=e6f4248cc78eccf4622715d713eb989b371faa03750c652fca1080661723b45b
|
||||
|
||||
if [ -n "$CROSS_BUILD" ]; then
|
||||
make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
sed -i "s|\$(HOME)|$DESTDIR/usr/libexec|" Makefile
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vbin ${FILESDIR}/XyGrib
|
||||
|
||||
|
|
@ -30,4 +25,6 @@ post_install() {
|
|||
|
||||
vmkdir usr/share/icons
|
||||
vinstall ${FILESDIR}/XyGrib.png 0644 usr/share/icons
|
||||
|
||||
mv ${DESTDIR}/usr/XyGrib ${DESTDIR}/usr/share/
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue