From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 902A71397EC for ; Tue, 18 Aug 2015 09:27:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78DE9141A1; Tue, 18 Aug 2015 09:27:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F347A141A1 for ; Tue, 18 Aug 2015 09:27:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C703A3408EE for ; Tue, 18 Aug 2015 09:27:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 178CC13F for ; Tue, 18 Aug 2015 09:27:50 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1439890067.530f6e7150e1294c662583316d56bc9ac435f4be.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/libgdiplus/files/, dev-dotnet/libgdiplus/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild X-VCS-Directories: dev-dotnet/libgdiplus/files/ dev-dotnet/libgdiplus/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 530f6e7150e1294c662583316d56bc9ac435f4be X-VCS-Branch: master Date: Tue, 18 Aug 2015 09:27:50 +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: 4716958b-bd3e-4c63-89e7-2f02efd9d2c7 X-Archives-Hash: f98a9651d7b3b74f828d0ca3e1ed79a6 commit: 530f6e7150e1294c662583316d56bc9ac435f4be Author: Justin Lecher gentoo org> AuthorDate: Tue Aug 18 09:27:20 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Aug 18 09:27:47 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530f6e71 dev-dotnet/libgdiplus: Fix for ld.gold; enhance various QA problems * underlinking fix: https://github.com/mono/libgdiplus/pull/33 * drop removed configure option --with-cairo * call default() functions as often as possible Gentoo-Bug: https://bugs.gentoo.org/367345 Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher gentoo.org> .../files/libgdiplus-3.12-underlinking.patch | 17 ++++++++++ dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild | 39 +++++++++++----------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch new file mode 100644 index 0000000..164f994 --- /dev/null +++ b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-underlinking.patch @@ -0,0 +1,17 @@ + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index fb7aa7e..4d752e1 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -13,7 +13,8 @@ DEPS = \ + + + LDADDS = \ +- $(top_builddir)/src/libgdiplus.la ++ $(top_builddir)/src/libgdiplus.la \ ++ -lm + + noinst_PROGRAMS = \ + testgdi testbits testclip testreversepath diff --git a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild index 5959db3..96eb910 100644 --- a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild +++ b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild @@ -3,7 +3,8 @@ # $Id$ EAPI=5 -inherit base eutils dotnet flag-o-matic + +inherit autotools eutils dotnet flag-o-matic DESCRIPTION="Library for using System.Drawing with mono" HOMEPAGE="http://www.mono-project.com" @@ -30,38 +31,36 @@ RDEPEND=">=dev-libs/glib-2.2.3:2 !cairo? ( >=x11-libs/pango-1.20 )" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${P}-giflib-quantizebuffer.patch" ) +PATCHES=( + "${FILESDIR}/${P}-giflib-quantizebuffer.patch" + "${FILESDIR}/${P}-underlinking.patch" + ) RESTRICT="test" src_prepare() { - base_src_prepare - sed -i -e 's:ungif:gif:g' configure || die -} - -src_configure() { + epatch "${PATCHES[@]}" + sed -i -e 's:ungif:gif:g' configure.ac || die append-flags -fno-strict-aliasing - econf --disable-dependency-tracking \ - --disable-static \ - --with-cairo=system \ - $(use !cairo && printf %s --with-pango) + eautoreconf } -src_compile() { - emake "$@" +src_configure() { + econf \ + --disable-dependency-tracking \ + --disable-static \ + $(usex cairo "" "--with-pango") } src_install () { - emake -j1 DESTDIR="${D}" "$@" install #nowarn + MAKEOPTS+=" -j1" + default + dotnet_multilib_comply local commondoc=( AUTHORS ChangeLog README TODO ) - for docfile in "${commondoc[@]}" - do + for docfile in "${commondoc[@]}"; do [[ -e "${docfile}" ]] && dodoc "${docfile}" done - if [[ "${DOCS[@]}" ]] - then - dodoc "${DOCS[@]}" - fi + [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}" prune_libtool_files }