Hello community, here is the log from the commit of package xfd for openSUSE:Factory checked in at 2019-03-11 11:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfd (Old) and /work/SRC/openSUSE:Factory/.xfd.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfd" Mon Mar 11 11:15:56 2019 rev:9 rq:683548 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xfd/xfd.changes 2014-02-15 08:07:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfd.new.28833/xfd.changes 2019-03-11 11:16:03.225325523 +0100 @@ -1,0 +2,14 @@ +Sun Mar 10 11:43:51 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 1.1.3 + * autogen: add default patch prefix + * autogen.sh: use quoted string variables + * autogen.sh: use exec instead of waiting for configure to finish + * autogen.sh: Honor NOCONFIGURE=1 + * configure: Drop AM_MAINTAINER_MODE + * Move domaindir declaration inside #ifdef USE_GETTEXT + * Re-enable code to use XKB Bells + * Update configure.ac bug URL for gitlab migration + * Update README for gitlab migration + +------------------------------------------------------------------- Old: ---- xfd-1.1.2.tar.bz2 New: ---- xfd-1.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfd.spec ++++++ --- /var/tmp/diff_new_pack.Y0lsQb/_old 2019-03-11 11:16:03.609325385 +0100 +++ /var/tmp/diff_new_pack.Y0lsQb/_new 2019-03-11 11:16:03.609325385 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfd # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xfd -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: Utility to display all the characters in an X font License: X11 @@ -28,6 +28,7 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.17 @@ -54,7 +55,7 @@ %files %defattr(-,root,root) -%doc ChangeLog COPYING README +%doc ChangeLog COPYING README.md %{_bindir}/xfd %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/Xfd ++++++ xfd-1.1.2.tar.bz2 -> xfd-1.1.3.tar.bz2 ++++++ ++++ 8793 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/xfd-1.1.2/ChangeLog new/xfd-1.1.3/ChangeLog --- old/xfd-1.1.2/ChangeLog 2013-07-17 08:02:31.000000000 +0200 +++ new/xfd-1.1.3/ChangeLog 2019-03-10 03:58:36.000000000 +0100 @@ -1,3 +1,97 @@ +commit 9cf6578a0c35b14af13dc104ab3f4ccf64e673ae +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 9 18:56:26 2019 -0800 + + xfd 1.1.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6a4309a40f48321c69952bfbee4c73cf2d8405dd +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 3 11:36:00 2019 -0800 + + Re-enable code to use XKB Bells + + Enabled by default, use --without-xkb to disable. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 63d2de15dbac3db071beafaad7bbc7ccf0ff79cd +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 21 17:03:17 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8ac9bff6605b22a7675c0afacdb6965445b9a914 +Author: Alan Coopersmith <[email protected]> +Date: Fri Nov 16 21:58:19 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8bf70e4d5c06402fef018f5a257474da2e6c43f3 +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 14:00:21 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit 98e01ab922b4f39270af939fe8632f1414328ed8 +Author: Emil Velikov <[email protected]> +Date: Mon Mar 9 12:00:52 2015 +0000 + + 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 <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 701d598d089c6cdbe38f8396468f4d32bb6340f6 +Author: Peter Hutterer <[email protected]> +Date: Tue Jan 24 10:32:07 2017 +1000 + + 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 <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + +commit 19846b6b94cae254dc9c958e0896f056ae707b0b +Author: Alan Coopersmith <[email protected]> +Date: Mon Jun 2 22:31:09 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 61a1cb30d18ebfe0687616811e5ac714f572754f +Author: Alan Coopersmith <[email protected]> +Date: Mon Jun 2 22:31:09 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 816ae0e04d0d189adb2da13007b6f6e3d53ae03c +Author: Alan Coopersmith <[email protected]> +Date: Tue Dec 10 22:38:34 2013 -0800 + + Move domaindir declaration inside #ifdef USE_GETTEXT + + Avoid unused variable warnings if USE_GETTEXT is undefined + + Signed-off-by: Alan Coopersmith <[email protected]> + commit ef0068345c2b82347e7b5ed319266c11c38f690e Author: Alan Coopersmith <[email protected]> Date: Tue Jul 16 23:02:08 2013 -0700 @@ -268,7 +362,7 @@ - Use AM_CFLAGS so AM_PROG_CC_C_O isn't needed - Combine pkg-config calls now that we don't need special handling for Xaw - Add dependencies on libXmu & libXrender since xfd calls functions in - those directly + those directly Signed-off-by: Alan Coopersmith <[email protected]> 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/xfd-1.1.2/INSTALL new/xfd-1.1.3/INSTALL --- old/xfd-1.1.2/INSTALL 2013-07-17 08:02:31.000000000 +0200 +++ new/xfd-1.1.3/INSTALL 2019-03-10 03:58:36.000000000 +0100 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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/xfd-1.1.2/Makefile.am new/xfd-1.1.3/Makefile.am --- old/xfd-1.1.2/Makefile.am 2013-07-17 08:02:12.000000000 +0200 +++ new/xfd-1.1.3/Makefile.am 2019-03-10 03:58:23.000000000 +0100 @@ -60,3 +60,5 @@ CLEANFILES = xfd.po endif + +EXTRA_DIST = README.md 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/xfd-1.1.2/README new/xfd-1.1.3/README --- old/xfd-1.1.2/README 2013-07-17 08:02:12.000000000 +0200 +++ new/xfd-1.1.3/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -xfd - display all the characters in a font using either the -X11 core protocol or libXft2. - -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 - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/app/xfd - - http://cgit.freedesktop.org/xorg/app/xfd - -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 - 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/xfd-1.1.2/README.md new/xfd-1.1.3/README.md --- old/xfd-1.1.2/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/xfd-1.1.3/README.md 2019-03-10 03:58:23.000000000 +0100 @@ -0,0 +1,18 @@ +xfd - display all the characters in a font using either the +X11 core protocol or libXft2. + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/app/xfd + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + 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/xfd-1.1.2/compile new/xfd-1.1.3/compile --- old/xfd-1.1.2/compile 2013-07-17 08:02:17.000000000 +0200 +++ new/xfd-1.1.3/compile 2019-03-10 03:58:27.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify 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/xfd-1.1.2/config.h.in new/xfd-1.1.3/config.h.in --- old/xfd-1.1.2/config.h.in 2013-07-17 08:02:17.000000000 +0200 +++ new/xfd-1.1.3/config.h.in 2019-03-10 03:58:27.000000000 +0100 @@ -65,3 +65,6 @@ /* Version number of package */ #undef VERSION + +/* Define to use XkbStdBell */ +#undef XKB 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/xfd-1.1.2/configure.ac new/xfd-1.1.3/configure.ac --- old/xfd-1.1.2/configure.ac 2013-07-17 08:02:12.000000000 +0200 +++ new/xfd-1.1.3/configure.ac 2019-03-10 03:58:23.000000000 +0100 @@ -23,14 +23,13 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xfd],[1.1.2], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xfd]) +AC_INIT([xfd],[1.1.3], + [https://gitlab.freedesktop.org/xorg/app/xfd/issues], [xfd]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -58,8 +57,18 @@ fi AM_CONDITIONAL(USE_GETTEXT, test "x$USE_GETTEXT" = "xyes") +# Optional dependencies +AC_ARG_WITH(xkb, + AS_HELP_STRING([--without-xkb], + [Disable use of XKB to sound bells (Default is with-xkb)]), + use_xkb="$withval", use_xkb="yes") +if test x$use_xkb != xno ; then + XKBMODULE="xkbfile" + AC_DEFINE([XKB],1,[Define to use XkbStdBell]) +fi + # Checks for pkg-config packages -PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17]) +PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}]) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` 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/xfd-1.1.2/grid.c new/xfd-1.1.3/grid.c --- old/xfd-1.1.2/grid.c 2013-07-17 08:02:12.000000000 +0200 +++ new/xfd-1.1.3/grid.c 2019-03-10 03:58:23.000000000 +0100 @@ -25,6 +25,10 @@ * Author: Jim Fulton, MIT X Consortium */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xaw/SimpleP.h> 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/xfd-1.1.2/missing new/xfd-1.1.3/missing --- old/xfd-1.1.2/missing 2013-07-17 08:02:17.000000000 +0200 +++ new/xfd-1.1.3/missing 2019-03-10 03:58:27.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) 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/xfd-1.1.2/xfd.c new/xfd-1.1.3/xfd.c --- old/xfd-1.1.2/xfd.c 2013-07-17 08:02:12.000000000 +0200 +++ new/xfd-1.1.3/xfd.c 2019-03-10 03:58:23.000000000 +0100 @@ -183,7 +183,6 @@ XftFont *xft; #endif char *fontname; - const char *domaindir; long minn, maxn; XtSetLanguageProc(NULL, NULL, NULL); @@ -195,13 +194,17 @@ &argc, argv, NULL, NULL, 0); #ifdef USE_GETTEXT - textdomain("xfd"); + { + const char *domaindir; - /* mainly for debugging */ - if ((domaindir = getenv ("TEXTDOMAINDIR")) == NULL) { - domaindir = LOCALEDIR; + textdomain("xfd"); + + /* mainly for debugging */ + if ((domaindir = getenv ("TEXTDOMAINDIR")) == NULL) { + domaindir = LOCALEDIR; + } + bindtextdomain ("xfd", domaindir); } - bindtextdomain ("xfd", domaindir); #endif Resources[0].default_addr = gettext(DEF_SELECT_FORMAT);
