Hello community, here is the log from the commit of package xorg-x11-fonts-devel for openSUSE:Factory checked in at 2012-05-08 12:06:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-fonts-devel (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-fonts-devel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-fonts-devel", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-fonts-devel/xorg-x11-fonts-devel.changes 2011-09-23 12:52:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-fonts-devel.new/xorg-x11-fonts-devel.changes 2012-05-08 12:06:32.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 11 18:15:47 UTC 2012 - [email protected] + +- Update to font-util 1.3.0: + + bdftruncate: Properly support -w and +w + + Fix compiler warnings + + Better support for cross-compiling +- Include version of font-util in the version of the package. For + instance, this will now be 7.6_1.3.0. + +------------------------------------------------------------------- Old: ---- font-util-1.2.0.tar.bz2 New: ---- font-util-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts-devel.spec ++++++ --- /var/tmp/diff_new_pack.Y6Xqpq/_old 2012-05-08 12:06:33.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6Xqpq/_new 2012-05-08 12:06:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-fonts-devel (Version 7.6) +# spec file for package xorg-x11-fonts-devel # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xorg-x11-fonts-devel -%define dirsuffix 1.2.0 -BuildRequires: pkgconfig xorg-x11-proto-devel +%define dirsuffix 1.3.0 +BuildRequires: pkgconfig +BuildRequires: xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ -Version: 7.6 -Release: 1 -License: MIT +Version: 7.6_%{dirsuffix} +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: System/X11/Fonts Requires: xorg-x11-proto-devel Summary: Include Files and Libraries mandatory for Development. +License: MIT +Group: System/X11/Fonts Source: font-util-%{dirsuffix}.tar.bz2 Source1: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT ++++++ font-util-1.2.0.tar.bz2 -> font-util-1.3.0.tar.bz2 ++++++ ++++ 8152 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.2.0/ChangeLog new/font-util-1.3.0/ChangeLog --- old/font-util-1.2.0/ChangeLog 2010-10-14 00:59:05.000000000 +0200 +++ new/font-util-1.3.0/ChangeLog 2012-02-29 07:16:35.000000000 +0100 @@ -1,3 +1,126 @@ +commit dff77bb76ab2260877a37193df1d728d2f4a1d88 +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 28 22:14:18 2012 -0800 + + font-util 1.3.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit faee5567a53bcde7c9e280c330e1ff6671b979b1 +Author: Alan Coopersmith <[email protected]> +Date: Wed Feb 22 20:43:34 2012 -0800 + + configure.ac updates to match other X.Org modules + + layout and comment the top portion of configure.ac + add missing AC_CONFIG_SRCDIR + Replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS + replace deprecated AC_HELP_STRING with AS_HELP_STRING + Remove unnecessary AC_PROG_CC & AC_PROG_INSTALL (already + provided by XORG_DEFAULT_OPTIONS) + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Gaetan Nadon<[email protected]> + +commit 9e9519975fe3a5827b362b8df4a5c69745125a5a +Author: Alan Coopersmith <[email protected]> +Date: Fri Nov 18 23:09:43 2011 -0800 + + Fix "cast discards qualifiers from pointer target type" warnings + + ucs2any.c: In function ‘chars_compare’: + ucs2any.c:450:2: warning: cast discards qualifiers from pointer target type + ucs2any.c:451:2: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e46b483c58ec3cfc01d2800c069eadc90166eb04 +Author: Alan Coopersmith <[email protected]> +Date: Fri Nov 18 23:06:46 2011 -0800 + + Mark usage() as not returning to clear incorrect uninit var warning + + bdftruncate.c: In function ‘main’: + bdftruncate.c:119:16: warning: ‘threshold’ may be used uninitialized in this function + + (It's not actually, if you consider that usage() exits when + parse_threshold fails.) + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3419c66ac700689351be9fe2bc3f81b80465cd3e +Author: Alan Coopersmith <[email protected]> +Date: Mon Sep 26 14:50:29 2011 -0700 + + Add const attributes to fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 80cde5d8bb59a50ba1e98b5947f2fe0c8f38ef84 +Author: Jon TURNEY <[email protected]> +Date: Tue Apr 26 15:03:42 2011 +0100 + + If cross-compiling, we don't have to run mkfontdir + + If cross-compiling, we can run the host mkfontdir on the font directory, + since the output is arch independent (I think) + + If cross-compiling and we can't find mkfontdir, just warn that mkfontdir + needs to be run on the target. + + When not cross-compiling, the behaviour remains unchanged: mkfontdir + must be found and is run + + (Also, bump version number to 1.2.90 as the next release must be 1.3.0 + as this change adds a macro) + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Jeremy Huddleston <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 901fa14455a09901ebc69d0c93c03bb3c7c712d4 +Author: Jon TURNEY <[email protected]> +Date: Tue Apr 26 15:00:30 2011 +0100 + + Never run fc-cache if cross-compiling + + Since the cache files produced by fc-cache are arch-dependent, there is + no point in running fc-cache if cross-compiling + + So, even if we aren't using a DESTDIR, but are installing directly into + (a hopefully non-default) prefix, don't run fc-cache when cross-compiling + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 9f807dfb4e7bea7128b7538e41de78bb5994ca80 +Author: Jeremy Huddleston <[email protected]> +Date: Wed May 4 11:07:39 2011 -0700 + + bdftruncate: Make sure opt_minus_w and opt_plus_w are initialized + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 06e9c86e3741355729748b6c646f7f738c583323 +Author: Jeremy Huddleston <[email protected]> +Date: Thu Apr 28 00:45:05 2011 -0700 + + ucs2any: Dead code removal + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit e15cbb4f48a9c5c0aae5acc88a7f56086fc9e51f +Author: Jeremy Huddleston <[email protected]> +Date: Thu Apr 28 00:39:17 2011 -0700 + + bdftruncate: Properly support -w and +w + + Regression introduced by fb486bb1a5038912d064291b12c7aef5da3d8b63 + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <[email protected]> + commit a0d43f88e563ca2fd376bbe222d4809b9976624b Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 6 17:00:03 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.2.0/bdftruncate.c new/font-util-1.3.0/bdftruncate.c --- old/font-util-1.2.0/bdftruncate.c 2009-10-16 23:25:09.000000000 +0200 +++ new/font-util-1.3.0/bdftruncate.c 2011-11-19 08:05:56.000000000 +0100 @@ -41,16 +41,19 @@ #include <stdlib.h> #include <string.h> -static int iswide(unsigned int); -static void usage(void); +#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define ATTR_NORETURN __attribute((noreturn)) +#else +# define ATTR_NORETURN +#endif /* GNUC */ -static int opt_minus_w; -static int opt_plus_w; -static int removewide; -static unsigned long threshold; +static int iswide(unsigned int); +static void usage(void) ATTR_NORETURN; +static int parse_threshold(const char *str, unsigned long *threshold); static int -parse_threshold(const char *str) +parse_threshold(const char *str, unsigned long *threshold) { int base; char *end_ptr; @@ -63,14 +66,14 @@ base = 10; errno = 0; - threshold = strtoul(str, &end_ptr, base); - if (errno != 0 || threshold == 0) + *threshold = strtoul(str, &end_ptr, base); + if (errno != 0 || *threshold == 0) return 1; return 0; } static void -process_line(const char *line) +process_line(const char *line, int removewide, unsigned long threshold) { if (strncmp(line, "ENCODING", 8) == 0) { unsigned long enc; @@ -120,6 +123,9 @@ main(int argc, char **argv) { int removewide; + unsigned long threshold; + int opt_minus_w = 0; + int opt_plus_w = 0; char *line, *input_ptr; size_t line_len, rest_len; @@ -139,7 +145,7 @@ if (argc != 1 || (opt_plus_w && opt_minus_w)) usage(); - if (parse_threshold(*argv)) { + if (parse_threshold(*argv, &threshold)) { fprintf(stderr, "Illegal threshold %s\n", *argv); usage(); } @@ -178,7 +184,7 @@ break; } } - process_line(line); + process_line(line, removewide, threshold); } return EXIT_SUCCESS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.2.0/configure.ac new/font-util-1.3.0/configure.ac --- old/font-util-1.2.0/configure.ac 2010-10-09 01:58:40.000000000 +0200 +++ new/font-util-1.3.0/configure.ac 2012-02-29 07:13:49.000000000 +0100 @@ -21,9 +21,14 @@ dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([font-util], [1.2.0], +AC_INIT([font-util], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [font-util]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -31,23 +36,18 @@ m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) -AM_CONFIG_HEADER(config.h) - XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL - AC_MSG_CHECKING([for root directory for font files]) fontrootdir='${datadir}/fonts/X11' -AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR], +AC_ARG_WITH(fontrootdir, [AS_HELP_STRING([--with-fontrootdir=DIR], [Path to parent of font subdirectories [DATADIR/fonts/X11]])], [fontrootdir="${withval}"]) AC_SUBST(fontrootdir) AC_MSG_RESULT([${fontrootdir}]) mapdir='${fontrootdir}/util' -AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR], +AC_ARG_WITH(mapdir, [AS_HELP_STRING([--with-mapdir=DIR], [Path to install font maps [FONTROOTDIR/util]])], [mapdir="${withval}"]) MAPDIR="$mapdir" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.2.0/fontutil.m4.in new/font-util-1.3.0/fontutil.m4.in --- old/font-util-1.2.0/fontutil.m4.in 2010-10-08 02:17:09.000000000 +0200 +++ new/font-util-1.3.0/fontutil.m4.in 2011-09-26 23:47:48.000000000 +0200 @@ -160,15 +160,16 @@ # # Set FCCACHE to path to fc-cache (fontconfig cache builder) if found # Set RUN_FCCACHE to a rule suitable for substituting into a makefile -# to run fc-cache if found and not installing to $DESTDIR +# to run fc-cache if found and not installing to $DESTDIR and not +# cross-compiling # # fc-cache is optional, not required, and should be skipped when making -# packages (installing to $DESTDIR). +# packages (installing to $DESTDIR) or cross-compiling # AC_DEFUN([XORG_FONT_FCCACHE],[ AC_PATH_PROG(FCCACHE, fc-cache) FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"' - if test x"$FCCACHE" = x ; then + if test x"$FCCACHE" = x || test x"$cross_compiling" != x"no" ; then RUN_FCCACHE="${FCCACHE_WARN}" else RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else' @@ -177,6 +178,31 @@ AC_SUBST([RUN_FCCACHE]) ]) +# XORG_FONT_MKFONTDIR() +# ------------------- +# Minimum version: 1.3.0 +# +# Set MKFONTDIR to path to mkfontdir. +# +# If cross-compiling, and if mkdir is not found, use a shell command +# which warns mkfontdir needs to be run on the target +# +# If not cross-compiling, mkfontdir must be found +# +AC_DEFUN([XORG_FONT_MKFONTDIR],[ + if test x"$cross_compiling" != x"no" ; then + AC_PATH_PROG(MKFONTDIR, mkfontdir, "") + MKFONTDIR_WARN='echo "** Warning: mkfontdir not run" ; echo "** Run mkfontdir manually on host system"' + + if test x"$MKFONTDIR" = x; then + MKFONTDIR="${MKFONTDIR_WARN} ; echo '** mkfontdir'" + fi + else + XORG_FONT_REQUIRED_PROG(MKFONTDIR, mkfontdir) + fi + + AC_SUBST([MKFONTDIR]) +]) # XORG_FONT_COMMON_UTILS() # ------------------------ @@ -186,7 +212,7 @@ AC_DEFUN([XORG_FONT_COMMON_UTILS],[ XORG_FONT_FCCACHE - XORG_FONT_REQUIRED_PROG(MKFONTDIR, mkfontdir) + XORG_FONT_MKFONTDIR ]) # XORG_FONT_SCALED_UTILS() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.2.0/ucs2any.c new/font-util-1.3.0/ucs2any.c --- old/font-util-1.2.0/ucs2any.c 2010-10-07 06:08:31.000000000 +0200 +++ new/font-util-1.3.0/ucs2any.c 2011-11-19 08:09:21.000000000 +0100 @@ -173,7 +173,7 @@ } da_t; static da_t * -da_new(char *name) +da_new(const char *name) { da_t *da; @@ -246,7 +246,7 @@ } static void -da_add_str(da_t *da, int key, char *value) +da_add_str(da_t *da, int key, const char *value) { da_add(da, key, value?zstrdup(value):NULL); } @@ -447,8 +447,8 @@ static int chars_compare(const void *aa, const void *bb) { - int a = *(int *)aa; - int b = *(int *)bb; + int a = *(const int *)aa; + int b = *(const int *)bb; return a - b; } @@ -737,7 +737,6 @@ if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { ucs = strtol(p+2, &endp, 16); if (*endp == '\0') goto bad; - p = endp; } else goto bad; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
