From b5bb78f7ccb0f52d89ada0058b17ca6f91895ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2016 19:41:12 +0200 Subject: Refresh patches --- debian/changelog | 7 +++ debian/patches/0100_spelling.patch | 76 +++++++++++++++--------------- debian/patches/0105_dispwin_segfault.patch | 2 +- debian/patches/0125_gcc5.patch | 12 +++-- 4 files changed, 53 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 072c70f..f192bb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +argyll (1.9.1+repack-1) UNRELEASED; urgency=medium + + * New upstream release. + - Refresh patches. + + -- Jörg Frings-Fürst Sun, 02 Oct 2016 19:26:51 +0200 + argyll (1.8.3+repack-2) unstable; urgency=medium * debian/copyright: Add 2016. diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch index 5b57b5c..3dc0de8 100644 --- a/debian/patches/0100_spelling.patch +++ b/debian/patches/0100_spelling.patch @@ -7,16 +7,16 @@ Index: trunk/spectro/dispcal.c =================================================================== --- trunk.orig/spectro/dispcal.c +++ trunk/spectro/dispcal.c -@@ -1937,7 +1937,7 @@ int main(int argc, char *argv[]) { +@@ -1942,7 +1942,7 @@ int main(int argc, char *argv[]) { /* Serial port flow control */ } else if (argv[fa][1] == 'W') { fa = nfa; - if (na == NULL) usage(0,"Paramater expected following -W"); + if (na == NULL) usage(0,"Parameter expected following -W"); if (na[0] == 'n' || na[0] == 'N') - fc = fc_none; + fc = fc_None; else if (na[0] == 'h' || na[0] == 'H') -@@ -1960,13 +1960,13 @@ int main(int argc, char *argv[]) { +@@ -1965,13 +1965,13 @@ int main(int argc, char *argv[]) { /* Black point correction amount */ } else if (argv[fa][1] == 'k') { fa = nfa; @@ -32,7 +32,7 @@ Index: trunk/spectro/dispcal.c x.nbrate = atof(na); if (x.nbrate < 0.05 || x.nbrate > 20.0) usage(0,"-A parameter must be between 0.05 and 20.0"); /* Black brightness */ -@@ -1999,7 +1999,7 @@ int main(int argc, char *argv[]) { +@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[]) { /* COM port */ } else if (argv[fa][1] == 'c') { fa = nfa; @@ -41,7 +41,7 @@ Index: trunk/spectro/dispcal.c comport = atoi(na); if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport); -@@ -3063,7 +3063,7 @@ int main(int argc, char *argv[]) { +@@ -3068,7 +3068,7 @@ int main(int argc, char *argv[]) { /* Black level adjustment */ /* Due to the possibility of the channel offsets not being even, */ /* we use the largest of the XYZ values after they have been */ @@ -54,7 +54,7 @@ Index: trunk/spectro/spotread.c =================================================================== --- trunk.orig/spectro/spotread.c +++ trunk/spectro/spotread.c -@@ -483,7 +483,7 @@ int main(int argc, char *argv[]) { +@@ -497,7 +497,7 @@ int main(int argc, char *argv[]) { /* COM port */ } else if (argv[fa][1] == 'c') { fa = nfa; @@ -63,7 +63,7 @@ Index: trunk/spectro/spotread.c { comport = atoi(na); if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport); -@@ -492,7 +492,7 @@ int main(int argc, char *argv[]) { +@@ -506,7 +506,7 @@ int main(int argc, char *argv[]) { /* Display type */ } else if (argv[fa][1] == 'y') { fa = nfa; @@ -72,7 +72,7 @@ Index: trunk/spectro/spotread.c dtype = na[0]; #ifndef SALONEINSTLIB -@@ -500,7 +500,7 @@ int main(int argc, char *argv[]) { +@@ -514,7 +514,7 @@ int main(int argc, char *argv[]) { } else if (argv[fa][1] == 'I') { fa = nfa; @@ -81,7 +81,7 @@ Index: trunk/spectro/spotread.c if (strcmp(na, "A") == 0 || strcmp(na, "M0") == 0) { tillum_set = spec = 1; -@@ -539,7 +539,7 @@ int main(int argc, char *argv[]) { +@@ -562,7 +562,7 @@ int main(int argc, char *argv[]) { /* Spectral Illuminant type for XYZ computation */ } else if (argv[fa][1] == 'i') { fa = nfa; @@ -90,7 +90,7 @@ Index: trunk/spectro/spotread.c if (strcmp(na, "A") == 0) { illum_set = spec = 1; illum = icxIT_A; -@@ -579,7 +579,7 @@ int main(int argc, char *argv[]) { +@@ -611,7 +611,7 @@ int main(int argc, char *argv[]) { /* Spectral Observer type */ } else if (argv[fa][1] == 'Q') { fa = nfa; @@ -99,7 +99,7 @@ Index: trunk/spectro/spotread.c if (strcmp(na, "1931_2") == 0) { /* Classic 2 degree */ obType = icxOT_CIE_1931_2; } else if (strcmp(na, "1964_10") == 0) { /* Classic 10 degree */ -@@ -657,7 +657,7 @@ int main(int argc, char *argv[]) { +@@ -693,7 +693,7 @@ int main(int argc, char *argv[]) { /* Filter configuration */ } else if (argv[fa][1] == 'F') { fa = nfa; @@ -108,7 +108,7 @@ Index: trunk/spectro/spotread.c if (na[0] == 'n' || na[0] == 'N') fe = inst_opt_filter_none; else if (na[0] == 'p' || na[0] == 'P') -@@ -672,7 +672,7 @@ int main(int argc, char *argv[]) { +@@ -708,7 +708,7 @@ int main(int argc, char *argv[]) { /* Extra filter compensation file */ } else if (argv[fa][1] == 'E') { fa = nfa; @@ -116,7 +116,7 @@ Index: trunk/spectro/spotread.c + if (na == NULL) usage("Parameter expected following -E"); strncpy(filtername,na,MAXNAMEL-1); filtername[MAXNAMEL-1] = '\000'; - /* Show Yxy */ + /* XRGA conversion */ Index: trunk/spectro/colorhug.c =================================================================== --- trunk.orig/spectro/colorhug.c @@ -134,7 +134,7 @@ Index: trunk/spectro/dispwin.c =================================================================== --- trunk.orig/spectro/dispwin.c +++ trunk/spectro/dispwin.c -@@ -2734,7 +2734,7 @@ int dispwin_install_profile(dispwin *p, +@@ -2766,7 +2766,7 @@ int dispwin_install_profile(dispwin *p, /* Un-Install a display profile */ /* Return nz if failed, */ @@ -143,7 +143,7 @@ Index: trunk/spectro/dispwin.c /* 2 if profile not found */ int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) { debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname)); -@@ -5131,7 +5131,7 @@ int ddebug /* >0 to print debug sta +@@ -5630,7 +5630,7 @@ int ddebug /* >0 to print debug sta p->native = native &= ~2; } @@ -156,7 +156,7 @@ Index: trunk/spectro/dtp51.c =================================================================== --- trunk.orig/spectro/dtp51.c +++ trunk/spectro/dtp51.c -@@ -679,7 +679,7 @@ dtp51_interp_error(inst *pp, int ec) { +@@ -680,7 +680,7 @@ dtp51_interp_error(inst *pp, int ec) { case DTP51_INVALID_STEP: return "Invalid step"; case DTP51_NO_DATA_AVAILABLE: @@ -169,7 +169,7 @@ Index: trunk/spectro/dtp92.c =================================================================== --- trunk.orig/spectro/dtp92.c +++ trunk/spectro/dtp92.c -@@ -928,7 +928,7 @@ dtp92_interp_error(inst *pp, int ec) { +@@ -941,7 +941,7 @@ dtp92_interp_error(inst *pp, int ec) { case DTP92_NO_DATA_AVAILABLE: return "No data available"; case DTP92_MISSING_PARAMETER: @@ -208,7 +208,7 @@ Index: trunk/spectro/i1pro_imp.c =================================================================== --- trunk.orig/spectro/i1pro_imp.c +++ trunk/spectro/i1pro_imp.c -@@ -3813,7 +3813,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p +@@ -3910,7 +3910,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p return I1PRO_OK; } @@ -217,7 +217,7 @@ Index: trunk/spectro/i1pro_imp.c s->dark_valid = 1; s->ddate = m->caldate; -@@ -3858,7 +3858,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p +@@ -3955,7 +3955,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p return I1PRO_OK; } @@ -230,7 +230,7 @@ Index: trunk/spectro/madvrwin.c =================================================================== --- trunk.orig/spectro/madvrwin.c +++ trunk/spectro/madvrwin.c -@@ -593,7 +593,7 @@ int ii = 0; +@@ -603,7 +603,7 @@ int ii = 0; } #endif @@ -243,7 +243,7 @@ Index: trunk/spectro/ss.c =================================================================== --- trunk.orig/spectro/ss.c +++ trunk/spectro/ss.c -@@ -1787,7 +1787,7 @@ ss_interp_error(inst *pp, int ec) { +@@ -1863,7 +1863,7 @@ ss_interp_error(inst *pp, int ec) { case ss_et_BadHexEncoding: return "Message received from instrument has bad Hex encoding"; case ss_et_RecBufferOverun: @@ -269,7 +269,7 @@ Index: trunk/spectro/webwin.c =================================================================== --- trunk.orig/spectro/webwin.c +++ trunk/spectro/webwin.c -@@ -396,7 +396,7 @@ int ddebug /* >0 to print debug sta +@@ -411,7 +411,7 @@ int ddebug /* >0 to print debug sta msec_sleep(50); } @@ -295,7 +295,7 @@ Index: trunk/spectro/ss_imp.h =================================================================== --- trunk.orig/spectro/ss_imp.h +++ trunk/spectro/ss_imp.h -@@ -720,7 +720,7 @@ void ss_add_string(struct _ss *p, char * +@@ -723,7 +723,7 @@ void ss_add_string(struct _ss *p, char * /* - - - - - - - - - - - - - - - - - - - - - */ /* ANSWER: */ @@ -317,7 +317,7 @@ Index: trunk/imdi/cctiff.c planes from input to output, rather than simply ignoring them. -@@ -1953,11 +1953,11 @@ main(int argc, char *argv[]) { +@@ -1952,11 +1952,11 @@ main(int argc, char *argv[]) { if (wh != NULL) { printf("Output TIFF file '%s'\n",out_name); @@ -348,7 +348,7 @@ Index: trunk/spectro/munki_imp.c =================================================================== --- trunk.orig/spectro/munki_imp.c +++ trunk/spectro/munki_imp.c -@@ -6393,7 +6393,7 @@ munki_code munki_create_hr(munki *p, int +@@ -6425,7 +6425,7 @@ munki_code munki_create_hr(munki *p, int int i, j, jj, k, cx, sx; munki_fc coeff[40][16]; /* Existing filter cooefficients */ int nwav1; /* Number of filters */ @@ -431,7 +431,7 @@ Index: trunk/imdi/greytiff.c =================================================================== --- trunk.orig/imdi/greytiff.c +++ trunk/imdi/greytiff.c -@@ -132,7 +132,7 @@ int pmtc +@@ -131,7 +131,7 @@ int pmtc case PHOTOMETRIC_LOGLUV: return "CIELog2Luv"; } @@ -444,7 +444,7 @@ Index: trunk/link/collink.c =================================================================== --- trunk.orig/link/collink.c +++ trunk/link/collink.c -@@ -1111,7 +1111,7 @@ void devip_devop(void *cntx, double *out +@@ -1110,7 +1110,7 @@ void devip_devop(void *cntx, double *out } /* We've got the input profile PCS' at this point. */ @@ -453,7 +453,7 @@ Index: trunk/link/collink.c /* output, copy it into locus[], which will be given to the inverse */ /* lookup function, else the inverse lookup will generate a K using */ /* the curve parameters. */ -@@ -1243,7 +1243,7 @@ void devip_devop(void *cntx, double *out +@@ -1242,7 +1242,7 @@ void devip_devop(void *cntx, double *out if (p->nhack == 2) { /* Ideally we would create a 4D PCSK -> PCSK gamut mapping */ /* to smoothly and accurately cope with the changing source */ @@ -479,7 +479,7 @@ Index: trunk/spectro/dispsup.c =================================================================== --- trunk.orig/spectro/dispsup.c +++ trunk/spectro/dispsup.c -@@ -707,7 +707,7 @@ static int disprd_read_imp( +@@ -719,7 +719,7 @@ static int disprd_read_imp( scb->serno = p->serno++; scb->msec = msec_time(); @@ -492,7 +492,7 @@ Index: trunk/gamut/gammap.c =================================================================== --- trunk.orig/gamut/gammap.c +++ trunk/gamut/gammap.c -@@ -853,7 +853,7 @@ gammap *new_gammap( +@@ -859,7 +859,7 @@ gammap *new_gammap( #endif if (gmi->bph == gmm_clipBP) { @@ -505,7 +505,7 @@ Index: trunk/profile/profout.c =================================================================== --- trunk.orig/profile/profout.c +++ trunk/profile/profout.c -@@ -1048,7 +1048,7 @@ make_output_icc( +@@ -1103,7 +1103,7 @@ make_output_icc( if (iccver < icmVersion2_4) { iccver = icmVersion2_4; /* Need 2.4.0 for Display intents */ if (verb) @@ -531,7 +531,7 @@ Index: trunk/xicc/xspect.c =================================================================== --- trunk.orig/xicc/xspect.c +++ trunk/xicc/xspect.c -@@ -4440,7 +4440,7 @@ void xspect_plot10(xspect *sp, int n) { +@@ -4530,7 +4530,7 @@ void xspect_plot10(xspect *sp, int n) { /* Given an emission spectrum, set the UV output to the given level. */ /* The shape of the UV is taken from FWA1_stim, and the level is */ /* with respect to the Y of the input spectrum. */ @@ -560,7 +560,7 @@ Index: trunk/spectro/ccxxmake.c - if (na == NULL) usage(0,"Paramater expected following -W"); + if (na == NULL) usage(0,"Parameter expected following -W"); if (na[0] == 'n' || na[0] == 'N') - fc = fc_none; + fc = fc_None; else if (na[0] == 'h' || na[0] == 'H') @@ -587,7 +587,7 @@ int main(int argc, char *argv[]) { strcat(outname, doccss ? ".ccss" : ".ccmx"); @@ -610,7 +610,7 @@ Index: trunk/profile/invprofcheck.c =================================================================== --- trunk.orig/profile/invprofcheck.c +++ trunk/profile/invprofcheck.c -@@ -99,7 +99,7 @@ void usage(void) { +@@ -98,7 +98,7 @@ void usage(void) { fprintf(stderr," -k Show CIEDE2000 delta E values\n"); fprintf(stderr," -w create %s visualisation (profile%s)\n",vrml_format(),vrml_ext()); fprintf(stderr," -x Use %s axes\n",vrml_format()); @@ -636,7 +636,7 @@ Index: trunk/spectro/ccwin.c =================================================================== --- trunk.orig/spectro/ccwin.c +++ trunk/spectro/ccwin.c -@@ -827,7 +827,7 @@ int ddebug /* >0 to print debug sta +@@ -830,7 +830,7 @@ int ddebug /* >0 to print debug sta return NULL; } @@ -649,7 +649,7 @@ Index: trunk/profile/colverify.c =================================================================== --- trunk.orig/profile/colverify.c +++ trunk/profile/colverify.c -@@ -68,7 +68,7 @@ usage(void) { +@@ -69,7 +69,7 @@ usage(void) { fprintf(stderr," -D Use D50 100.0 as L*a*b* white reference\n"); fprintf(stderr," -c Show CIE94 delta E values\n"); fprintf(stderr," -k Show CIEDE2000 delta E values\n"); @@ -662,7 +662,7 @@ Index: trunk/spectro/ex1.c =================================================================== --- trunk.orig/spectro/ex1.c +++ trunk/spectro/ex1.c -@@ -1454,7 +1454,7 @@ static void dump_command(ex1 *p, ORD8 *b +@@ -1466,7 +1466,7 @@ static void dump_command(ex1 *p, ORD8 *b if (flags & EX1_FLAG_NACK) a1logd(p->log, 0, " Negative acknowldgement response\n"); if (flags & EX1_FLAG_EXPTN) @@ -701,7 +701,7 @@ Index: trunk/spectro/xdg_bds.c =================================================================== --- trunk.orig/spectro/xdg_bds.c +++ trunk/spectro/xdg_bds.c -@@ -863,7 +863,7 @@ char *xdg_errstr(xdg_error er) { +@@ -867,7 +867,7 @@ char *xdg_errstr(xdg_error er) { case xdg_nohome: return "There is no $HOME"; case xdg_noalluserprofile: diff --git a/debian/patches/0105_dispwin_segfault.patch b/debian/patches/0105_dispwin_segfault.patch index cfd6eba..8134301 100644 --- a/debian/patches/0105_dispwin_segfault.patch +++ b/debian/patches/0105_dispwin_segfault.patch @@ -10,7 +10,7 @@ Index: trunk/spectro/dispwin.c =================================================================== --- trunk.orig/spectro/dispwin.c +++ trunk/spectro/dispwin.c -@@ -5556,6 +5556,7 @@ main(int argc, char *argv[]) { +@@ -6055,6 +6055,7 @@ main(int argc, char *argv[]) { /* Display number */ else if (argv[fa][1] == 'd') { diff --git a/debian/patches/0125_gcc5.patch b/debian/patches/0125_gcc5.patch index 2806745..677fb44 100644 --- a/debian/patches/0125_gcc5.patch +++ b/debian/patches/0125_gcc5.patch @@ -4,10 +4,12 @@ Bug-Debian: https://bugs.debian.org/777779 Forwarded: no --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/icc/icc.h -+++ b/icc/icc.h -@@ -100,7 +100,11 @@ - #define CF64PREC "LL" /* Constant precision specifier */ +Index: trunk/icc/icc.h +=================================================================== +--- trunk.orig/icc/icc.h ++++ trunk/icc/icc.h +@@ -131,7 +131,11 @@ + #define CF64PREC "LL" /* Constant precision specifier */ #ifndef ATTRIBUTE_NORETURN +#ifdef _MSC_VER @@ -17,4 +19,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +#endif #endif - #else /* !__STDC_VERSION__ */ + #else /* !_MSC_VER */ -- cgit v1.2.3