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 C181B1388C0 for ; Mon, 22 Feb 2016 08:38:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DAEC21C017; Mon, 22 Feb 2016 08:38:16 +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 6C31021C015 for ; Mon, 22 Feb 2016 08:38:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADA27340821 for ; Mon, 22 Feb 2016 08:38:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81AEE208F for ; Mon, 22 Feb 2016 08:38:08 +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: <1456130191.77890639257266037035bd07c0edebd3a7e6b26d.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch sci-mathematics/netgen/netgen-5.3.1.ebuild X-VCS-Directories: sci-mathematics/netgen/ sci-mathematics/netgen/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 77890639257266037035bd07c0edebd3a7e6b26d X-VCS-Branch: master Date: Mon, 22 Feb 2016 08:38:08 +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: d3325b2b-8435-45f5-b4d9-9be66b5ebb8d X-Archives-Hash: fada591ed66e3ab62d1721753dfe2675 commit: 77890639257266037035bd07c0edebd3a7e6b26d Author: Grégory Salvan gmail com> AuthorDate: Sun Feb 21 20:38:46 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Feb 22 08:36:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=77890639 Added includes fixes patch .../netgen/files/netgen-5.x-includes-fixes.patch | 29 ++++++++++++++++++++++ sci-mathematics/netgen/netgen-5.3.1.ebuild | 1 + 2 files changed, 30 insertions(+) diff --git a/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch new file mode 100644 index 0000000..650b575 --- /dev/null +++ b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch @@ -0,0 +1,29 @@ +diff -uwrN -x.git netgen-5.3.1/libsrc/include/meshing.hpp netgen/libsrc/include/meshing.hpp +--- netgen-5.3.1/libsrc/include/meshing.hpp 2016-02-21 20:12:55.885186643 +0100 ++++ netgen/libsrc/include/meshing.hpp 2016-02-21 20:09:26.275180871 +0100 +@@ -1 +1 @@ +-#include <../meshing/meshing.hpp> ++#include "../meshing/meshing.hpp" +diff -uwrN -x.git netgen-5.3.1/libsrc/include/myadt.hpp netgen/libsrc/include/myadt.hpp +--- netgen-5.3.1/libsrc/include/myadt.hpp 2016-02-21 20:12:55.886186643 +0100 ++++ netgen/libsrc/include/myadt.hpp 2016-02-21 20:09:26.275180871 +0100 +@@ -1 +1 @@ +-#include <../general/myadt.hpp> ++#include "../general/myadt.hpp" +diff -uwrN -x.git netgen-5.3.1/libsrc/include/stlgeom.hpp netgen/libsrc/include/stlgeom.hpp +--- netgen-5.3.1/libsrc/include/stlgeom.hpp 2016-02-21 20:12:55.886186643 +0100 ++++ netgen/libsrc/include/stlgeom.hpp 2016-02-21 20:09:26.275180871 +0100 +@@ -1 +1 @@ +-#include <../stlgeom/stlgeom.hpp> ++#include "../stlgeom/stlgeom.hpp" +diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp netgen/libsrc/meshing/parallelmesh.cpp +--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:12:55.888186643 +0100 ++++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:09:26.276180871 +0100 +@@ -1,6 +1,6 @@ + #ifdef PARALLEL + +-#include ++#include "meshing.hpp" + #include "paralleltop.hpp" + + // #define METIS4 diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild index 4cc2cd9..d3cf9f9 100644 --- a/sci-mathematics/netgen/netgen-5.3.1.ebuild +++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild @@ -43,6 +43,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-5.3.1_build.patch" # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch" + epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch" if use mpi; then export CC=mpicc export CXX=mpic++