[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libxfont][debian-unstable] 11 commits: gitlab CI: add a basic build test

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxfont

Commits:

  • a6aee4c9
    by Alan Coopersmith at 2022-04-06T14:31:29-07:00 
    gitlab CI: add a basic build test

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • f83ea5e9
    by Alan Coopersmith at 2022-04-06T14:31:49-07:00 
    Build xz tarballs instead of bzip2

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 12bed789
    by Alan Coopersmith at 2022-04-06T14:37:42-07:00 
    Fix spelling/wording issues

Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 5cb3b880
    by Alan Coopersmith at 2022-06-20T12:30:41-07:00 
    configure: Use pkg-config to handle zlib dependency if possible

Preserves fallback for systems like darwin without zlib.pc

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 8e3d94c8
    by Jeremy Huddleston Sequoia at 2022-06-21T23:50:14+00:00 
    Correct fsCreateACReq length

Regressed-in: 6972ea08ee5b2ef1cfbdc2fcaf14f06bbd391561
Fixes: https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues/13
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
  • 3c8fdf6e
    by Alan Coopersmith at 2022-06-21T17:37:32-07:00 
    Fix comments to reflect removal of OS/2 support

Commit 6c29007756301 removed OS/2 support from the code,
but missed updating the comments to match.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • efb28722
    by Peter Harris at 2022-08-11T15:02:21-07:00 
    Fix buffer overrun in FontFileMakeDir on WIN32

When dirName is "" (eg. when called by BuiltinReadDirectory),
FontFileMakeDir would read after the string when WIN32 is defined.

Fix the overrun issue by checking the location of the found :
before adding two.

Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • d54aaf24
    by Alan Coopersmith at 2022-08-26T16:22:15-07:00 
    libXfont2 2.0.6

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • a644d56c
    by Timo Aaltonen at 2022-09-01T14:00:52+03:00 
    Merge branch 'upstream-unstable' into debian-unstable
  • 8e4890be
    by Timo Aaltonen at 2022-09-01T14:01:54+03:00 
    version bump
  • 5b6a5a14
    by Timo Aaltonen at 2022-09-01T14:03:21+03:00 
    release to sid

18 changed files:

