summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-19Add mkfontdir to .gitignoreAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18Use autoconf instead of sed to substitute @bindir@ in mkfontdir.inAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18Add mkfontdir to README.mdAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18mkfontdir: Fix issues where mkfontscale and mkfontdir are installed in ↵Jeremy Huddleston
different locations or bindir contains a space https://bugs.freedesktop.org/show_bug.cgi?id=24465 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2019-02-18mkfontdir: Fix for non-srcdir buildsJon TURNEY
Fix commit ad5fefcc7a0a0beb1c02270d9f28c8b28da61199 for non-srcdir builds Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18mkfontdir: Make Makefile.am compatible with Solaris makeAlan Coopersmith
Solaris make won't substitute $< in explicit rules, only implicit ones Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18mkfontdir: config: substitute bindir in mkfontdir using Autoconf @bindir@Gaetan Nadon
Use the Autoconf recommended way of substituting bindir, see http://www.gnu.org/software/autoconf/manual/autoconf.html Use # sign for comment in script. Only sed is used, drop the cpp terminology. Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2019-02-18mkfontdir: config: move man pages into their own directoryGaetan Nadon
Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2019-02-18mkfontdir: man: remove trailing spaces and tabsGaetan Nadon
Using s/[ \t]*$// Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2019-02-18mkfontdir: Drop CVS version tag from mkfontdir.cpp tooAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18mkfontdir: config: Remove unnecessary calls from configure.acAlan Coopersmith
AC_PROG_SED & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-18mkfontdir: Purge cvs tags.Jesse Adkins
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
2019-02-18mkfontdir: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONSAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2019-02-18mkfontdir: Fix formatting of man page so ellipsis are shown with Solaris nroffAlan Coopersmith
2019-02-18mkfontdir: Fill in COPYING file with copyright/license noticesAlan Coopersmith
2019-02-18mkfontdir: Add references to mkfontscale to man pageAlan Coopersmith
Also convert (1) to (__appmansuffix__)
2019-02-18mkfontdir: Let BSD make find mkfontdir.cpp when building in a separate obj dirMatthieu Herrb
2019-02-18mkfontdir: Find mkfontscale through @bindir@ rather than AC_PATH_PROG, since ↵Adam Jackson
the one in the path could be from an old install that doesn't support all the needed flags.
2019-02-18mkfontdir: build fix for non-GNU makeMatthieu Herrb
2019-02-18mkfontdir: Add build system for bdftopcf, mkfontdir and mkfontscaleKevin E Martin
2019-02-18mkfontdir: Merging XORG-CURRENT into trunkEgbert Eich
2019-02-18mkfontdir: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST ↵Egbert Eich
2004
2019-02-18mkfontdir: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004Egbert Eich
2019-02-18mkfontdir: readding XFree86's cvs IDsEgbert Eich
2019-02-18mkfontdir: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 ↵Egbert Eich
PST 2004
2019-02-18mkfontdir: Initial revisionKaleb Keithley
2019-02-18mkfontdir: XFree86 4.3.0.1Kaleb Keithley
2019-02-18mkfontdir: R6.6 is the Xorg base-lineKaleb Keithley
2019-01-06Clear some -Wshorten-64-to-32 warnings from clang 6Alan Coopersmith
ident.c:84:13: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] int n = strlen(filename); ~ ^~~~~~~~~~~~~~~~ ident.c:130:9: warning: implicit conversion loses integer precision: 'off64_t' (aka 'long') to 'int' [-Wshorten-64-to-32] return gzseek(ff->f.gz, offset, whence); ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ident.c:140:17: warning: implicit conversion loses integer precision: 'long' to 'int' [-Wshorten-64-to-32] n = offset - ff->pos; ~ ~~~~~~~^~~~~~~~~ ident.c:143:10: warning: implicit conversion loses integer precision: 'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32] n = offset; ~ ^~~~~~ ident.c:156:12: warning: implicit conversion loses integer precision: 'off_t' (aka 'long') to 'unsigned int' [-Wshorten-64-to-32] ff->pos = offset; ~ ^~~~~~ ident.c:157:9: warning: implicit conversion loses integer precision: 'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32] return offset; ~~~~~~ ^~~~~~ mkfontscale.c:704:13: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] int n = strlen(dirname); ~ ^~~~~~~~~~~~~~~ mkfontscale.c:748:13: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] int n = strlen(filename); ~ ^~~~~~~~~~~~~~~~ mkfontscale.c:794:14: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] xl = strlen (exclusionSuffix); ~ ^~~~~~~~~~~~~~~~~~~~~~~~ mkfontscale.c:796:9: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] i = strlen(dirname_given); ~ ^~~~~~~~~~~~~~~~~~~~~ mkfontscale.c:858:15: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] int dl = strlen (entry->d_name); ~~ ^~~~~~~~~~~~~~~~~~~~~~ mkfontscale.c:930:21: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] int l = strlen(xlfd_name); ~ ^~~~~~~~~~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-01-06Clear some -Wsign-compare warnings from gcc 7Alan Coopersmith
mkfontscale.c: In function ‘getName’: mkfontscale.c:336:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for(i = 0; i < name.string_len / 2; i++) { ^ mkfontscale.c: In function ‘nameWidth’: mkfontscale.c:427:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for(i = 0; i < NUMWIDTHS; i++) ^ mkfontscale.c: In function ‘notice_foundry’: mkfontscale.c:1261:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for(i = 0; i < countof(notice_foundries); i++) ^ mkfontscale.c: In function ‘vendor_foundry’: mkfontscale.c:1285:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for(i = 0; i < countof(vendor_foundries); i++) ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-01-06Add new ConstList functions and use them.Thomas Klausner
Gets rid of lots of const warnings. Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2018-11-21Update configure.ac bug URL for gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-16Update README for gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Stop shadowing 'found' in checkExtraEncoding()Alan Coopersmith
mkfontscale.c: In function ‘checkExtraEncoding’: mkfontscale.c:1220:17: warning: declaration of ‘found’ shadows a parameter [-Wshadow] int found = 0; ^~~~~ mkfontscale.c:1214:59: note: shadowed declaration is here checkExtraEncoding(FT_Face face, char *encoding_name, int found) ^~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Rename variable 'n' to avoid shadowing another 'n' in doDirectoryAlan Coopersmith
mkfontscale.c: In function ‘doDirectory’: mkfontscale.c:928:17: warning: declaration of ‘n’ shadows a previous local [-Wshadow] int n = strlen(xlfd_name); ^ mkfontscale.c:788:12: note: shadowed declaration is here int i, n, dirn, diri, found, rc; ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Use vasprintf(), if available, to implement dsprintf()Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Replace dsprintf("%s", s) with strdup(s)Alan Coopersmith
dsprintf is an allocating sprintf. With a format string of "%s", it reduces to just being a more complicated version of strdup, so lets just use strdup instead to save time and reduce complexity. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Remove last use of strcatAlan Coopersmith
If getcwd returned a string that exactly filled the prefix buffer, it could write the null terminator byte out of bounds. Instead, since the prefix is copied to a newly allocated string and never used again, just let the dsprintf() call take care of it. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-09-10Sort input file listBernhard M. Wiedemann
so that openSUSE's installation-images builds in a reproducible way in spite of indeterministic filesystem readdir order See https://reproducible-builds.org/ for why this is good. Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
2018-03-06mkfontscale 1.1.3mkfontscale-1.1.3Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-26autogen: add default patch prefixMihail Konev
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26autogen.sh: use quoted string variablesEmil Velikov
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26autogen.sh: use exec instead of waiting for configure to finishPeter Hutterer
Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2016-09-18mkfontscale: Avoid a buffer underrunJeremy Huddleston Sequoia
https://bugs.freedesktop.org/show_bug.cgi?id=96905 ================================================================= ==3068==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60300000de6f at pc 0x000109df79d1 bp 0x7fff55e37d90 sp 0x7fff55e37550 READ of size 1 at 0x60300000de6f thread T0 #0 0x109df79d0 in wrap_strcmp (libclang_rt.asan_osx_dynamic.dylib+0xe9d0) #1 0x109dc8ef7 in fontFileOpen (mkfontscale+0x100001ef7) #2 0x109dc8e0b in bitmapIdentify (mkfontscale+0x100001e0b) #3 0x109dcc874 in doDirectory (mkfontscale+0x100005874) #4 0x109dcbc78 in main (mkfontscale+0x100004c78) #5 0x7fff9083f5ac in start (libdyld.dylib+0x35ac) #6 0x3 (<unknown module>) 0x60300000de6f is located 1 bytes to the left of 20-byte region [0x60300000de70,0x60300000de84) allocated by thread T0 here: #0 0x109e34570 in wrap_malloc (libclang_rt.asan_osx_dynamic.dylib+0x4b570) #1 0x109dca92a in dsprintf (mkfontscale+0x10000392a) #2 0x109dcc788 in doDirectory (mkfontscale+0x100005788) #3 0x109dcbc78 in main (mkfontscale+0x100004c78) #4 0x7fff9083f5ac in start (libdyld.dylib+0x35ac) #5 0x3 (<unknown module>) Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-10fix handling of Type1 fonts without /FamilyName and/or /FullNameStefan Dirsch
https://bugzilla.opensuse.org/show_bug.cgi?id=918466 Signed-off-by: Stefan Dirsch <sndirsch@suse.de> Reviewed-by: Adam Jackson <ajax@redhat.com>
2015-01-16mkfontscale 1.1.2mkfontscale-1.1.2Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-07-06Remove extraneous duplicate checks for -r & -n optionsAlan Coopersmith
Flagged by cppcheck 1.65: [mkfontscale.c:247]: (style) Expression is always false because 'else if' condition matches previous condition at line 224. [mkfontscale.c:245]: (style) Expression is always false because 'else if' condition matches previous condition at line 227. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2014-06-02autogen.sh: Honor NOCONFIGURE=1Alan Coopersmith
See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-02configure: Drop AM_MAINTAINER_MODEAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-03-19Only include config.h if it exists.Thomas Klausner
Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>