From d33f1acb7f5761c23a372094bffccc6633f97df0 Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Wed, 8 Feb 2017 00:48:30 +0100 Subject: 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(-) (limited to 'app-misc/zygrib') 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 3aa7446f209..b1a8937cc3c 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 c954f4cb57f..42da5f9662c 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 } -- cgit v1.2.1