* [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/
@ 2017-01-16 23:48 Marc Schiffbauer
0 siblings, 0 replies; 4+ messages in thread
From: Marc Schiffbauer @ 2017-01-16 23:48 UTC (permalink / raw
To: gentoo-commits
commit: 60a4e4fed9d7555953a3a5bbde337350658008eb
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 23:42:58 2017 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 23:48:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a4e4fe
app-misc/zygrib: add new version
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-misc/zygrib/Manifest | 1 +
app-misc/zygrib/files/zygrib-8.0.1-libs.patch | 20 ++++++++
app-misc/zygrib/zygrib-8.0.1.ebuild | 67 +++++++++++++++++++++++++++
3 files changed, 88 insertions(+)
diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
index ffa43cb..4579a5b 100644
--- a/app-misc/zygrib/Manifest
+++ b/app-misc/zygrib/Manifest
@@ -1,5 +1,6 @@
DIST zygrib-6.2.3.tgz 15256377 SHA256 f4086211e13d1e285a8228c98f568c8472031361b72c6d4e5327e67a57693cee SHA512 f838611aa2dd4544c353bd25c7450a1cb805ea5ec8fb6bc3ebd1b7d3a46c87034fef4151fd0c39f9587fb433fdc2ccab3f1b321724e398135f5e71cdccf65bef WHIRLPOOL b0a3c9521f4eb62511e464e87de2dd293e92e03d884e7c47a79f1151d2ca79f922b0098882b34c62ba6c67ce4cb1107dea4fb44b0b557a796d76259edc22dd40
DIST zygrib-7.0.0.tgz 15287496 SHA256 b60c1a318ba6afb4aec3ad1c241cfd6282e4fb5a34962c43fa2fb99aae1b9f53 SHA512 ae6e279b874aca510ccf91fecab06ce155427edd6a45844ef1053617512fd81e110f2338c22b10879c8e93dab226cfcdf58bf0270e4ed83931369c51b8869399 WHIRLPOOL ba9a0aac64b4a62e3d619e571f1dce404790dab4992d66ec77d3316ab34f5649b1228f5ed5b8078f6845dc5a0874be6b7959db1a1e374461dae5e07e63f46282
+DIST zygrib-8.0.1.tgz 19759812 SHA256 9c0490cbec74cea6d3c8f150bc745cb4c48f04969e10e91579fe01e56b9830f8 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d WHIRLPOOL a296954d30581e031fbbea31bc4ec72126dc3cfaae1750fe751d87e3aa677dcf9b360c9fe08f338493f29790e8e16681a977fc2c0158033ec6b3342abe38e9e4
DIST zygrib-cities_0-300.txt.gz 517620 SHA256 443015f38acbe3cc972b04b80b0011c53bae939dcf1c23a2f1e4eb344048444b SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80 WHIRLPOOL 41433660c8044f8f970acac4e4cc0754fc6ffa313bb1ca4ea06475760bf50423f8244d8efd56d31f796da2768fb0886f94afd07d1441f66e822717315c036da3
DIST zygrib-cities_1k-3k.txt.gz 495119 SHA256 08a4071b0044d20410c894bab11fcaf05533d3d8299233b91430b8f8eafe1ce1 SHA512 010d6688b9c381f0ace549c53a45f8bd43f1d6846dc01241ab7bfdf30b0629f39ef2a9a715c55a534634ad8480bc2edc2796a09f0c369406027f35f6b4ba8c08 WHIRLPOOL 05a03c46932ab2911a33644050d16837879765db362ecad63ae6dbc5674e9c0974a66d0f58133c05294f8b46f46fa1e5b2af326161f7cfe2e7aa08b2e314e7c0
DIST zygrib-cities_300-1k.txt.gz 512733 SHA256 6fb04f9c27420ec6f4793be4842a6e6831ee1219d1834a8c1c7d67c3c19cafd0 SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112 WHIRLPOOL 2642614d918ac091aca958143aee686dc077ca020962db224713507a6453ebf48fdc16b92b58560746b10edc5041814628f238fc42105e0bf473d871c474258b
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
new file mode 100644
index 00000000..3aa7446
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -0,0 +1,20 @@
+--- src/zyGrib.pro.orig 2017-01-16 21:55:32.459388028 +0100
++++ src/zyGrib.pro 2017-01-16 22:17:18.509256966 +0100
+@@ -8,7 +8,7 @@
+ TARGET = zyGrib
+
+ DEPENDPATH += . util map GUI
+-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
++INCLUDEPATH += . util map GUI curvedrawer /usr/include/qwt6 g2clib
+
+ # ----------------------------------------------------
+ # platform specific
+@@ -35,7 +35,7 @@
+ }
+ }
+
+-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
++LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
+ LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order!
+
+ # ----------------------------------------------------
diff --git a/app-misc/zygrib/zygrib-8.0.1.ebuild b/app-misc/zygrib/zygrib-8.0.1.ebuild
new file mode 100644
index 00000000..f8dd599
--- /dev/null
+++ b/app-misc/zygrib/zygrib-8.0.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+MY_PN="zyGrib"
+
+DESCRIPTION="GRIB File Viewer - Weather data visualization"
+HOMEPAGE="http://www.zygrib.org/"
+# zygrib.org has a DDoS protection and only allowd interactive downloads,
+# so we mirror the tarball...
+#SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz
+SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${MY_PN}-${PV}.tgz -> ${P}.tgz
+ https://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png
+ maps? (
+ http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz
+ http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz
+ http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz
+ http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz
+ )"
+
+LICENSE="GPL-3
+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+maps"
+
+DEPEND="app-arch/bzip2
+ dev-qt/qtsvg:5
+ media-libs/libpng:*
+ sci-libs/libnova
+ sci-libs/proj
+ sys-libs/zlib
+ x11-libs/qwt:6"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile
+ sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile
+ sed -i "/QWTDIR/d" Makefile
+ #use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
+ sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
+ epatch "${FILESDIR}/${P}-libs.patch"
+ default
+}
+
+src_install() {
+ default
+ rm zyGrib
+ doicon -s 32 "${DISTDIR}/zygrib-icon.png"
+ make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
+ domenu "${FILESDIR}/zygrib.desktop"
+
+ if use maps; then
+ insinto "/opt/${MY_PN}"
+ doins -r "${WORKDIR}/data"
+ insinto "/opt/${MY_PN}/data/gis"
+ gzip "${WORKDIR}"/*.txt
+ doins "${WORKDIR}"/*.txt.gz
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/
@ 2017-02-07 23:49 Marc Schiffbauer
0 siblings, 0 replies; 4+ messages in thread
From: Marc Schiffbauer @ 2017-02-07 23:49 UTC (permalink / raw
To: gentoo-commits
commit: d33f1acb7f5761c23a372094bffccc6633f97df0
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 23:48:30 2017 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 23:48:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33f1acb
app-misc/zygrib: fix #606510
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-misc/zygrib/files/zygrib-8.0.1-libs.patch | 2 +-
app-misc/zygrib/zygrib-8.0.1.ebuild | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
index 3aa7446..b1a8937 100644
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -15,6 +15,6 @@
-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
+LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
- LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order!
+ LIBS += -Lg2clib -lg2c -lpng # respect order!
# ----------------------------------------------------
diff --git a/app-misc/zygrib/zygrib-8.0.1.ebuild b/app-misc/zygrib/zygrib-8.0.1.ebuild
index c954f4c..42da5f9 100644
--- a/app-misc/zygrib/zygrib-8.0.1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1.ebuild
@@ -46,6 +46,7 @@ src_prepare() {
sed -i "/QWTDIR/d" Makefile
#use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
+ sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro
epatch "${FILESDIR}/${P}-libs.patch"
default
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/
@ 2020-07-15 12:28 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-07-15 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 4c2e2f64bd3905ce43a55f96a497e95e74f9ca2c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 12:23:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 12:28:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2e2f64
app-misc/zygrib: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/732732
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch | 38 ++++++++++++++++++++++++
app-misc/zygrib/zygrib-8.0.1-r1.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
new file mode 100644
index 00000000000..7f641bd0b9e
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
@@ -0,0 +1,38 @@
+From 73b1e8a9b622a27a03425db03bdbaee0eb88b8b7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 15 Jul 2020 14:21:13 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/IacPlot.h | 1 +
+ src/SkewT.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/IacPlot.h b/src/IacPlot.h
+index dab76b6..59f6deb 100644
+--- a/src/IacPlot.h
++++ b/src/IacPlot.h
+@@ -30,6 +30,7 @@ Lecture mise en mémoire d'un fichier IAC (fleetcodes)
+
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QString>
+
+ #include "DataMeteoAbstract.h"
+diff --git a/src/SkewT.h b/src/SkewT.h
+index eb70372..36d4df8 100644
+--- a/src/SkewT.h
++++ b/src/SkewT.h
+@@ -16,6 +16,7 @@
+ #include <QMainWindow>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLayout>
+ #include <QKeyEvent>
+ #include <QPrintDialog>
+--
+2.27.0
+
diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
index 94a696ec8e6..5742b5dc7ae 100644
--- a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
@@ -41,6 +41,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
PATCHES=(
"${FILESDIR}/${P}-libs.patch"
"${FILESDIR}/${P}-proj-6.patch" # bug 686078
+ "${FILESDIR}/${P}-qt-5.15.patch" # bug 732732
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/
@ 2020-07-15 12:28 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-07-15 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 27ae2afb66dadac740568bd610446231fd56756a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 12:16:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 12:27:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ae2afb
app-misc/zygrib: Fix build with >=sci-libs/proj-6
One interwebz search later...
This is just a life-support commit and will break again with PROJ-8.
Bug: https://bugs.gentoo.org/686078
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch | 20 ++++++++++++++++++++
app-misc/zygrib/zygrib-8.0.1-r1.ebuild | 5 ++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
new file mode 100644
index 00000000000..d76a89b5e51
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
@@ -0,0 +1,20 @@
+From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001
+From: KIVACHUK Valentin <valentin.kivachuk@irt-saintexupery.com>
+Date: Tue, 10 Sep 2019 11:29:37 +0200
+Subject: [PATCH] Fix proj build error
+
+---
+ proj_deprecated_api.patch | 2 ++
+ 1 files changed, 2 insertions(+)
+
+--- a/src/map/Projection.h 2016-11-09 17:27:38.000000000 +0100
++++ b/src/map/Projection.h 2019-09-10 10:20:27.440134499 +0200
+@@ -21,6 +21,8 @@
+ #include <QObject>
+ #include <cstdio>
+
++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
++
+ #include "proj_api.h"
+
+ class Projection : public QObject
diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
index 68598cab472..94a696ec8e6 100644
--- a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
@@ -38,7 +38,10 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${P}-libs.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-libs.patch"
+ "${FILESDIR}/${P}-proj-6.patch" # bug 686078
+)
src_prepare() {
sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-15 12:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-16 23:48 [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/ Marc Schiffbauer
-- strict thread matches above, loose matches on Subject: below --
2017-02-07 23:49 Marc Schiffbauer
2020-07-15 12:28 Andreas Sturmlechner
2020-07-15 12:28 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox