| 1 |
commit: 3230f4fae4d914eabb4683d57f27d0633d3adc6b |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 6 19:01:08 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 6 19:01:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3230f4fa |
| 7 |
|
| 8 |
sci-biology/consed: Fix building under GCC 7+ |
| 9 |
|
| 10 |
consed (and MOTIF programs in general) is very sensitive |
| 11 |
to link order: |
| 12 |
* http://users.polytech.unice.fr/~buffa/cours/X11_Motif/motif-faq/part9/faq-doc-10.html |
| 13 |
* https://bugzilla.redhat.com/show_bug.cgi?id=870712 |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/681920 |
| 16 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 18 |
|
| 19 |
.../consed/files/consed-29-fix-build-system.patch | 2 +- |
| 20 |
sci-biology/consed/files/consed-29-fix-qa.patch | 19 +++++++++++++++++++ |
| 21 |
2 files changed, 20 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/sci-biology/consed/files/consed-29-fix-build-system.patch b/sci-biology/consed/files/consed-29-fix-build-system.patch |
| 24 |
index 27c9c552fe3..30819f93ac8 100644 |
| 25 |
--- a/sci-biology/consed/files/consed-29-fix-build-system.patch |
| 26 |
+++ b/sci-biology/consed/files/consed-29-fix-build-system.patch |
| 27 |
@@ -45,7 +45,7 @@ Make build system semi-sane: |
| 28 |
-/usr/X11R6/lib/libICE.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libXmu.a \ |
| 29 |
-/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 |
| 30 |
+ |
| 31 |
-+MOTIF_LIBS ?= -lXt -lXm |
| 32 |
++MOTIF_LIBS ?= -lXm -lXt |
| 33 |
+ALL_LIBS = $(LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(SAMTOOLS_LIBS) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
diff --git a/sci-biology/consed/files/consed-29-fix-qa.patch b/sci-biology/consed/files/consed-29-fix-qa.patch |
| 38 |
index 5bdf0264d25..90e180da017 100644 |
| 39 |
--- a/sci-biology/consed/files/consed-29-fix-qa.patch |
| 40 |
+++ b/sci-biology/consed/files/consed-29-fix-qa.patch |
| 41 |
@@ -127,6 +127,25 @@ Fix various QA violations, due to |
| 42 |
printf( "x = %d\n", pEvent->x ); |
| 43 |
printf( "y = %d\n", pEvent->y ); |
| 44 |
printf( "x_root = %d\n", pEvent->x_root ); |
| 45 |
+--- a/parseAceFile.cpp |
| 46 |
++++ b/parseAceFile.cpp |
| 47 |
+@@ -45,6 +45,7 @@ |
| 48 |
+ using namespace std; |
| 49 |
+ #include "basesegment.h" |
| 50 |
+ #include <stdio.h> |
| 51 |
++#include <stddef.h> |
| 52 |
+ #include <string.h> |
| 53 |
+ #include <sstream> |
| 54 |
+ #include "mbt_errors.h" |
| 55 |
+@@ -292,7 +293,7 @@ |
| 56 |
+ char* szPossibleComp = szReadName + nLength - nCOMP; |
| 57 |
+ |
| 58 |
+ if (memcmp( szPossibleComp, szCOMP, nCOMP ) == 0 ) { |
| 59 |
+- szPossibleComp = '\0'; |
| 60 |
++ szPossibleComp = NULL; |
| 61 |
+ return( true ); |
| 62 |
+ } |
| 63 |
+ else |
| 64 |
--- a/phaster2PhdBall.cpp |
| 65 |
+++ b/phaster2PhdBall.cpp |
| 66 |
@@ -547,7 +547,7 @@ |
Archives