Hello community,
here is the log from the commit of package libXaw for openSUSE:Factory checked in at 2015-05-06 07:47:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libXaw (Old)
and /work/SRC/openSUSE:Factory/.libXaw.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXaw"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libXaw/libXaw.changes 2013-09-13 14:46:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libXaw.new/libXaw.changes 2015-05-06 07:47:43.000000000 +0200
@@ -1,0 +2,15 @@
+Mon May 4 14:11:30 UTC 2015 - sndirsch@suse.com
+
+- Update to version 1.0.13
+ * Fix build with gcc -Werror=format-security
+ * configure: Drop AM_MAINTAINER_MODE
+ * autogen.sh: Honor NOCONFIGURE=1
+ * Use autoconf HAVE_UNISTD_H instead of imake X_NOT_POSIX to find
+ * Just use C89 size_t instead of rolling our own Size_t
+ * Use SEEK_* names instead of raw numbers for fseek whence argument
+ * Makefile: use AM_V_GEN and AM_V_at to implement automake silent rules
+ * Makefile: use $(LN_S) for better code portability
+ * Include
+ * Fix abs() usage.
+
+-------------------------------------------------------------------
Old:
----
libXaw-1.0.12.tar.bz2
New:
----
libXaw-1.0.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libXaw.spec ++++++
--- /var/tmp/diff_new_pack.fgaj8X/_old 2015-05-06 07:47:44.000000000 +0200
+++ /var/tmp/diff_new_pack.fgaj8X/_new 2015-05-06 07:47:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libXaw
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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: libXaw
-Version: 1.0.12
+Version: 1.0.13
Release: 0
Summary: The X Athena Widget Set
License: MIT
@@ -27,6 +27,7 @@
#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXaw
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXaw/
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#git#BuildRequires: autoconf >= 2.60, automake, libtool
BuildRequires: pkgconfig
++++++ libXaw-1.0.12.tar.bz2 -> libXaw-1.0.13.tar.bz2 ++++++
++++ 3903 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/libXaw-1.0.12/ChangeLog new/libXaw-1.0.13/ChangeLog
--- old/libXaw-1.0.12/ChangeLog 2013-09-08 06:16:27.000000000 +0200
+++ new/libXaw-1.0.13/ChangeLog 2015-05-01 07:16:58.000000000 +0200
@@ -1,3 +1,122 @@
+commit 8c82c47a770274c50944f002b97369c4e30872d8
+Author: Alan Coopersmith
+Date: Thu Apr 30 22:06:03 2015 -0700
+
+ libXaw 1.0.13
+
+ Signed-off-by: Alan Coopersmith
+
+commit 882da69d577b8f206694691679cef2cc3ca69725
+Author: Jon TURNEY
+Date: Sun Sep 14 16:30:45 2014 +0100
+
+ Include
+
+ Required for prototype of usleep()
+
+ Signed-off-by: Jon TURNEY
+ Reviewed-by: Alan Coopersmith
+
+commit 1955d3917b8d24d7a8621ad80b160e4cefde6fc9
+Author: Alan Coopersmith
+Date: Fri Nov 7 22:01:06 2014 -0800
+
+ Use SEEK_* names instead of raw numbers for fseek whence argument
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3b0de83ef4f2cdb0bfa52aba9092b56a1a1dc6ea
+Author: Alan Coopersmith
+Date: Wed Nov 5 18:01:17 2014 -0800
+
+ Just use C89 size_t instead of rolling our own Size_t
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Hans de Goede
+
+commit ebaa906159a73eeb001506a7787f5128f17af61a
+Author: Alan Coopersmith
+Date: Wed Nov 5 17:58:48 2014 -0800
+
+ Use autoconf HAVE_UNISTD_H instead of imake X_NOT_POSIX to find
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Hans de Goede
+
+commit 1804def12f26b9f64453fb9d641034f8de92ff7d
+Author: Thomas Klausner
+Date: Tue Mar 18 22:51:45 2014 +0100
+
+ Fix abs() usage.
+
+ For long arguments, use labs().
+ From Jörg Sonnenberger
+
+ Reviewed-by: Matt Turner
+ Signed-off-by: Thomas Klausner
+
+commit 1a1bf8404229b5636892d4be2fe9122304603c25
+Author: Alan Coopersmith
+Date: Sat May 31 21:39:32 2014 -0700
+
+ autogen.sh: Honor NOCONFIGURE=1
+
+ See http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Alan Coopersmith
+
+commit ad1bb9a727c067a586882a478e36bbce532b0fb0
+Author: Alan Coopersmith
+Date: Sat May 31 21:38:41 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6234ea0ba30861547e5cf1f7d4259e39f36618d3
+Author: Gaetan Nadon
+Date: Sat Dec 14 13:23:29 2013 -0500
+
+ Makefile: use $(LN_S) for better code portability
+
+ Autoconf recommends using LN_S to safeguard against actual or future
+ portability issues.
+
+ Autoconf:
+ "Symbolic links are not available on old systems; use ‘$(LN_S)’
+ as a portable substitute".
+
+ AC_PROG_LN_S is brought in by AC_PROG_LIBTOOL
+
+ Reviewed-by: Alan Coopersmith
+ Signed-off-by: Gaetan Nadon
+
+commit ec7d7c303385a6bdb0833a5aaae96be697cca7ab
+Author: Adam Jackson
+Date: Thu Nov 21 11:43:55 2013 -0500
+
+ Fix build with gcc -Werror=format-security
+
+ DisplayList.c:290:4: error: format not a string literal and no format
+ arguments [-Werror=format-security]
+
+ Signed-off-by: Adam Jackson
+
+commit 0543fa37ebdc48c0432425de80abc63235182085
+Author: Gaetan Nadon
+Date: Sun Sep 22 16:06:00 2013 -0400
+
+ Makefile: use AM_V_GEN and AM_V_at to implement automake silent rules
+
+ Passing --enable-silent-rules to configure will cause build rules to be less
+ verbose; the option --disable-silent-rules will cause normal verbose output.
+
+ At make run time, the default chosen at configure time may be overridden:
+ make V=1 will produce verbose output, make V=0 less verbose output.
+
+ Reviewed-by: Alan Coopersmith
+ Signed-off-by: Gaetan Nadon
+
commit a2d573ad309b4e717c5aef4635daa51e60a46db7
Author: Alan Coopersmith
Date: Sat Sep 7 20:57:47 2013 -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/libXaw-1.0.12/INSTALL new/libXaw-1.0.13/INSTALL
--- old/libXaw-1.0.12/INSTALL 2013-09-08 06:16:27.000000000 +0200
+++ new/libXaw-1.0.13/INSTALL 2015-05-01 07:16:58.000000000 +0200
@@ -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 `' 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/libXaw-1.0.12/autogen.sh new/libXaw-1.0.13/autogen.sh
--- old/libXaw-1.0.12/autogen.sh 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/autogen.sh 2015-05-01 07:06:05.000000000 +0200
@@ -9,4 +9,6 @@
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
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/libXaw-1.0.12/compile new/libXaw-1.0.13/compile
--- old/libXaw-1.0.12/compile 2013-09-08 05:58:04.000000000 +0200
+++ new/libXaw-1.0.13/compile 2015-05-01 07:06:17.000000000 +0200
@@ -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 .
#
# 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/libXaw-1.0.12/configure.ac new/libXaw-1.0.13/configure.ac
--- old/libXaw-1.0.12/configure.ac 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/configure.ac 2015-05-01 07:06:05.000000000 +0200
@@ -1,14 +1,13 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.12],
+AC_INIT([libXaw], [1.0.13],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
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/libXaw-1.0.12/missing new/libXaw-1.0.13/missing
--- old/libXaw-1.0.12/missing 2013-09-08 05:58:04.000000000 +0200
+++ new/libXaw-1.0.13/missing 2015-05-01 07:06:17.000000000 +0200
@@ -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 , 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/libXaw-1.0.12/src/AsciiSrc.c new/libXaw-1.0.13/src/AsciiSrc.c
--- old/libXaw-1.0.12/src/AsciiSrc.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/AsciiSrc.c 2015-05-01 07:06:05.000000000 +0200
@@ -59,14 +59,6 @@
#include /* for Widget Classes */
#endif
-#ifdef X_NOT_POSIX
-#define Off_t long
-#define Size_t unsigned int
-#else
-#define Off_t off_t
-#define Size_t size_t
-#endif
-
#define MAGIC_VALUE ((XawTextPosition)-1)
#define streq(a, b) (strcmp((a), (b)) == 0)
@@ -1522,11 +1514,11 @@
int len;
left = 0;
- fseek(file, 0, 0);
+ fseek(file, 0, SEEK_SET);
while (left < src->ascii_src.length) {
ptr = XtMalloc((unsigned)src->ascii_src.piece_size);
- if ((len = fread(ptr, (Size_t)sizeof(unsigned char),
- (Size_t)src->ascii_src.piece_size, file)) < 0)
+ if ((len = fread(ptr, sizeof(unsigned char),
+ (size_t)src->ascii_src.piece_size, file)) < 0)
XtErrorMsg("readError", "asciiSourceCreate", "XawError",
"fread returned error.", NULL, NULL);
piece = AllocNewPiece(src, piece);
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/libXaw-1.0.12/src/DisplayList.c new/libXaw-1.0.13/src/DisplayList.c
--- old/libXaw-1.0.12/src/DisplayList.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/DisplayList.c 2015-05-01 07:06:05.000000000 +0200
@@ -287,7 +287,7 @@
}
if (fp)
{
- snprintf(cname, fp - fname + 1, fname);
+ snprintf(cname, fp - fname + 1, "%s", fname);
memmove(fname, fp + 1, strlen(fp));
lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
if (!lc)
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/libXaw-1.0.12/src/Makefile.am new/libXaw-1.0.13/src/Makefile.am
--- old/libXaw-1.0.12/src/Makefile.am 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/Makefile.am 2015-05-01 07:06:05.000000000 +0200
@@ -83,18 +83,18 @@
if !PLATFORM_WIN32
install-exec-hook::
if PLATFORM_DARWIN
- -rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
- (cd $(DESTDIR)$(libdir) && ln -s libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@)
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
+ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@)
else
- -rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
- (cd $(DESTDIR)$(libdir) && ln -s libXaw6.@LIBEXT@.6 libXaw.@LIBEXT@.6)
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
+ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.@LIBEXT@.6 libXaw.@LIBEXT@.6)
endif
uninstall-local::
if PLATFORM_DARWIN
- -rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
else
- -rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
endif
endif
@@ -122,18 +122,18 @@
if !PLATFORM_WIN32
install-exec-hook::
if PLATFORM_DARWIN
- -rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
- (cd $(DESTDIR)$(libdir) && ln -s libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@)
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
+ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@)
else
- -rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7
- (cd $(DESTDIR)$(libdir) && ln -s libXaw7.@LIBEXT@.7 libXaw.@LIBEXT@.7)
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7
+ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw7.@LIBEXT@.7 libXaw.@LIBEXT@.7)
endif
uninstall-local::
if PLATFORM_DARWIN
- -rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
else
- -rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7
+ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7
endif
endif
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/libXaw-1.0.12/src/MultiSrc.c new/libXaw-1.0.13/src/MultiSrc.c
--- old/libXaw-1.0.12/src/MultiSrc.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/MultiSrc.c 2015-05-01 07:06:05.000000000 +0200
@@ -78,14 +78,6 @@
#define MAGIC_VALUE ((XawTextPosition)-1)
#define streq(a, b) (strcmp((a), (b)) == 0)
-#ifdef X_NOT_POSIX
-#define Off_t long
-#define Size_t unsigned int
-#else
-#define Off_t off_t
-#define Size_t size_t
-#endif
-
/*
* Class Methods
@@ -1329,10 +1321,10 @@
if (src->multi_src.length != 0) {
temp_mb_holder =
XtMalloc((src->multi_src.length + 1) * sizeof(unsigned char));
- fseek(file, 0, 0);
+ fseek(file, 0, SEEK_SET);
src->multi_src.length = fread(temp_mb_holder,
- (Size_t)sizeof(unsigned char),
- (Size_t)src->multi_src.length, file);
+ sizeof(unsigned char),
+ (size_t)src->multi_src.length, file);
if (src->multi_src.length <= 0)
XtAppErrorMsg(XtWidgetToApplicationContext ((Widget) src),
"readError", "multiSource", "XawError",
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/libXaw-1.0.12/src/OS.c new/libXaw-1.0.13/src/OS.c
--- old/libXaw-1.0.12/src/OS.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/OS.c 2015-05-01 07:06:05.000000000 +0200
@@ -7,7 +7,7 @@
#include
#include "Private.h"
-#ifndef X_NOT_POSIX
+#ifdef HAVE_UNISTD_H
#include /* for sysconf(), and getpagesize() */
#endif
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/libXaw-1.0.12/src/Text.c new/libXaw-1.0.13/src/Text.c
--- old/libXaw-1.0.12/src/Text.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/Text.c 2015-05-01 07:06:05.000000000 +0200
@@ -2837,7 +2837,7 @@
if (motion)
newType = ctx->text.s.type;
else {
- if ((abs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME)
+ if ((labs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME)
&& (pos >= ctx->text.s.left && pos <= ctx->text.s.right)) {
sarray = ctx->text.sarray;
for (; *sarray != XawselectNull && *sarray != ctx->text.s.type;
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/libXaw-1.0.12/src/TextAction.c new/libXaw-1.0.13/src/TextAction.c
--- old/libXaw-1.0.12/src/TextAction.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/TextAction.c 2015-05-01 07:06:05.000000000 +0200
@@ -29,6 +29,7 @@
#endif
#include
#include
+#include
#include /* for select() and struct timeval */
#include
#include
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/libXaw-1.0.12/src/TextPop.c new/libXaw-1.0.13/src/TextPop.c
--- old/libXaw-1.0.12/src/TextPop.c 2013-09-08 05:57:54.000000000 +0200
+++ new/libXaw-1.0.13/src/TextPop.c 2015-05-01 07:06:05.000000000 +0200
@@ -310,14 +310,14 @@
pos = XawTextGetInsertionPoint(tw);
- fseek(file, 0L, 2);
+ fseek(file, 0L, SEEK_END);
text.firstPos = 0;
text.length = ftell(file);
text.ptr = XtMalloc(text.length + 1);
text.format = XawFmt8Bit;
- fseek(file, 0L, 0);
+ fseek(file, 0L, SEEK_SET);
if (fread(text.ptr, 1, text.length, file) != text.length)
XtErrorMsg("readError", "insertFileNamed", "XawError",
"fread returned error", NULL, NULL);