From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 900B2139085 for ; Tue, 7 Feb 2017 23:49:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF7B3E0D76; Tue, 7 Feb 2017 23:49:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C00FDE0D76 for ; Tue, 7 Feb 2017 23:49:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB0E93413C3 for ; Tue, 7 Feb 2017 23:49:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3230E3B8E for ; Tue, 7 Feb 2017 23:49:12 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <1486511339.d33f1acb7f5761c23a372094bffccc6633f97df0.mschiff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/zygrib/files/zygrib-8.0.1-libs.patch app-misc/zygrib/zygrib-8.0.1.ebuild X-VCS-Directories: app-misc/zygrib/ app-misc/zygrib/files/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: d33f1acb7f5761c23a372094bffccc6633f97df0 X-VCS-Branch: master Date: Tue, 7 Feb 2017 23:49:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ea759be-9dee-4366-a10b-7c706d567fb6 X-Archives-Hash: ebe2e9125b0eca5123a2dbfd4dbcafd2 commit: d33f1acb7f5761c23a372094bffccc6633f97df0 Author: Marc Schiffbauer gentoo org> AuthorDate: Tue Feb 7 23:48:30 2017 +0000 Commit: Marc Schiffbauer gentoo 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 }