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

libxfont: Changes to 'upstream-unstable'

 autogen.sh               |    4 +++-
 configure.ac             |    5 ++---
 src/FreeType/Makefile.am |    6 +++---
 src/bitmap/Makefile.am   |    2 +-
 src/builtins/Makefile.am |    2 +-
 src/fc/Makefile.am       |    2 +-
 src/fc/fservestr.h       |    5 -----
 src/fc/fsio.c            |    7 +++++--
 src/fontfile/Makefile.am |    2 +-
 src/fontfile/bunzip2.c   |    2 ++
 src/fontfile/catalogue.c |    6 +++++-
 src/fontfile/register.c  |    2 ++
 src/stubs/Makefile.am    |    2 +-
 src/util/Makefile.am     |    2 +-
 14 files changed, 28 insertions(+), 21 deletions(-)

New commits:
commit 8b289e10c5013cdcbf817c06bd929e3ea8339987
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Sun Jul 21 16:53:47 2013 -0700

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

diff --git a/configure.ac b/configure.ac
index 338385f..e0e81bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXfont], [1.4.5],
+AC_INIT([libXfont], [1.4.6],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])

commit 7447029974415641a7a8a85918edcc20cfd9d461
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Mon Jun 24 22:40:39 2013 -0700

    Require ANSI C89 pre-processor, drop pre-C89 token pasting support
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h
index 6435cf4..29ae46e 100644
--- a/src/fc/fservestr.h
+++ b/src/fc/fservestr.h
@@ -139,12 +139,7 @@ typedef struct _fs_reconnect {
 } FSReconnectRec, *FSReconnectPtr;
 
 
-#if !defined(UNIXCPP) || defined(ANSICPP)
 #define fsCat(x,y) x##_##y
-#else
-#define fsCat(x,y) x/**/_/**/y
-#endif
-
 
 /* copy XCharInfo parts of a protocol reply into a xCharInfo */
 

commit c21d25de05d82a761a3225b685e9adcb7bb374bd
Author: Thomas Klausner <wiz@NetBSD.org>
Date:   Sun Jun 2 21:03:27 2013 +0200

    Protect config.h inclusion with ifdef HAVE_CONFIG_H, like usual.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

diff --git a/src/fontfile/bunzip2.c b/src/fontfile/bunzip2.c
index 44d19f0..4078796 100644
--- a/src/fontfile/bunzip2.c
+++ b/src/fontfile/bunzip2.c
@@ -26,7 +26,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <X11/fonts/fontmisc.h>
 #include <X11/fonts/bufio.h>

commit b8dd42dce868f9c16a59790ce51f0542b59cb79d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Tue Jan 15 18:30:32 2013 -0800

    Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS
    
    Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
    
      - Support for the long-deprecated INCLUDES variable will be removed
        altogether in Automake 1.14.  The AM_CPPFLAGS variable should be
        used instead.
    
    This variable was deprecated in Automake releases prior to 1.10, which is
    the current minimum level required to build X.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am
index fa45da1..ab60ffa 100644
--- a/src/FreeType/Makefile.am
+++ b/src/FreeType/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES =                                \
+AM_CPPFLAGS = 			\
 	-I${top_srcdir}/include
 
-noinst_LTLIBRARIES = libft.la
-
 AM_CFLAGS = $(FREETYPE_CFLAGS) $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
 
+noinst_LTLIBRARIES = libft.la
+
 libft_la_SOURCES = 		\
 	ft.h			\
 	ftfuncs.h		\
diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am
index b5b9674..99682d9 100644
--- a/src/bitmap/Makefile.am
+++ b/src/bitmap/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-I${top_srcdir}/include
 
 AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am
index b203fda..6b96410 100644
--- a/src/builtins/Makefile.am
+++ b/src/builtins/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/src/bitmap
 
diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am
index 3bfd231..c180cae 100644
--- a/src/fc/Makefile.am
+++ b/src/fc/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =                      \
+AM_CPPFLAGS = 			\
 	-I${top_srcdir}/include
 
 AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
index aa64ca5..ab54cfd 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I${top_srcdir}/include
+AM_CPPFLAGS = -I${top_srcdir}/include
 
 AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
 
diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am
index 86dd8fc..23e3bd1 100644
--- a/src/stubs/Makefile.am
+++ b/src/stubs/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-I${top_srcdir}/include
 
 AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 055fc9d..32a8f37 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-I${top_srcdir}/include \
 	-I$(top_srcdir)/src/stubs
 

commit 8d946d2606b3a349b2a54d602e027a09ae330e88
Author: Colin Walters <walters@verbum.org>
Date:   Wed Jan 4 17:37:06 2012 -0500

    autogen.sh: Implement GNOME Build API
    
    http://people.gnome.org/~walters/docs/build-api.txt
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>

diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+    $srcdir/configure "$@"
+fi

commit 9d8936879b2fe1ca6460354ef68cd5e824d6748c
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 15 14:28:48 2013 -0500

    configure: Remove AM_MAINTAINER_MODE
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>

diff --git a/configure.ac b/configure.ac
index ee3f7af..338385f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,6 @@ AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
 
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
 
 # Initialize libtool
 AC_PROG_LIBTOOL

commit a756da1844f63a2f2162eb8e53a883f496e4faad
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri Dec 7 10:30:38 2012 -0500

    catalogue: Fix obvious thinko
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>

diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 7e7e477..09ca2ae 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -192,7 +192,7 @@ CatalogueRescan (FontPathElementPtr fpe, Bool forceScan)
 	subfpe->type = fpe->type;
 	subfpe->name_length = len;
 	subfpe->name = malloc (len + 1);
-	if (subfpe == NULL)
+	if (subfpe->name == NULL)
 	{
 	    free(subfpe);
 	    continue;

commit 5680e4c3d76cd5c64175d88d0685ee6962aa1e46
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date:   Mon Oct 29 09:59:30 2012 -0500

    Omit catalogue support on systems without symlinks
    
    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
    Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
    Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>

diff --git a/configure.ac b/configure.ac
index b274a8f..ee3f7af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.7)
 AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
 
 # Checks for library functions.
-AC_CHECK_FUNCS([poll])
+AC_CHECK_FUNCS([poll readlink])
 
 # If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
 # must first be located explicitly.
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 8029b28..7e7e477 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -27,6 +27,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
+#ifdef HAVE_READLINK
 #include <X11/fonts/fntfilst.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -474,3 +476,5 @@ CatalogueRegisterLocalFpeFunctions (void)
 			 CatalogueListNextFontOrAlias,
 			 FontFileEmptyBitmapSource);
 }
+
+#endif /* HAVE_READLINK */
diff --git a/src/fontfile/register.c b/src/fontfile/register.c
index 8d7229e..4faeb8f 100644
--- a/src/fontfile/register.c
+++ b/src/fontfile/register.c
@@ -57,6 +57,8 @@ FontFileRegisterFpeFunctions(void)
 #endif
 
     FontFileRegisterLocalFpeFunctions ();
+#ifdef HAVE_READLINK
     CatalogueRegisterLocalFpeFunctions ();
+#endif
 }
 

commit 3c534f72d6d4327926474a5f8fa53cbcf19de3cf
Author: Arvind Umrao <arvind.umrao@oracle.com>
Date:   Thu Aug 23 16:15:04 2012 +0530

    If socket is interrupted with signal EINTR, re-attempt read.
    
    If socket is getting interrupted with signal EINTR, we should keep
    socket in progress state. I have borrowed following code from socket
    write _fs_flush():line274 . I have done exactly same at _fs_fill().
    Socket write will not close the connection and re attempt to read buffer.
    
    Signed-off-by: Arvind Umrao <arvind.umrao@oracle.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index 03a689f..4deab88 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -184,8 +184,11 @@ _fs_fill (FSFpePtr conn)
 		    continue;
 		}
 	    }
-	    _fs_connection_died (conn);
-	    return FSIO_ERROR;
+	    if (!ECHECK(EINTR))
+	    {
+	        _fs_connection_died (conn);
+	        return FSIO_ERROR;
+	    }
 	}
     }
     return FSIO_READY;
Reply to: