| 1 |
commit: d33f1acb7f5761c23a372094bffccc6633f97df0 |
| 2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 23:48:30 2017 +0000 |
| 4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 23:48:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33f1acb |
| 7 |
|
| 8 |
app-misc/zygrib: fix #606510 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-misc/zygrib/files/zygrib-8.0.1-libs.patch | 2 +- |
| 13 |
app-misc/zygrib/zygrib-8.0.1.ebuild | 1 + |
| 14 |
2 files changed, 2 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch |
| 17 |
index 3aa7446..b1a8937 100644 |
| 18 |
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch |
| 19 |
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch |
| 20 |
@@ -15,6 +15,6 @@ |
| 21 |
|
| 22 |
-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt |
| 23 |
+LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5 |
| 24 |
- LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order! |
| 25 |
+ LIBS += -Lg2clib -lg2c -lpng # respect order! |
| 26 |
|
| 27 |
# ---------------------------------------------------- |
| 28 |
|
| 29 |
diff --git a/app-misc/zygrib/zygrib-8.0.1.ebuild b/app-misc/zygrib/zygrib-8.0.1.ebuild |
| 30 |
index c954f4c..42da5f9 100644 |
| 31 |
--- a/app-misc/zygrib/zygrib-8.0.1.ebuild |
| 32 |
+++ b/app-misc/zygrib/zygrib-8.0.1.ebuild |
| 33 |
@@ -46,6 +46,7 @@ src_prepare() { |
| 34 |
sed -i "/QWTDIR/d" Makefile |
| 35 |
#use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile |
| 36 |
sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile |
| 37 |
+ sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro |
| 38 |
epatch "${FILESDIR}/${P}-libs.patch" |
| 39 |
default |
| 40 |
} |
Archives