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 40A98138334 for ; Sat, 6 Apr 2019 19:01:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24D65E084E; Sat, 6 Apr 2019 19:01:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1B5CE084E for ; Sat, 6 Apr 2019 19:01:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE778335CC0 for ; Sat, 6 Apr 2019 19:01:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 695D644B for ; Sat, 6 Apr 2019 19:01:50 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1554577268.3230f4fae4d914eabb4683d57f27d0633d3adc6b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/consed/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/consed/files/consed-29-fix-build-system.patch sci-biology/consed/files/consed-29-fix-qa.patch X-VCS-Directories: sci-biology/consed/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3230f4fae4d914eabb4683d57f27d0633d3adc6b X-VCS-Branch: master Date: Sat, 6 Apr 2019 19:01: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9be3c9cc-f2a7-4b00-95b6-12908dd501c3 X-Archives-Hash: b28f656c1de2cdd328235c95ff770363 commit: 3230f4fae4d914eabb4683d57f27d0633d3adc6b Author: David Seifert gentoo org> AuthorDate: Sat Apr 6 19:01:08 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Apr 6 19:01:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3230f4fa sci-biology/consed: Fix building under GCC 7+ consed (and MOTIF programs in general) is very sensitive to link order: * http://users.polytech.unice.fr/~buffa/cours/X11_Motif/motif-faq/part9/faq-doc-10.html * https://bugzilla.redhat.com/show_bug.cgi?id=870712 Closes: https://bugs.gentoo.org/681920 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: David Seifert gentoo.org> .../consed/files/consed-29-fix-build-system.patch | 2 +- sci-biology/consed/files/consed-29-fix-qa.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sci-biology/consed/files/consed-29-fix-build-system.patch b/sci-biology/consed/files/consed-29-fix-build-system.patch index 27c9c552fe3..30819f93ac8 100644 --- a/sci-biology/consed/files/consed-29-fix-build-system.patch +++ b/sci-biology/consed/files/consed-29-fix-build-system.patch @@ -45,7 +45,7 @@ Make build system semi-sane: -/usr/X11R6/lib/libICE.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libXmu.a \ -/usr/X11R6/lib/libXp.a /usr/lib/libm.a /me1/gordon/samtools/samtools-0.1.18/libbam.a /me1/gordon/samtools/samtools-0.1.18/bcftools/libbcf.a /me1/gordon/zlib/zlib-1.2.5/libz.a + -+MOTIF_LIBS ?= -lXt -lXm ++MOTIF_LIBS ?= -lXm -lXt +ALL_LIBS = $(LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(SAMTOOLS_LIBS) diff --git a/sci-biology/consed/files/consed-29-fix-qa.patch b/sci-biology/consed/files/consed-29-fix-qa.patch index 5bdf0264d25..90e180da017 100644 --- a/sci-biology/consed/files/consed-29-fix-qa.patch +++ b/sci-biology/consed/files/consed-29-fix-qa.patch @@ -127,6 +127,25 @@ Fix various QA violations, due to printf( "x = %d\n", pEvent->x ); printf( "y = %d\n", pEvent->y ); printf( "x_root = %d\n", pEvent->x_root ); +--- a/parseAceFile.cpp ++++ b/parseAceFile.cpp +@@ -45,6 +45,7 @@ + using namespace std; + #include "basesegment.h" + #include ++#include + #include + #include + #include "mbt_errors.h" +@@ -292,7 +293,7 @@ + char* szPossibleComp = szReadName + nLength - nCOMP; + + if (memcmp( szPossibleComp, szCOMP, nCOMP ) == 0 ) { +- szPossibleComp = '\0'; ++ szPossibleComp = NULL; + return( true ); + } + else --- a/phaster2PhdBall.cpp +++ b/phaster2PhdBall.cpp @@ -547,7 +547,7 @@