Changes:

  • .gitlab-ci.yml
    1 
    +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
    2 
    +#
    3 
    +# This CI uses the freedesktop.org ci-templates.
    4 
    +# Please see the ci-templates documentation for details:
    5 
    +# https://freedesktop.pages.freedesktop.org/ci-templates/
    6 
    +
    7 
    +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
    8 
    +
    9 
    +
    10 
    +include:
    11 
    +  # Debian container builder template
    12 
    +  - project: 'freedesktop/ci-templates'
    13 
    +    ref: *template_sha
    14 
    +    file: '/templates/debian.yml'
    15 
    +  - project: 'freedesktop/ci-templates'
    16 
    +    ref: *template_sha
    17 
    +    file: '/templates/ci-fairy.yml'
    18 
    +  - template: Security/SAST.gitlab-ci.yml
    19 
    +
    20 
    +
    21 
    +stages:
    22 
    +  - prep             # prep work like rebuilding the container images if there is a change
    23 
    +  - build            # for actually building and testing things in a container
    24 
    +  - test
    25 
    +  - deploy
    26 
    +
    27 
    +
    28 
    +variables:
    29 
    +  FDO_UPSTREAM_REPO: 'xorg/lib/libXfont'
    30 
    +  FDO_DISTRIBUTION_VERSION: 'stable'
    31 
    +  # The tag should be updated each time the list of packages is updated.
    32 
    +  # Changing a tag forces the associated image to be rebuilt.
    33 
    +  # Note: the tag has no meaning, we use a date format purely for readability
    34 
    +  FDO_DISTRIBUTION_TAG:  '2022-04-06.1'
    35 
    +  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev xtrans-dev libfontenc-dev libfreetype-dev zlib1g-dev libbz2-dev xmlto xorg-sgml-doctools w3m xsltproc fop'
    36 
    +
    37 
    +
    38 
    +#
    39 
    +# Verify that commit messages are as expected, signed-off, etc.
    40 
    +#
    41 
    +check-commits:
    42 
    +  extends:
    43 
    +    - .fdo.ci-fairy
    44 
    +  stage: prep
    45 
    +  script:
    46 
    +    - ci-fairy check-commits --junit-xml=results.xml
    47 
    +  except:
    48 
    +    - master@xorg/lib/libXfont
    49 
    +  variables:
    50 
    +    GIT_DEPTH: 100
    51 
    +  artifacts:
    52 
    +    reports:
    53 
    +      junit: results.xml
    54 
    +
    55 
    +#
    56 
    +# Verify that the merge request has the allow-collaboration checkbox ticked
    57 
    +#
    58 
    +check-merge-request:
    59 
    +  extends:
    60 
    +    - .fdo.ci-fairy
    61 
    +  stage: deploy
    62 
    +  script:
    63 
    +    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
    64 
    +  artifacts:
    65 
    +    when: on_failure
    66 
    +    reports:
    67 
    +      junit: results.xml
    68 
    +  allow_failure: true
    69 
    +
    70 
    +
    71 
    +#
    72 
    +# Build a container with the given tag and the packages pre-installed.
    73 
    +# This only happens if/when the tag changes, otherwise the existing image is
    74 
    +# re-used.
    75 
    +#
    76 
    +container-prep:
    77 
    +  extends:
    78 
    +    - .fdo.container-build@debian
    79 
    +  stage: prep
    80 
    +  variables:
    81 
    +    GIT_STRATEGY: none
    82 
    +
    83 
    +
    84 
    +#
    85 
    +# The default build, runs on the image built above.
    86 
    +#
    87 
    +build:
    88 
    +  stage: build
    89 
    +  extends:
    90 
    +    - .fdo.distribution-image@debian
    91 
    +  script:
    92 
    +    - autoreconf -ivf
    93 
    +    - mkdir _builddir
    94 
    +    - pushd _builddir > /dev/null
    95 
    +    - ../configure --disable-silent-rules --with-bzip2 --enable-devel-docs
    96 
    +    - make
    97 
    +    - make check
    98 
    +    - make distcheck
    99 
    +    - popd > /dev/null

  • Makefile.am
    ... ... @@ -66,7 +66,7 @@ libXfont2_la_SOURCES = \
    66 66
    67 67 
     libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
    68 68
    69 
    -libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) $(LTLIBOBJS)
    69 
    +libXfont2_la_LIBADD = $(ZLIB_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) $(LTLIBOBJS)
    70 70
    71 71 
     if XFONT_FONTFILE
    72 72 
     libXfont2_la_SOURCES +=			\

  • README.md
    ... ... @@ -52,7 +52,7 @@ configure script takes various options to enable or disable them:
    52 52
    53 53 
     - Font services:
    54 54
    55 
    -  * xfs font servers - allows retreiving fonts as a client of an xfs server.
    55 
    +  * xfs font servers - allows retrieving fonts as a client of an xfs server.
    56 56 
         Enabled by default, disable via --disable-fc (font client).
    57 57
    58 58 
         If enabled, you can also use the standard libxtrans flags to
    ... ... @@ -74,7 +74,7 @@ Xorg mailing list:
    74 74
    75 75 
       https://lists.x.org/mailman/listinfo/xorg
    76 76
    77 
    -The master development code repository can be found at:
    77 
    +The primary development code repository can be found at:
    78 78
    79 79 
       https://gitlab.freedesktop.org/xorg/lib/libXfont
    80 80

  • configure.ac
    ... ... @@ -21,13 +21,13 @@
    21 21
    22 22 
     # Initialize Autoconf
    23 23 
     AC_PREREQ([2.60])
    24 
    -AC_INIT([libXfont2], [2.0.5],
    25 
    -	[https://gitlab.freedesktop.org/xorg/lib/libXfont/issues], [libXfont2])
    24 
    +AC_INIT([libXfont2], [2.0.6],
    25 
    +	[https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues], [libXfont2])
    26 26 
     AC_CONFIG_SRCDIR([Makefile.am])
    27 27 
     AC_CONFIG_HEADERS([config.h])
    28 28
    29 29 
     # Initialize Automake
    30 
    -AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
    30 
    +AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
    31 31
    32 32 
     # Set common system defines for POSIX extensions, such as _GNU_SOURCE
    33 33 
     # Must be called before any macros that run the compiler (like
    ... ... @@ -128,7 +128,12 @@ AC_SUBST(FREETYPE_REQUIRES)
    128 128 
     AC_DEFINE(X_GZIP_FONT_COMPRESSION,1,[Support gzip for bitmap fonts])
    129 129 
     X_GZIP_FONT_COMPRESSION=1
    130 130 
     AC_SUBST(X_GZIP_FONT_COMPRESSION)
    131 
    -AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([*** zlib is required]))
    131 
    +PKG_CHECK_MODULES(ZLIB, [zlib], [Z_REQUIRES=zlib], [Z_REQUIRES=""])
    132 
    +if test "x$Z_REQUIRES" = "x"; then
    133 
    +	AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz],
    134 
    +		AC_MSG_ERROR([*** zlib is required]))
    135 
    +fi
    136 
    +AC_SUBST(Z_REQUIRES)
    132 137
    133 138 
     AC_ARG_WITH(bzip2,
    134 139 
     	AS_HELP_STRING([--with-bzip2],

  • debian/changelog
    1 
    +libxfont (1:2.0.6-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +
    5 
    + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 01 Sep 2022 14:03:08 +0300
    6 
    +
    1 7 
     libxfont (1:2.0.5-1) unstable; urgency=medium
    2 8
    3 9 
       * New upstream release.

  • doc/fontlib.xml
    ... ... @@ -176,7 +176,7 @@
    176 176 
     	bitmap-font specific interfaces which those applications use,
    177 177 
     	instead of the more general interfaces used by the X and font
    178 178 
     	servers, which are unaware of the source of the font data.
    179 
    -	These routines will be refered to as the bitmap font access
    179 
    +	These routines will be referred to as the bitmap font access
    180 180 
     	methods.
    181 181 
           </para>
    182 182

  • src/FreeType/ftfuncs.c
    ... ... @@ -94,7 +94,7 @@ static CharInfoRec noSuchChar = { /* metrics */{0,0,0,0,0,0},
    94 94 
     				  /* bits */   NULL };
    95 95 
     #endif
    96 96
    97 
    -/* The propery names for all the XLFD properties. */
    97 
    +/* The property names for all the XLFD properties. */
    98 98
    99 99 
     static const char *xlfd_props[] = {
    100 100 
         "FOUNDRY",
    ... ... @@ -1562,7 +1562,7 @@ FreeTypeUnloadXFont(FontPtr pFont)
    1562 1562 
     /* Add the font properties, including the Font name, the XLFD
    1563 1563 
        properties, some strings from the font, and various typographical
    1564 1564 
        data.  We only provide data readily available in the tables in the
    1565 
    -   font for now, altough FIGURE_WIDTH would be a good idea as it is
    1565 
    +   font for now, although FIGURE_WIDTH would be a good idea as it is
    1566 1566 
        used by Xaw. */
    1567 1567
    1568 1568 
     static int
    ... ... @@ -2413,7 +2413,7 @@ FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals,
    2413 2413 
     	    goto quit;
    2414 2414 
     	}
    2415 2415 
         }
    2416 
    -    /* doube striking */
    2416 
    +    /* double striking */
    2417 2417 
         if (SPropRecValList_search_record(&listPropRecVal,
    2418 2418 
                                           &contRecValue,
    2419 2419 
                                           "DoubleStrike")) {

  • src/FreeType/xttcap.c
    ... ... @@ -393,7 +393,7 @@ get_one_line(FILE *is, char *buf)
    393 393 
                 /* End of Line */
    394 394 
                 break;
    395 395 
             if (isspace(c)) {
    396 
    -            /* convine multiple spaces */
    396 
    +            /* combine multiple spaces */
    397 397 
                 if (!flHead)
    398 398 
                     /* except space at the head of line */
    399 399 
                     flSpace = True;

  • src/bitmap/bdfread.c
    ... ... @@ -677,7 +677,7 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
    677 677
    678 678 
     	case 2:
    679 679 
     	    /*
    680 
    -	     * Possibilites include: valid quoted string with no white space
    680 
    +	     * Possibilities include: valid quoted string with no white space
    681 681 
     	     * valid integer value invalid value
    682 682 
     	     */
    683 683 
     	    if (secondbuf[0] == '"') {
    ... ... @@ -698,7 +698,7 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
    698 698
    699 699 
     	case 3:
    700 700 
     	    /*
    701 
    -	     * Possibilites include: valid quoted string with some white space
    701 
    +	     * Possibilities include: valid quoted string with some white space
    702 702 
     	     * invalid value (reject even if second string is integer)
    703 703 
     	     */
    704 704 
     	    if (secondbuf[0] == '"') {

  • src/bitmap/pcfread.c
    ... ... @@ -197,7 +197,7 @@ pcfGetCompressedMetric(FontFilePtr file, CARD32 format, xCharInfo *metric)
    197 197 
     }
    198 198
    199 199 
     /*
    200 
    - * Position the file to the begining of the specified table
    200 
    + * Position the file to the beginning of the specified table
    201 201 
      * in the font file
    202 202 
      */
    203 203 
     static Bool

  • src/bitmap/snfstr.h
    ... ... @@ -67,7 +67,7 @@ from The Open Group.
    67 67 
      *	1)  The XFONTINFO structure
    68 68 
      *		hand-padded to a two-short boundary.
    69 69 
      *		maxbounds.byteoffset is the total number of bytes in the
    70 
    - *			glpyh array
    70 
    + *			glyph array
    71 71 
      *		maxbounds.bitOffset is thetotal width of the unpadded font
    72 72 
      *
    73 73 
      *	2)  The XCHARINFO array

  • src/fc/fserve.c
    ... ... @@ -179,7 +179,7 @@ fs_fd_handler(int fd, void *data);
    179 179 
      * the font server, and a block record to be stored in the fpe's list
    180 180 
      * of outstanding requests.  the FS block handler also sticks the
    181 181 
      * proper set of fd's into the select mask.  when data is ready to be
    182 
    - * read in, the FS wakup handler will be hit.  this will read the
    182 
    + * read in, the FS wakeup handler will be hit.  this will read the
    183 183 
      * data off the wire into the proper block record, and then signal the
    184 184 
      * client that caused the block so that it can restart.  it will then
    185 185 
      * call the access function again, which will realize that the data has
    ... ... @@ -536,7 +536,7 @@ conn_stop_listening(FSFpePtr conn)
    536 536
    537 537 
     /*
    538 538 
      * When a request is aborted due to a font server failure,
    539 
    - * signal any depending clients to restart their dependant
    539 
    + * signal any depending clients to restart their dependent
    540 540 
      * requests
    541 541 
      */
    542 542 
     static void
    ... ... @@ -2857,7 +2857,7 @@ _fs_client_access (FSFpePtr conn, pointer client, Bool sync)
    2857 2857 
     	    authorizations = padding;
    2858 2858 
     	    authlen = 4;
    2859 2859 
     	}
    2860 
    -	crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
    2860 
    +	crac.length = (sizeof (fsCreateACReq) + authlen + 3) >> 2;
    2861 2861 
     	crac.acid = cur->acid;
    2862 2862 
     	_fs_add_req_log(conn, FS_CreateAC);
    2863 2863 
     	_fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));

  • src/fontfile/decompress.c
    ... ... @@ -16,7 +16,7 @@
    16 16 
      * from this software without specific prior written permission.
    17 17 
      * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
    18 18 
      * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
    19 
    - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    19 
    + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    20 20 
      */
    21 21
    22 22 
     /*

  • src/fontfile/dirfile.c
    ... ... @@ -83,7 +83,7 @@ FontFileReadDirectory (const char *directory, FontDirectoryPtr *pdir)
    83 83 
     #if !defined(WIN32)
    84 84 
         if ((ptr = strchr(directory, ':'))) {
    85 85 
     #else
    86 
    -    /* OS/2 and WIN32 path might start with a drive letter, don't clip this */
    86 
    +    /* WIN32 path might start with a drive letter, don't clip this */
    87 87 
         if ((ptr = strchr(directory+2, ':'))) {
    88 88 
     #endif
    89 89 
     	strncpy(dir_path, directory, ptr - directory);
    ... ... @@ -249,7 +249,7 @@ AddFileNameAliases(FontDirectoryPtr dir)
    249 249 
      *
    250 250 
      * alias font-name
    251 251 
      *
    252 
    - * To imbed white-space in an alias name, enclose it like "font name"
    252 
    + * To embed white-space in an alias name, enclose it like "font name"
    253 253 
      * in double quotes.  \ escapes and character, so
    254 254 
      * "font name \"With Double Quotes\" \\ and \\ back-slashes"
    255 255 
      * works just fine.

  • src/fontfile/fontdir.c
    ... ... @@ -112,11 +112,12 @@ FontFileMakeDir(const char *dirName, int size)
    112 112 
         const char		*attrib;
    113 113 
         int			attriblen;
    114 114
    115 
    -#if !defined(WIN32)
    116 115 
         attrib = strchr(dirName, ':');
    117 
    -#else
    118 
    -    /* OS/2 uses the colon in the drive letter descriptor, skip this */
    119 
    -    attrib = strchr(dirName+2, ':');
    116 
    +#if defined(WIN32)
    117 
    +    if (attrib && attrib - dirName == 1) {
    118 
    +	/* WIN32 uses the colon in the drive letter descriptor, skip this */
    119 
    +	attrib = strchr(dirName + 2, ':');
    120 
    +    }
    120 121 
     #endif
    121 122 
         if (attrib) {
    122 123 
     	dirlen = attrib - dirName;

  • src/fontfile/fontfile.c
    ... ... @@ -75,8 +75,8 @@ FontFileNameCheck (const char *name)
    75 75 
     {
    76 76 
     #ifndef NCD
    77 77 
     #if defined(WIN32)
    78 
    -    /* OS/2 uses D:/... as a path name for fonts, so accept this as a valid
    79 
    -     * path if it starts with a letter and a colon. Same applies for WIN32
    78 
    +    /* WIN32 uses D:/... as a path name for fonts, so accept this as a valid
    79 
    +     * path if it starts with a letter and a colon.
    80 80 
          */
    81 81 
         if (isalpha(*name) && name[1]==':')
    82 82 
             return TRUE;

  • src/util/utilbitmap.c
    ... ... @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
    34 34 
     #include "libxfontint.h"
    35 35 
     #include <X11/fonts/fontmisc.h>
    36 36
    37 
    -/* Utility functions for reformating font bitmaps */
    37 
    +/* Utility functions for reformatting font bitmaps */
    38 38
    39 39 
     static const unsigned char _reverse_byte[0x100] = {
    40 40 
     	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,

  • xfont2.pc.in
    ... ... @@ -7,7 +7,7 @@ Name: Xfont2
    7 7 
     Description: X font Library version 2
    8 8 
     Version: @VERSION@
    9 9 
     Requires: xproto fontsproto
    10 
    -Requires.private: fontenc @FREETYPE_REQUIRES@
    10 
    +Requires.private: fontenc @FREETYPE_REQUIRES@ @Z_REQUIRES@
    11 11 
     Cflags: -I${includedir}
    12 12 
     Libs: -L${libdir} -lXfont2
    13 13 
     Libs.private: @Z_LIBS@ -lm

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: