[Git][xorg-team/lib/libfontenc][upstream-unstable] 8 commits: make FontEncDirectory return a const string

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libfontenc

Commits:

8bbc9af3

by Julien Cristau at 2015-09-24T19:28:18+02:00

make FontEncDirectory return a const string

Its comment already said "This string is static and should not be
modified".

encparse.c: In function 'FontEncDirectory':
encparse.c:844:17: warning: assignment discards 'const' qualifier from pointer target type
             dir = FONT_ENCODINGS_DIRECTORY;
                 ^

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

38aac013

by Peter Hutterer at 2017-01-26T11:59:22+10:00

autogen.sh: use exec instead of waiting for configure to finish

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>

cc7e0f55

by Emil Velikov at 2017-01-26T11:59:22+10:00

autogen.sh: use quoted string variables

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>

8d30ca25

by Mihail Konev at 2017-01-26T13:52:49+10:00

autogen: add default patch prefix

Signed-off-by: Mihail Konev <k.mvc@ya.ru>

b28c2d11

by Alan Coopersmith at 2018-11-11T13:59:55-08:00

Fix iso8859-7 mappings for 0xA1, 0xA2, & 0xFF

Fixes: https://gitlab.freedesktop.org/xorg/lib/libfontenc/issues/1

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

b12b2d71

by Alan Coopersmith at 2018-11-19T23:01:09-08:00

Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

d7f66184

by Alan Coopersmith at 2018-12-07T19:29:22-08:00

Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2baea139

by Alan Coopersmith at 2019-02-19T17:31:57-08:00

libfontenc 1.1.4

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Changes:

Makefile.am

@@ -40,3 +40,5 @@ if LINT
  lint:
  	(cd src && $(MAKE) $(MFLAGS) lint)
  endif LINT
++
 +EXTRA_DIST = README.md

README → README.md

  libfontenc - font encoding library
 +----------------------------------
  All questions regarding this software should be directed at the
  Xorg mailing list:
 -        http://lists.freedesktop.org/mailman/listinfo/xorg
+-
 -Please submit bug reports to the Xorg bugzilla:
+-
 -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 +  https://lists.x.org/mailman/listinfo/xorg
  The master development code repository can be found at:
 -        git://anongit.freedesktop.org/git/xorg/lib/libfontenc
 +  https://gitlab.freedesktop.org/xorg/lib/libfontenc
 -        http://cgit.freedesktop.org/xorg/lib/libfontenc
 +Please submit bug reports and requests to merge patches there.
  For patch submission instructions, see:
 -	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+-
 -For more information on the git code manager, see:
+-
 -        http://wiki.x.org/wiki/GitPage
 +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches

autogen.sh

  #! /bin/sh
 -srcdir=`dirname $0`
 +srcdir=`dirname "$0"`
  test -z "$srcdir" && srcdir=.
  ORIGDIR=`pwd`
 -cd $srcdir
 +cd "$srcdir"
  autoreconf -v --install || exit 1
 -cd $ORIGDIR || exit $?
 +cd "$ORIGDIR" || exit $?
++
 +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
 +    git config --local format.subjectPrefix "PATCH libfontenc"
  if test -z "$NOCONFIGURE"; then
 -    $srcdir/configure "$@"
 +    exec "$srcdir"/configure "$@"
  fi

configure.ac

@@ -21,8 +21,8 @@
  # Initialize Autoconf
  AC_PREREQ([2.60])
 -AC_INIT([libfontenc], [1.1.3],
 -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libfontenc])
 +AC_INIT([libfontenc], [1.1.4],
 +        [https://gitlab.freedesktop.org/xorg/lib/libfontenc/issues], [libfontenc])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([config.h])

include/X11/fonts/fontenc.h

@@ -109,7 +109,7 @@ char *FontEncName(unsigned, FontMapPtr);
  /* Return a pointer to the name of the system encodings directory. */
  /* This string is static and should not be modified. */
 -char *FontEncDirectory(void);
 +const char *FontEncDirectory(void);
  /* Identify an encoding file.  If fileName doesn't exist, or is not an
     encoding file, return NULL, otherwise returns a NULL-terminated

src/encparse.c

@@ -827,13 +827,13 @@ parseEncodingFile(FontFilePtr f, int headerOnly)
      return NULL;
+ }
 -char *
 +const char *
  FontEncDirectory(void)
+ {
 -    static char *dir = NULL;
 +    static const char *dir = NULL;
      if (dir == NULL) {
 -        char *c = getenv("FONT_ENCODINGS_DIRECTORY");
 +        const char *c = getenv("FONT_ENCODINGS_DIRECTORY");
          if (c) {
              dir = strdup(c);
@@ -941,7 +941,7 @@ FontEncReallyLoad(const char *charset, const char *fontFileName)
+ {
      FontEncPtr encoding;
      char dir[MAXFONTFILENAMELEN], dirname[MAXFONTFILENAMELEN];
 -    char *d;
 +    const char *d;
      if (fontFileName) {
          parseFontFileName(fontFileName, dirname, dir);

src/fontenc.c

@@ -274,14 +274,14 @@ iso8859_7_to_unicode(unsigned isocode, void *client_data)
          isocode == 0xB7 || isocode == 0xBB || isocode == 0xBD)
          return isocode;
      else if (isocode == 0xA1)
 -        return 0x02BD;
 +        return 0x2018;
      else if (isocode == 0xA2)
 -        return 0x02BC;
 +        return 0x2019;
      else if (isocode == 0xAF)
          return 0x2015;
      else if (isocode == 0xD2)   /* unassigned */
          return 0;
 -    else if (isocode >= 0xB4)
 +    else if (isocode >= 0xB4 && isocode <= 0xFE)
          return isocode - 0xA0 + 0x0370;
      else
          return 0;