diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2017-02-08 00:48:30 +0100 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2017-02-08 00:48:59 +0100 |
| commit | d33f1acb7f5761c23a372094bffccc6633f97df0 (patch) | |
| tree | 5f0952b74d9c477a00f5dac8909bd5d10c44e011 /app-misc | |
| parent | dev-libs/libwacom: Remove old (diff) | |
| download | gentoo-d33f1acb7f5761c23a372094bffccc6633f97df0.tar.gz gentoo-d33f1acb7f5761c23a372094bffccc6633f97df0.tar.bz2 gentoo-d33f1acb7f5761c23a372094bffccc6633f97df0.zip | |
app-misc/zygrib: fix #606510
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/zygrib/files/zygrib-8.0.1-libs.patch | 2 | ||||
| -rw-r--r-- | app-misc/zygrib/zygrib-8.0.1.ebuild | 1 |
2 files changed, 2 insertions, 1 deletions
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 3aa7446f209b..b1a8937cc3cf 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 c954f4cb57fd..42da5f9662c0 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 } |