diff -Nru fontforge-20161005/debian/changelog fontforge-20161012/debian/changelog --- fontforge-20161005/debian/changelog 2016-10-04 13:01:43.000000000 +0000 +++ fontforge-20161012/debian/changelog 2016-10-12 23:06:58.000000000 +0000 @@ -1,5 +1,5 @@ -fontforge (20161005-0ubuntu1~yakkety) yakkety; urgency=low +fontforge (20161012-0ubuntu1~yakkety) yakkety; urgency=low * Release. - -- Package Maintainer Tue, 04 Oct 2016 08:01:43 -0500 + -- Package Maintainer Wed, 12 Oct 2016 18:06:58 -0500 diff -Nru fontforge-20161005/fontforge/python.c fontforge-20161012/fontforge/python.c --- fontforge-20161005/fontforge/python.c 2016-10-04 12:23:03.000000000 +0000 +++ fontforge-20161012/fontforge/python.c 2016-10-12 22:51:59.000000000 +0000 @@ -18893,11 +18893,18 @@ ** function. */ PyMODINIT_FUNC FFPY_PYTHON_ENTRY_FUNCTION(const char* modulename) { - doinitFontForgeMain(); - no_windowing_ui = running_script = true; + static int initted = false; - RegisterAllPyModules(); - CreateAllPyModules(); + if (!initted) { + doinitFontForgeMain(); + no_windowing_ui = running_script = true; + +#if PY_MAJOR_VERSION <= 2 + RegisterAllPyModules(); +#endif + CreateAllPyModules(); + initted = true; + } #if PY_MAJOR_VERSION >= 3 /* Python 3 expects the module object to be returned */ diff -Nru fontforge-20161005/fontforge/scripting.c fontforge-20161012/fontforge/scripting.c --- fontforge-20161005/fontforge/scripting.c 2016-10-04 12:23:03.000000000 +0000 +++ fontforge-20161012/fontforge/scripting.c 2016-10-12 22:51:59.000000000 +0000 @@ -2358,6 +2358,7 @@ #endif if (( format>=4 && c->a.argc!=3 ) || (format<4 && c->a.argc==3 )) { c->error = ce_wrongnumarg; + free(tmp); return; } bdf=NULL; @@ -2374,8 +2375,6 @@ if ( c->curfv->selected[i] && (gid=c->curfv->map->map[i])!=-1 && SCWorthOutputting(c->curfv->sf->glyphs[gid]) ) ScriptExport(c->curfv->sf,bdf,format,gid,format_spec,c->curfv->map); - if ( format_spec!=buffer ) - free(format_spec); free(tmp); } diff -Nru fontforge-20161005/fontforge/sfd.c fontforge-20161012/fontforge/sfd.c --- fontforge-20161005/fontforge/sfd.c 2016-10-04 12:23:03.000000000 +0000 +++ fontforge-20161012/fontforge/sfd.c 2016-10-12 22:51:59.000000000 +0000 @@ -8808,6 +8808,8 @@ SFD_AssignLookups((SplineFont1 *) sf); if ( !d.hadtimes ) SFTimesFromFile(sf,sfd); + // Make a blank encoding if there are no characters so as to avoid crashes later. + if (sf->map == NULL) sf->map = EncMapNew(sf->glyphcnt,sf->glyphcnt,&custom); SFDFixupUndoRefs(sf); return( sf ); diff -Nru fontforge-20161005/fontforgeexe/cvruler.c fontforge-20161012/fontforgeexe/cvruler.c --- fontforge-20161005/fontforgeexe/cvruler.c 2016-10-04 12:23:03.000000000 +0000 +++ fontforge-20161012/fontforgeexe/cvruler.c 2016-10-12 22:51:59.000000000 +0000 @@ -964,6 +964,7 @@ int len; int charwidth = 6; /* TBD */ Color textcolor = (cv->start_intersection_snapped && cv->end_intersection_snapped) ? measuretoolcanvasnumberssnappedcol : measuretoolcanvasnumberscol; + GRect prev_rect; if ( measuretoolshowhorizontolvertical ) { char buf[40]; @@ -990,7 +991,7 @@ GDrawSetFont(pixmap,cv->rfont); for ( i=0 ; inum_ruler_intersections; ++i ) { - GRect rect,prev_rect; + GRect rect; rect.x = cv->xoff + rint(cv->ruler_intersections[i].x*cv->scale) - 1; rect.y = -cv->yoff + cv->height - rint(cv->ruler_intersections[i].y*cv->scale) - 1; Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/.git/index and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/.git/index differ diff -Nru fontforge-20161005/.git/logs/HEAD fontforge-20161012/.git/logs/HEAD --- fontforge-20161005/.git/logs/HEAD 2016-10-04 12:23:02.000000000 +0000 +++ fontforge-20161012/.git/logs/HEAD 2016-10-12 22:51:59.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 072edb0235cd163d6c3391da9cc3754c3c66f47a Frank Trampe 1475583782 -0500 clone: from https://github.com/fontforge/fontforge +0000000000000000000000000000000000000000 fe1d84b7d05178885a36ba0adce0559a82a493d5 Frank Trampe 1476312719 -0500 clone: from https://github.com/fontforge/fontforge diff -Nru fontforge-20161005/.git/logs/refs/heads/master fontforge-20161012/.git/logs/refs/heads/master --- fontforge-20161005/.git/logs/refs/heads/master 2016-10-04 12:23:02.000000000 +0000 +++ fontforge-20161012/.git/logs/refs/heads/master 2016-10-12 22:51:59.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 072edb0235cd163d6c3391da9cc3754c3c66f47a Frank Trampe 1475583782 -0500 clone: from https://github.com/fontforge/fontforge +0000000000000000000000000000000000000000 fe1d84b7d05178885a36ba0adce0559a82a493d5 Frank Trampe 1476312719 -0500 clone: from https://github.com/fontforge/fontforge diff -Nru fontforge-20161005/.git/logs/refs/remotes/origin/HEAD fontforge-20161012/.git/logs/refs/remotes/origin/HEAD --- fontforge-20161005/.git/logs/refs/remotes/origin/HEAD 2016-10-04 12:23:02.000000000 +0000 +++ fontforge-20161012/.git/logs/refs/remotes/origin/HEAD 2016-10-12 22:51:59.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 072edb0235cd163d6c3391da9cc3754c3c66f47a Frank Trampe 1475583782 -0500 clone: from https://github.com/fontforge/fontforge +0000000000000000000000000000000000000000 fe1d84b7d05178885a36ba0adce0559a82a493d5 Frank Trampe 1476312719 -0500 clone: from https://github.com/fontforge/fontforge Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/.git/objects/pack/pack-4ac5c42275eb0e96c55e422ffd84814114960c89.idx and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/.git/objects/pack/pack-4ac5c42275eb0e96c55e422ffd84814114960c89.idx differ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/.git/objects/pack/pack-4ac5c42275eb0e96c55e422ffd84814114960c89.pack and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/.git/objects/pack/pack-4ac5c42275eb0e96c55e422ffd84814114960c89.pack differ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/.git/objects/pack/pack-bf87eeb174a4ef64d696cbc2e26dd0808fe6a0c0.idx and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/.git/objects/pack/pack-bf87eeb174a4ef64d696cbc2e26dd0808fe6a0c0.idx differ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/.git/objects/pack/pack-bf87eeb174a4ef64d696cbc2e26dd0808fe6a0c0.pack and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/.git/objects/pack/pack-bf87eeb174a4ef64d696cbc2e26dd0808fe6a0c0.pack differ diff -Nru fontforge-20161005/.git/ORIG_HEAD fontforge-20161012/.git/ORIG_HEAD --- fontforge-20161005/.git/ORIG_HEAD 2016-10-04 12:23:17.000000000 +0000 +++ fontforge-20161012/.git/ORIG_HEAD 2016-10-12 22:52:16.000000000 +0000 @@ -1 +1 @@ -072edb0235cd163d6c3391da9cc3754c3c66f47a +fe1d84b7d05178885a36ba0adce0559a82a493d5 diff -Nru fontforge-20161005/.git/packed-refs fontforge-20161012/.git/packed-refs --- fontforge-20161005/.git/packed-refs 2016-10-04 12:23:02.000000000 +0000 +++ fontforge-20161012/.git/packed-refs 2016-10-12 22:51:59.000000000 +0000 @@ -11,7 +11,7 @@ 0d4dd3d353356e533ea844feced2b3dfb94f4786 refs/remotes/origin/macstuff_20161001_1 4e5fd76fda6a928bbcfdecc95ac3ff61f142e0d8 refs/remotes/origin/macstuff_20161001_2 b94c3f32a5a8097f030baf4cba51751da413e582 refs/remotes/origin/macstuff_20161001_3 -072edb0235cd163d6c3391da9cc3754c3c66f47a refs/remotes/origin/master +fe1d84b7d05178885a36ba0adce0559a82a493d5 refs/remotes/origin/master 9e29a3028420403fbce911341b39638a5a0122ea refs/remotes/origin/menu-arrows-use-fg-color 43a9a00efd693840779698d1c24f2f3c608c728a refs/remotes/origin/menu_cleanup bc6a5120a87795173ad7daa6376247a4528e5dd6 refs/remotes/origin/new-menus @@ -22,6 +22,7 @@ 2e279a2fb6f83d571c67e1ca786288b09edac082 refs/remotes/origin/resupport_relief_2 2f30daec64980389625f74db0456edb595c0eb67 refs/remotes/origin/revert-2224-mathconstants e66ae7616e0ca0d7255eb0f82ac454a51d794870 refs/remotes/origin/scrollbars +7054e2d49bcb78944bc334317113f46f59269e8b refs/remotes/origin/sfd_nochar_enc_crash_fix_20161005 07ef4e1ee59db7613225d3def3135ffe0f9671a1 refs/remotes/origin/splinestroke_reversal_rules_20160926_1 69bfed658672a053bd2e4bd7fb1a068480460112 refs/remotes/origin/splinestroke_reversal_rules_20160926_2 eafdcca8ea768d1cfea62ec694a90f2c672ee971 refs/remotes/origin/subset_reference_crash_1_1 @@ -64,6 +65,8 @@ ^072edb0235cd163d6c3391da9cc3754c3c66f47a a6a0c3f284dd77110623d370bcb3010d7239ec3f refs/tags/20161005 ^072edb0235cd163d6c3391da9cc3754c3c66f47a +ae9422c656fdd1e8da9529c8001b848e2bb1768f refs/tags/20161012 +^fe1d84b7d05178885a36ba0adce0559a82a493d5 961b38d74e35422398eb04116e757cc668fd9c90 refs/tags/v2.1.0 ^6bfa9ed50dbea615f54c31cef7550906a47d15b1 a58a7e39e27424963ee0c69648cb05159ce9fb1c refs/tags/v20110222 diff -Nru fontforge-20161005/.git/refs/heads/master fontforge-20161012/.git/refs/heads/master --- fontforge-20161005/.git/refs/heads/master 2016-10-04 12:23:02.000000000 +0000 +++ fontforge-20161012/.git/refs/heads/master 2016-10-12 22:51:59.000000000 +0000 @@ -1 +1 @@ -072edb0235cd163d6c3391da9cc3754c3c66f47a +fe1d84b7d05178885a36ba0adce0559a82a493d5 diff -Nru fontforge-20161005/gnulib/ChangeLog fontforge-20161012/gnulib/ChangeLog --- fontforge-20161005/gnulib/ChangeLog 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/ChangeLog 2016-10-12 22:52:25.000000000 +0000 @@ -1,3 +1,79 @@ +2016-10-11 Jim Meyering + + maint: remove stray space after "." in AC_DEFINE comment. + * m4/st_dm_mode.m4 (AC_STRUCT_ST_DM_MODE): Remove space-after-".". + * m4/utimes.m4 (gl_FUNC_UTIMES): Likewise. + +2016-10-05 Jim Meyering + + long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough + * lib/long-options.c (parse_long_options): Add a break statement + to avoid this new warning/failure: + $ CFLAGS='-O -Werror=implicit-fallthrough' ./gnulib-tool \ + --create-testdir --dir=/t/x --with-tests --test long-options + ../../gllib/long-options.c: In function 'parse_long_options': + ../../gllib/long-options.c:66:12: error: this statement may \ + fall through [-Werror=implicit-fallthrough] + (*usage_func) (EXIT_SUCCESS); + ~^~~~~~~~~~~~~~~~~~~~~~~~~~~ + +2016-10-05 Jim Meyering + + utimecmp: avoid new GCC 7 warning from -Wbool-operation + Testing this module would fail when using GCC 7 like this: + $ CFLAGS='-O -Werror=bool-operation' ./gnulib-tool --create-testdir \ + --dir=/tmp/x --with-tests --test utimecmp + ../../gllib/utimecmp.c: In function ‘utimecmp’: + ../../gllib/utimecmp.c:291:36: error: ‘~’ on a boolean expression \ + [-Werror=bool-operation] + time_t s = src_s & ~ (res == 2 * BILLION); + ^ + ../../gllib/utimecmp.c:370:16: error: ‘~’ on a boolean expression \ + [-Werror=bool-operation] + src_s &= ~ (res == 2 * BILLION); + ^ + * lib/utimecmp.c (utimecmp): Do not apply "~" to a boolean. + Instead, make it explicit that we intend to apply it to 0 or 1. + +2016-10-10 Eli Zaretskii + + wchar, wctype-h: fix for MinGW 3.22.2 + * lib/wchar.in.h [__MINGW32__]: Add one more condition for + special invocation, to fix issues with MinGW 3.22.2 wchar.h + when included from . + * lib/wctype.in.h [__MINGW32__]: Add special invocation + convention for MinGW 3.22.2, to solve issues with their + wctype.h when included from . + +2016-10-05 Jim Meyering + + long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough + * lib/long-options.c (parse_long_options): Add a break statement + to avoid this new warning/failure: + $ CFLAGS='-O -Werror=implicit-fallthrough' ./gnulib-tool \ + --create-testdir --dir=/t/x --with-tests --test long-options + ../../gllib/long-options.c: In function ‘parse_long_options’: + ../../gllib/long-options.c:66:12: error: this statement may \ + fall through [-Werror=implicit-fallthrough] + (*usage_func) (EXIT_SUCCESS); + ~^~~~~~~~~~~~~~~~~~~~~~~~~~~ + + utimecmp: avoid new GCC 7 warning from -Wbool-operation + Testing this module would fail when using GCC 7 like this: + $ CFLAGS='-O -Werror=bool-operation' ./gnulib-tool --create-testdir \ + --dir=/tmp/x --with-tests --test utimecmp + ../../gllib/utimecmp.c: In function ‘utimecmp’: + ../../gllib/utimecmp.c:291:36: error: ‘~’ on a boolean expression \ + [-Werror=bool-operation] + time_t s = src_s & ~ (res == 2 * BILLION); + ^ + ../../gllib/utimecmp.c:370:16: error: ‘~’ on a boolean expression \ + [-Werror=bool-operation] + src_s &= ~ (res == 2 * BILLION); + ^ + * lib/utimecmp.c (utimecmp): Do not apply "~" to a boolean. + Instead, make it explicit that we intend to apply it to 0 or 1. + 2016-10-03 Pádraig Brady quotearg: minimize shell quoting using double quotes Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/gnulib/.git/index and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/gnulib/.git/index differ diff -Nru fontforge-20161005/gnulib/.git/logs/HEAD fontforge-20161012/gnulib/.git/logs/HEAD --- fontforge-20161005/gnulib/.git/logs/HEAD 2016-10-04 12:23:30.000000000 +0000 +++ fontforge-20161012/gnulib/.git/logs/HEAD 2016-10-12 22:52:24.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d0afb6a571e32baa432ad49c669ecd9f59434dec Frank Trampe 1475583810 -0500 clone: from https://github.com/coreutils/gnulib +0000000000000000000000000000000000000000 7838dc2442ef44aad25bdb2160df70ebc778c8dc Frank Trampe 1476312744 -0500 clone: from https://github.com/coreutils/gnulib diff -Nru fontforge-20161005/gnulib/.git/logs/refs/heads/master fontforge-20161012/gnulib/.git/logs/refs/heads/master --- fontforge-20161005/gnulib/.git/logs/refs/heads/master 2016-10-04 12:23:30.000000000 +0000 +++ fontforge-20161012/gnulib/.git/logs/refs/heads/master 2016-10-12 22:52:24.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d0afb6a571e32baa432ad49c669ecd9f59434dec Frank Trampe 1475583810 -0500 clone: from https://github.com/coreutils/gnulib +0000000000000000000000000000000000000000 7838dc2442ef44aad25bdb2160df70ebc778c8dc Frank Trampe 1476312744 -0500 clone: from https://github.com/coreutils/gnulib diff -Nru fontforge-20161005/gnulib/.git/logs/refs/remotes/origin/HEAD fontforge-20161012/gnulib/.git/logs/refs/remotes/origin/HEAD --- fontforge-20161005/gnulib/.git/logs/refs/remotes/origin/HEAD 2016-10-04 12:23:30.000000000 +0000 +++ fontforge-20161012/gnulib/.git/logs/refs/remotes/origin/HEAD 2016-10-12 22:52:24.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d0afb6a571e32baa432ad49c669ecd9f59434dec Frank Trampe 1475583810 -0500 clone: from https://github.com/coreutils/gnulib +0000000000000000000000000000000000000000 7838dc2442ef44aad25bdb2160df70ebc778c8dc Frank Trampe 1476312744 -0500 clone: from https://github.com/coreutils/gnulib Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/gnulib/.git/objects/pack/pack-0e902725fc3d7892a2b908397c1c62f6cb79d9c1.idx and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/gnulib/.git/objects/pack/pack-0e902725fc3d7892a2b908397c1c62f6cb79d9c1.idx differ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/gnulib/.git/objects/pack/pack-0e902725fc3d7892a2b908397c1c62f6cb79d9c1.pack and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/gnulib/.git/objects/pack/pack-0e902725fc3d7892a2b908397c1c62f6cb79d9c1.pack differ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/gnulib/.git/objects/pack/pack-ad83ee71bd3c483b30a030d896454483e85a7931.idx and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/gnulib/.git/objects/pack/pack-ad83ee71bd3c483b30a030d896454483e85a7931.idx differ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/gnulib/.git/objects/pack/pack-ad83ee71bd3c483b30a030d896454483e85a7931.pack and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/gnulib/.git/objects/pack/pack-ad83ee71bd3c483b30a030d896454483e85a7931.pack differ diff -Nru fontforge-20161005/gnulib/.git/packed-refs fontforge-20161012/gnulib/.git/packed-refs --- fontforge-20161005/gnulib/.git/packed-refs 2016-10-04 12:23:30.000000000 +0000 +++ fontforge-20161012/gnulib/.git/packed-refs 2016-10-12 22:52:24.000000000 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -d0afb6a571e32baa432ad49c669ecd9f59434dec refs/remotes/origin/master +7838dc2442ef44aad25bdb2160df70ebc778c8dc refs/remotes/origin/master diff -Nru fontforge-20161005/gnulib/.git/refs/heads/master fontforge-20161012/gnulib/.git/refs/heads/master --- fontforge-20161005/gnulib/.git/refs/heads/master 2016-10-04 12:23:30.000000000 +0000 +++ fontforge-20161012/gnulib/.git/refs/heads/master 2016-10-12 22:52:24.000000000 +0000 @@ -1 +1 @@ -d0afb6a571e32baa432ad49c669ecd9f59434dec +7838dc2442ef44aad25bdb2160df70ebc778c8dc diff -Nru fontforge-20161005/gnulib/.git/shallow fontforge-20161012/gnulib/.git/shallow --- fontforge-20161005/gnulib/.git/shallow 2016-10-04 12:23:21.000000000 +0000 +++ fontforge-20161012/gnulib/.git/shallow 2016-10-12 22:52:18.000000000 +0000 @@ -1 +1 @@ -1a497cf6506552a091ff7f9ec1c7b25fd99fff9b +7ab64d2610ca5aa78006bef91091dfa0268adf64 diff -Nru fontforge-20161005/gnulib/lib/dfa.c fontforge-20161012/gnulib/lib/dfa.c --- fontforge-20161005/gnulib/lib/dfa.c 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/lib/dfa.c 2016-10-12 22:52:25.000000000 +0000 @@ -3105,6 +3105,39 @@ unsigned char saved_end; size_t nlcount = 0; + if (MAX_TRCOUNT <= d->sindex) + { + for (s = d->min_trcount; s < d->sindex; s++) + { + free (d->states[s].elems.elems); + free (d->states[s].mbps.elems); + } + d->sindex = d->min_trcount; + + if (d->trans) + { + for (s = 0; s < d->tralloc; s++) + { + free (d->trans[s]); + free (d->fails[s]); + d->trans[s] = d->fails[s] = NULL; + } + d->trcount = 0; + } + + if (d->localeinfo.multibyte && d->mb_trans) + { + for (s = -1; s < d->tralloc; s++) + { + free (d->mb_trans[s]); + d->mb_trans[s] = NULL; + } + for (s = 0; s < d->min_trcount; s++) + d->states[s].mb_trindex = -1; + d->mb_trcount = 0; + } + } + if (!d->tralloc) { realloc_trans_if_necessary (d, 1); diff -Nru fontforge-20161005/gnulib/lib/long-options.c fontforge-20161012/gnulib/lib/long-options.c --- fontforge-20161005/gnulib/lib/long-options.c 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/lib/long-options.c 2016-10-12 22:52:25.000000000 +0000 @@ -64,6 +64,7 @@ { case 'h': (*usage_func) (EXIT_SUCCESS); + break; case 'v': { diff -Nru fontforge-20161005/gnulib/lib/utimecmp.c fontforge-20161012/gnulib/lib/utimecmp.c --- fontforge-20161005/gnulib/lib/utimecmp.c 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/lib/utimecmp.c 2016-10-12 22:52:25.000000000 +0000 @@ -288,7 +288,7 @@ to interrogate the file system to deduce the exact time stamp resolution; return the answer directly. */ { - time_t s = src_s & ~ (res == 2 * BILLION); + time_t s = src_s & ~ (res == 2 * BILLION ? 1 : 0); if (src_s < dst_s || (src_s == dst_s && src_ns <= dst_ns)) return 1; if (dst_s < s @@ -367,7 +367,7 @@ } /* Truncate the source's time stamp according to the resolution. */ - src_s &= ~ (res == 2 * BILLION); + src_s &= ~ (res == 2 * BILLION ? 1 : 0); src_ns -= src_ns % res; } diff -Nru fontforge-20161005/gnulib/lib/wchar.in.h fontforge-20161012/gnulib/lib/wchar.in.h --- fontforge-20161005/gnulib/lib/wchar.in.h 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/lib/wchar.in.h 2016-10-12 22:52:25.000000000 +0000 @@ -35,6 +35,7 @@ || (defined __hpux \ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ + || (defined __MINGW32__ && defined __STRING_H_SOURCED__) \ || defined _GL_ALREADY_INCLUDING_WCHAR_H) /* Special invocation convention: - Inside glibc and uClibc header files, but not MinGW. @@ -44,6 +45,8 @@ and once directly. In both situations 'wint_t' is not yet defined, therefore we cannot provide the function overrides; instead include only the system's . + - With MinGW 3.22, when includes , only some part of + is actually processed, and that doesn't include 'mbstate_t'. - On IRIX 6.5, similarly, we have an include -> , and the latter includes . But here, we have no way to detect whether is completely included or is still being included. */ diff -Nru fontforge-20161005/gnulib/lib/wctype.in.h fontforge-20161012/gnulib/lib/wctype.in.h --- fontforge-20161005/gnulib/lib/wctype.in.h 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/lib/wctype.in.h 2016-10-12 22:52:25.000000000 +0000 @@ -25,13 +25,25 @@ * wctrans_t, and wctype_t are not yet implemented. */ -#ifndef _@GUARD_PREFIX@_WCTYPE_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if (defined __MINGW32__ && defined __CTYPE_H_SOURCED__) + +/* Special invocation convention: + - With MinGW 3.22, when includes , only some part of + is being processed, which doesn't include the idempotency + guard. */ + +#@INCLUDE_NEXT@ @NEXT_WCTYPE_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_WCTYPE_H + #if @HAVE_WINT_T@ /* Solaris 2.5 has a bug: must be included before . Tru64 with Desktop Toolkit C has a bug: must be included before @@ -512,3 +524,4 @@ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ +#endif diff -Nru fontforge-20161005/gnulib/m4/st_dm_mode.m4 fontforge-20161012/gnulib/m4/st_dm_mode.m4 --- fontforge-20161005/gnulib/m4/st_dm_mode.m4 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/m4/st_dm_mode.m4 2016-10-12 22:52:25.000000000 +0000 @@ -17,7 +17,7 @@ if test $ac_cv_struct_st_dm_mode = yes; then AC_DEFINE([HAVE_ST_DM_MODE], [1], - [Define if struct stat has an st_dm_mode member. ]) + [Define if struct stat has an st_dm_mode member.]) fi ] ) diff -Nru fontforge-20161005/gnulib/m4/utimes.m4 fontforge-20161012/gnulib/m4/utimes.m4 --- fontforge-20161005/gnulib/m4/utimes.m4 2016-10-04 12:23:33.000000000 +0000 +++ fontforge-20161012/gnulib/m4/utimes.m4 2016-10-12 22:52:25.000000000 +0000 @@ -145,6 +145,6 @@ [gl_cv_func_working_utimes=no])]) if test $gl_cv_func_working_utimes = yes; then - AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly. ]) + AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly.]) fi ]) diff -Nru fontforge-20161005/lib/wchar.in.h fontforge-20161012/lib/wchar.in.h --- fontforge-20161005/lib/wchar.in.h 2016-10-04 13:00:06.000000000 +0000 +++ fontforge-20161012/lib/wchar.in.h 2016-10-12 23:05:51.000000000 +0000 @@ -35,6 +35,7 @@ || (defined __hpux \ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ + || (defined __MINGW32__ && defined __STRING_H_SOURCED__) \ || defined _GL_ALREADY_INCLUDING_WCHAR_H) /* Special invocation convention: - Inside glibc and uClibc header files, but not MinGW. @@ -44,6 +45,8 @@ and once directly. In both situations 'wint_t' is not yet defined, therefore we cannot provide the function overrides; instead include only the system's . + - With MinGW 3.22, when includes , only some part of + is actually processed, and that doesn't include 'mbstate_t'. - On IRIX 6.5, similarly, we have an include -> , and the latter includes . But here, we have no way to detect whether is completely included or is still being included. */ Binary files /tmp/tmpRkVi3z/MaflAKcx_T/fontforge-20161005/uthash/.git/index and /tmp/tmpRkVi3z/lE27wa7BOO/fontforge-20161012/uthash/.git/index differ diff -Nru fontforge-20161005/uthash/.git/logs/HEAD fontforge-20161012/uthash/.git/logs/HEAD --- fontforge-20161005/uthash/.git/logs/HEAD 2016-10-04 12:29:13.000000000 +0000 +++ fontforge-20161012/uthash/.git/logs/HEAD 2016-10-12 22:53:50.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e7f4693a8dccaac0a7379b107df5197c1b232891 Frank Trampe 1475584153 -0500 clone: from https://github.com/troydhanson/uthash +0000000000000000000000000000000000000000 e7f4693a8dccaac0a7379b107df5197c1b232891 Frank Trampe 1476312830 -0500 clone: from https://github.com/troydhanson/uthash diff -Nru fontforge-20161005/uthash/.git/logs/refs/heads/master fontforge-20161012/uthash/.git/logs/refs/heads/master --- fontforge-20161005/uthash/.git/logs/refs/heads/master 2016-10-04 12:29:13.000000000 +0000 +++ fontforge-20161012/uthash/.git/logs/refs/heads/master 2016-10-12 22:53:50.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e7f4693a8dccaac0a7379b107df5197c1b232891 Frank Trampe 1475584153 -0500 clone: from https://github.com/troydhanson/uthash +0000000000000000000000000000000000000000 e7f4693a8dccaac0a7379b107df5197c1b232891 Frank Trampe 1476312830 -0500 clone: from https://github.com/troydhanson/uthash diff -Nru fontforge-20161005/uthash/.git/logs/refs/remotes/origin/HEAD fontforge-20161012/uthash/.git/logs/refs/remotes/origin/HEAD --- fontforge-20161005/uthash/.git/logs/refs/remotes/origin/HEAD 2016-10-04 12:29:13.000000000 +0000 +++ fontforge-20161012/uthash/.git/logs/refs/remotes/origin/HEAD 2016-10-12 22:53:50.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 e7f4693a8dccaac0a7379b107df5197c1b232891 Frank Trampe 1475584153 -0500 clone: from https://github.com/troydhanson/uthash +0000000000000000000000000000000000000000 e7f4693a8dccaac0a7379b107df5197c1b232891 Frank Trampe 1476312830 -0500 clone: from https://github.com/troydhanson/uthash