diff options
| author | Aaron M. Ucko <ucko@debian.org> | 2024-03-19 23:13:39 -0400 |
|---|---|---|
| committer | Aaron M. Ucko <ucko@debian.org> | 2024-03-19 23:24:38 -0400 |
| commit | c0e08c157324df28d66e5368a5cf34b5d81bcaf0 (patch) | |
| tree | 02dcaa28f279870c7e7c4d5dcf0b7c24b4d341ae /debian/patches | |
| parent | 9d56e4159db956121a3936f0014ccde2fe629524 (diff) | |
Don't rely on any implicit function declarations (#1066356)
- api/asn2gnb2.c: Correct the first(!) <asn2gnbi.h> to <ffprint.h>
for PrintDate.
- api/salutil.c: +<alignmgr2.h> for AlnMgr2IndexSingleChildSeqAlign.
- vibrant/shim3d.h: Add a prototype for Nlm_SetOGLContext and
supporting forward declarations. (Some name clashes preclude
reliably including X headers from here.)
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/debian-changes | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index e0368a1d..60b3528a 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -19,6 +19,27 @@ Combined patches from git. } #ifdef OS_MAC +--- ncbi-tools6-6.1.20170106+dfsg2.orig/api/asn2gnb2.c ++++ ncbi-tools6-6.1.20170106+dfsg2/api/asn2gnb2.c +@@ -58,7 +58,7 @@ + #include <validerr.h> + #include <objvalid.h> + #include <valapi.h> +-#include <asn2gnbi.h> ++#include <ffprint.h> + #include <asn2gnbi.h> + + #ifdef WIN_MAC +--- ncbi-tools6-6.1.20170106+dfsg2.orig/api/salutil.c ++++ ncbi-tools6-6.1.20170106+dfsg2/api/salutil.c +@@ -51,6 +51,7 @@ + #include <edutil.h> + #include <sequtil.h> + #include <sqnutils.h> ++#include <alignmgr2.h> + + #ifdef SALSA_DEBUG + #include <simutil.h> --- ncbi-tools6-6.1.20170106+dfsg2.orig/api/sqnutil3.c +++ ncbi-tools6-6.1.20170106+dfsg2/api/sqnutil3.c @@ -33198,7 +33198,7 @@ ClickableItemPtr LIBCALL ClickableGlobal @@ -918,6 +939,23 @@ Combined patches from git. MemFree(fblock); } - +--- ncbi-tools6-6.1.20170106+dfsg2.orig/vibrant/shim3d.h ++++ ncbi-tools6-6.1.20170106+dfsg2/vibrant/shim3d.h +@@ -402,6 +402,14 @@ NLM_EXTERN void SetOGLFont(TOGL_Data *OG + NLM_EXTERN void Nlm_FindAvailableFonts(Nlm_PopuP pupmenu); + + ++#ifdef WIN_MOTIF ++typedef struct _WidgetRec *Widget; ++typedef struct _XDisplay Display; ++ ++void Nlm_SetOGLContext(Widget /* Nlm_SlateTool */ a, Nlm_Boolean *im, ++ Display **d, struct XVisualInfo **v); ++#endif ++ + #ifdef _PNG + void Nlm_SaveImagePNG(Nlm_Char *defname); /* for PNG export */ + #endif /* _PNG */ --- ncbi-tools6-6.1.20170106+dfsg2.orig/vibrant/vibmain.c +++ ncbi-tools6-6.1.20170106+dfsg2/vibrant/vibmain.c @@ -44,6 +44,21 @@ |