Hello community, here is the log from the commit of package libXmu for openSUSE:Factory checked in at 2019-03-26 22:29:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXmu (Old) and /work/SRC/openSUSE:Factory/.libXmu.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXmu" Tue Mar 26 22:29:14 2019 rev:10 rq:687390 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libXmu/libXmu.changes 2013-09-13 14:47:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXmu.new.25356/libXmu.changes 2019-03-26 22:29:15.657751562 +0100 @@ -1,0 +2,7 @@ +Thu Mar 21 15:25:51 UTC 2019 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 1.1.3 + * This minor maintenance release includes some small bug fixes, + build configuration improvements and janitorial cleanups. + +------------------------------------------------------------------- Old: ---- libXmu-1.1.2.tar.bz2 New: ---- libXmu-1.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXmu.spec ++++++ --- /var/tmp/diff_new_pack.bWcy7F/_old 2019-03-26 22:29:16.253751418 +0100 +++ /var/tmp/diff_new_pack.bWcy7F/_new 2019-03-26 22:29:16.265751415 +0100 @@ -1,7 +1,7 @@ # # spec file for package libXmu # -# Copyright (c) 2013 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: libXmu -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: Miscellaneous utility routines for X License: MIT @@ -27,6 +27,7 @@ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXmu #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXmu/ 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 @@ -44,8 +45,8 @@ %package -n libXmu6 Summary: Miscellaneous utility routines for X -Group: System/Libraries # O/P added for 12.2 +Group: System/Libraries Provides: xorg-x11-libXmu = 7.6_%version-%release Obsoletes: xorg-x11-libXmu < 7.6_%version-%release Requires: xbitmaps ++++++ libXmu-1.1.2.tar.bz2 -> libXmu-1.1.3.tar.bz2 ++++++ ++++ 28825 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/libXmu-1.1.2/ChangeLog new/libXmu-1.1.3/ChangeLog --- old/libXmu-1.1.2/ChangeLog 2013-09-08 06:29:06.000000000 +0200 +++ new/libXmu-1.1.3/ChangeLog 2019-03-16 19:42:49.000000000 +0100 @@ -1,3 +1,132 @@ +commit e9efe2d027b4c46cf6834cc532222f8ad1d1d3c3 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Mar 16 11:40:41 2019 -0700 + + libXmu 1.1.3 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 9469d3593c9fb1b60cac0602d97f274e209163d7 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Dec 7 19:46:09 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 3e706ded2e46464732170ae06bdc9e9d286179ed +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Nov 19 22:26:50 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 5bd4eb821bd9e88c3a131de9a8b781f5184e22b1 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat May 5 11:32:12 2018 -0700 + + Apply standard X.Org formatting & bracketing to StrToWidg.c + + Makes code easier for humans to read and gets rid of gcc warning: + + StrToWidg.c: In function ‘XmuCvtStringToWidget’: + StrToWidg.c:107:3: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation] + for (widgetP = parent->core.popup_list; i; i--, widgetP++) + ^~~ + StrToWidg.c:114:5: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘for’ + XtStringConversionWarning(fromVal->addr, XtRWidget); + ^~~~~~~~~~~~~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit bc78541e9a9a95bbd5413d62bfc114ddc9265c36 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat May 5 11:26:17 2018 -0700 + + Convert tabs to spaces in StrToWidg.c + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 4f0939d69a17d37be414d0de7ff717e92e7e2b11 +Author: Mihail Konev <k....@ya.ru> +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <k....@ya.ru> + +commit 99265d50e4c100182f1375b59c5ecf3e5732356d +Author: Emil Velikov <emil.l.veli...@gmail.com> +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 <emil.l.veli...@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 6a79027955dc7f10569ac6e904844624224d5c60 +Author: Peter Hutterer <peter.hutte...@who-t.net> +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 <peter.hutte...@who-t.net> + Reviewed-by: Emil Velikov <emil.veli...@collabora.com> + +commit 4459e6940fe3fdf26a8d5d4c71989498bc400a62 +Author: Jon TURNEY <jon.tur...@dronecode.org.uk> +Date: Sat Sep 13 21:57:39 2014 +0100 + + Include <direct.h> for _getdrives() on Win32 + + Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + Reviewed-by: David Macek <david.mace...@gmail.com> + +commit 24bcdbd17913a1ca39c975113767aa2c556b69cc +Author: Jon TURNEY <jon.tur...@dronecode.org.uk> +Date: Sat Sep 13 21:57:17 2014 +0100 + + Remove pointless X_NOT_POSIX + + Both stdlib.h (only included for prototype of atoi()), and limits.h (only + included for PATH_MAX) are in C89, so putting this under X_NOT_POSIX seems a + little excessive. + + Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 22d9c590901e121936f50dee97dc60c4f7defb63 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 2 13:00:05 2013 -0800 + + ShapeEllipseOrRoundedRectangle: Check height AND width, not width twice + + Fixed to match check in ShapeOval() + https://bugs.freedesktop.org/show_bug.cgi?id=72245 + + Fixes cppcheck warning: + [ShapeWidg.c:204]: (style) Same expression on both sides of '||'. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit e02c30fac32e4873240e507cadc416f710188feb +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Nov 17 09:41:14 2013 -0800 + + Remove SUNSHLIB support for SunOS 4.x shared libraries + + Never enabled in modular builds, was only enabled for SunOS 4.x in imake. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Mark Kettenis <kette...@openbsd.org> + commit 2539e539eafdac88177c8ee30b043c5d52f017e4 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Sat Sep 7 21:28:14 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/libXmu-1.1.2/INSTALL new/libXmu-1.1.3/INSTALL --- old/libXmu-1.1.2/INSTALL 2013-09-08 06:29:06.000000000 +0200 +++ new/libXmu-1.1.3/INSTALL 2019-03-16 19:42:49.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/libXmu-1.1.2/Makefile.am new/libXmu-1.1.3/Makefile.am --- old/libXmu-1.1.2/Makefile.am 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/Makefile.am 2019-03-16 19:42:32.000000000 +0100 @@ -20,3 +20,5 @@ lint: (cd src && $(MAKE) $(MFLAGS) lint) endif LINT + +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/libXmu-1.1.2/README new/libXmu-1.1.3/README --- old/libXmu-1.1.2/README 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -This library contains miscellaneous utilities and is not part of the Xlib -standard. It contains routines which only use public interfaces so that it -may be layered on top of any proprietary implementation of Xlib or Xt. - -It is intended to support clients in the X.Org distribution; vendors -may choose not to distribute this library if they wish. Therefore, -applications developers who depend on this library should be prepared to -treat it as part of their software base when porting. - -API documentation for this library is provided in the docs directory in -DocBook format. If xmlto is installed, it will be converted to supported -formats and installed in $(docdir) unless --disable-docs is passed to -configure. - -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/lib/libXmu - - http://cgit.freedesktop.org/xorg/lib/libXmu - -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/libXmu-1.1.2/README.md new/libXmu-1.1.3/README.md --- old/libXmu-1.1.2/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/libXmu-1.1.3/README.md 2019-03-16 19:42:32.000000000 +0100 @@ -0,0 +1,32 @@ +libXmu - X miscellaneous utility routines library +------------------------------------------------- + +This library contains miscellaneous utilities and is not part of the Xlib +standard. It contains routines which only use public interfaces so that it +may be layered on top of any proprietary implementation of Xlib or Xt. + +It is intended to support clients in the X.Org distribution; vendors +may choose not to distribute this library if they wish. Therefore, +applications developers who depend on this library should be prepared to +treat it as part of their software base when porting. + +API documentation for this library is provided in the docs directory in +DocBook format. If xmlto is installed, it will be converted to supported +formats and installed in $(docdir) unless --disable-docs is passed to +configure. + +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/lib/libXmu + +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/libXmu-1.1.2/compile new/libXmu-1.1.3/compile --- old/libXmu-1.1.2/compile 2013-09-08 06:28:27.000000000 +0200 +++ new/libXmu-1.1.3/compile 2019-03-16 19:42:40.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 <tro...@cygnus.com>. # # 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/libXmu-1.1.2/config.h.in new/libXmu-1.1.3/config.h.in --- old/libXmu-1.1.2/config.h.in 2013-09-08 06:28:26.000000000 +0200 +++ new/libXmu-1.1.3/config.h.in 2019-03-16 19:42:39.000000000 +0100 @@ -45,8 +45,7 @@ /* Support os-specific local connections */ #undef LOCALCONN -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ @@ -79,9 +78,6 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -93,3 +89,6 @@ /* Version number of package */ #undef VERSION + +/* Defined if needed to expose struct msghdr.msg_control */ +#undef _XOPEN_SOURCE 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/libXmu-1.1.2/configure.ac new/libXmu-1.1.3/configure.ac --- old/libXmu-1.1.2/configure.ac 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/configure.ac 2019-03-16 19:42:32.000000000 +0100 @@ -1,8 +1,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXmu], [1.1.2], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) +AC_INIT([libXmu], [1.1.3], + [https://gitlab.freedesktop.org/xorg/lib/libXmu/issues], [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.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/libXmu-1.1.2/missing new/libXmu-1.1.3/missing --- old/libXmu-1.1.2/missing 2013-09-08 06:28:27.000000000 +0200 +++ new/libXmu-1.1.3/missing 2019-03-16 19:42:40.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 <pin...@iro.umontreal.ca>, 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/libXmu-1.1.2/src/Atoms.c new/libXmu-1.1.3/src/Atoms.c --- old/libXmu-1.1.2/src/Atoms.c 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/Atoms.c 2019-03-16 19:42:32.000000000 +0100 @@ -54,14 +54,8 @@ DisplayRec* head; }; -#ifdef SUNSHLIB -#define STATIC -#else -#define STATIC static -#endif - #define DeclareAtom(atom,text) \ -STATIC struct _AtomRec __##atom = { text, NULL }; \ +static struct _AtomRec __##atom = { text, NULL }; \ AtomPtr _##atom = &__##atom; DeclareAtom(XA_ATOM_PAIR, "ATOM_PAIR" ) 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/libXmu-1.1.2/src/Makefile.am new/libXmu-1.1.3/src/Makefile.am --- old/libXmu-1.1.2/src/Makefile.am 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/Makefile.am 2019-03-16 19:42:32.000000000 +0100 @@ -62,8 +62,7 @@ UpdMapHint.c \ VisCmap.c \ WidgetNode.c \ - Xct.c \ - sharedlib.c + Xct.c if LINT 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/libXmu-1.1.2/src/RdBitF.c new/libXmu-1.1.3/src/RdBitF.c --- old/libXmu-1.1.2/src/RdBitF.c 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/RdBitF.c 2019-03-16 19:42:32.000000000 +0100 @@ -56,6 +56,7 @@ #include <X11/Xmu/Drawing.h> #ifdef WIN32 #include <X11/Xwindows.h> +#include <direct.h> /* for _getdrives() */ #endif #define MAX_SIZE 255 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/libXmu-1.1.2/src/ShapeWidg.c new/libXmu-1.1.3/src/ShapeWidg.c --- old/libXmu-1.1.2/src/ShapeWidg.c 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/ShapeWidg.c 2019-03-16 19:42:32.000000000 +0100 @@ -201,7 +201,7 @@ GC gc; unsigned long mask; - if (width < 3 || width < 3) + if (width < 3 || height < 3) return; width += w->core.border_width << 1; height += w->core.border_width << 1; 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/libXmu-1.1.2/src/StrToCurs.c new/libXmu-1.1.3/src/StrToCurs.c --- old/libXmu-1.1.2/src/StrToCurs.c 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/StrToCurs.c 2019-03-16 19:42:32.000000000 +0100 @@ -58,8 +58,8 @@ #include <X11/Xmu/CurUtil.h> #include <X11/Xmu/CharSet.h> -#ifndef X_NOT_POSIX #include <stdlib.h> + #ifdef _POSIX_SOURCE #include <limits.h> #else @@ -67,7 +67,7 @@ #include <limits.h> #undef _POSIX_SOURCE #endif -#endif /* X_NOT_POSIX */ + #ifndef PATH_MAX #ifdef WIN32 #define PATH_MAX 512 @@ -88,7 +88,7 @@ and broken object file formats that don't correctly distinguish references to procedures from references to data. */ -#if defined(SUNSHLIB) || defined(SVR4) +#if defined(SVR4) #define XMU_KLUDGE #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/libXmu-1.1.2/src/StrToWidg.c new/libXmu-1.1.3/src/StrToWidg.c --- old/libXmu-1.1.2/src/StrToWidg.c 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/StrToWidg.c 2019-03-16 19:42:32.000000000 +0100 @@ -53,63 +53,60 @@ /*ARGSUSED*/ void XmuCvtStringToWidget(XrmValuePtr args, Cardinal *num_args, - XrmValuePtr fromVal, XrmValuePtr toVal) + XrmValuePtr fromVal, XrmValuePtr toVal) { static Widget widget, *widgetP, parent; XrmName name = XrmStringToName(fromVal->addr); Cardinal i; - if (*num_args != 1) - { - i = 0; - XtErrorMsg("wrongParameters", "cvtStringToWidget", "xtToolkitError", - "StringToWidget conversion needs parent arg", NULL, &i); + if (*num_args != 1) { + i = 0; + XtErrorMsg("wrongParameters", "cvtStringToWidget", "xtToolkitError", + "StringToWidget conversion needs parent arg", NULL, &i); } - parent = *(Widget*)args[0].addr; + parent = *(Widget *) args[0].addr; /* try to match names of normal children */ - if (XtIsComposite(parent)) - { - i = ((CompositeWidget)parent)->composite.num_children; - for (widgetP = ((CompositeWidget)parent)->composite.children; - i; i--, widgetP++) - if ((*widgetP)->core.xrm_name == name) - { - widget = *widgetP; - done(&widget, Widget); - } - } + if (XtIsComposite(parent)) { + i = ((CompositeWidget) parent)->composite.num_children; + for (widgetP = ((CompositeWidget) parent)->composite.children; + i; i--, widgetP++) { + if ((*widgetP)->core.xrm_name == name) { + widget = *widgetP; + done(&widget, Widget); + } + } + } /* try to match names of popup children */ i = parent->core.num_popups; - for (widgetP = parent->core.popup_list; i; i--, widgetP++) - if ((*widgetP)->core.xrm_name == name) - { - widget = *widgetP; - done(&widget, Widget); - } + for (widgetP = parent->core.popup_list; i; i--, widgetP++) { + if ((*widgetP)->core.xrm_name == name) { + widget = *widgetP; + done(&widget, Widget); + } + } /* try to match classes of normal children */ - if (XtIsComposite(parent)) - { - i = ((CompositeWidget)parent)->composite.num_children; - for (widgetP = ((CompositeWidget)parent)->composite.children; - i; i--, widgetP++) - if ((*widgetP)->core.widget_class->core_class.xrm_class == name) - { - widget = *widgetP; - done(&widget, Widget); - } - } + if (XtIsComposite(parent)) { + i = ((CompositeWidget) parent)->composite.num_children; + for (widgetP = ((CompositeWidget) parent)->composite.children; + i; i--, widgetP++) { + if ((*widgetP)->core.widget_class->core_class.xrm_class == name) { + widget = *widgetP; + done(&widget, Widget); + } + } + } /* try to match classes of popup children */ i = parent->core.num_popups; - for (widgetP = parent->core.popup_list; i; i--, widgetP++) - if ((*widgetP)->core.widget_class->core_class.xrm_class == name) - { - widget = *widgetP; - done(&widget, Widget); - } + for (widgetP = parent->core.popup_list; i; i--, widgetP++) { + if ((*widgetP)->core.widget_class->core_class.xrm_class == name) { + widget = *widgetP; + done(&widget, Widget); + } + } XtStringConversionWarning(fromVal->addr, XtRWidget); toVal->addr = NULL; @@ -118,108 +115,109 @@ #undef done -#define newDone(type, value) \ - { \ - if (toVal->addr != NULL) { \ - if (toVal->size < sizeof(type)) { \ - toVal->size = sizeof(type); \ - return False; \ - } \ - *(type*)(toVal->addr) = (value); \ - } \ - else { \ - static type static_val; \ - static_val = (value); \ - toVal->addr = (XtPointer)&static_val; \ - } \ - toVal->size = sizeof(type); \ - return True; \ - } +#define newDone(type, value) \ + { \ + if (toVal->addr != NULL) { \ + if (toVal->size < sizeof(type)) { \ + toVal->size = sizeof(type); \ + return False; \ + } \ + *(type*)(toVal->addr) = (value); \ + } \ + else { \ + static type static_val; \ + static_val = (value); \ + toVal->addr = (XtPointer)&static_val; \ + } \ + toVal->size = sizeof(type); \ + return True; \ + } /*ARGSUSED*/ Boolean XmuNewCvtStringToWidget(Display *dpy, XrmValue *args, Cardinal *num_args, - XrmValue *fromVal, XrmValue *toVal, - XtPointer *converter_data) + XrmValue *fromVal, XrmValue *toVal, + XtPointer *converter_data) { Widget *widgetP, parent; XrmName name = XrmStringToName(fromVal->addr); int i; if (*num_args != 1) - XtAppWarningMsg(XtDisplayToApplicationContext(dpy), - "wrongParameters","cvtStringToWidget","xtToolkitError", - "String To Widget conversion needs parent argument", - (String *)NULL, (Cardinal *)NULL); + XtAppWarningMsg(XtDisplayToApplicationContext(dpy), + "wrongParameters", "cvtStringToWidget", + "xtToolkitError", + "String To Widget conversion needs parent argument", + (String *) NULL, (Cardinal *) NULL); - parent = *(Widget*)args[0].addr; + parent = *(Widget *) args[0].addr; /* try to match names of normal children */ - if (XtIsComposite(parent)) - { - i = ((CompositeWidget)parent)->composite.num_children; - for (widgetP = ((CompositeWidget)parent)->composite.children; - i; i--, widgetP++) - if ((*widgetP)->core.xrm_name == name) - newDone(Widget, *widgetP); - } + if (XtIsComposite(parent)) { + i = ((CompositeWidget) parent)->composite.num_children; + for (widgetP = ((CompositeWidget) parent)->composite.children; + i; i--, widgetP++) { + if ((*widgetP)->core.xrm_name == name) + newDone(Widget, *widgetP); + } + } /* try to match names of popup children */ i = parent->core.num_popups; - for (widgetP = parent->core.popup_list; i; i--, widgetP++) - if ((*widgetP)->core.xrm_name == name) - newDone(Widget, *widgetP); + for (widgetP = parent->core.popup_list; i; i--, widgetP++) { + if ((*widgetP)->core.xrm_name == name) + newDone(Widget, *widgetP); + } /* try to match classes of normal children */ - if (XtIsComposite(parent)) - { - i = ((CompositeWidget)parent)->composite.num_children; - for (widgetP = ((CompositeWidget)parent)->composite.children; - i; i--, widgetP++) - if ((*widgetP)->core.widget_class->core_class.xrm_class == name) - newDone(Widget, *widgetP); - } + if (XtIsComposite(parent)) { + i = ((CompositeWidget) parent)->composite.num_children; + for (widgetP = ((CompositeWidget) parent)->composite.children; + i; i--, widgetP++) { + if ((*widgetP)->core.widget_class->core_class.xrm_class == name) + newDone(Widget, *widgetP); + } + } /* try to match classes of popup children */ i = parent->core.num_popups; - for (widgetP = parent->core.popup_list; i; i--, widgetP++) - if ((*widgetP)->core.widget_class->core_class.xrm_class == name) - newDone(Widget, *widgetP); + for (widgetP = parent->core.popup_list; i; i--, widgetP++) { + if ((*widgetP)->core.widget_class->core_class.xrm_class == name) + newDone(Widget, *widgetP); + } - XtDisplayStringConversionWarning(dpy, (String)fromVal->addr, XtRWidget); - return (False); + XtDisplayStringConversionWarning(dpy, (String) fromVal->addr, XtRWidget); + return (False); } /*ARGSUSED*/ Boolean XmuCvtWidgetToString(Display *dpy, XrmValuePtr args, Cardinal *num_args, - XrmValuePtr fromVal, XrmValuePtr toVal, - XtPointer *data) + XrmValuePtr fromVal, XrmValuePtr toVal, XtPointer *data) { - static String buffer; - Cardinal size; - Widget widget; - - widget = *(Widget *)fromVal->addr; - - if (widget) - buffer = XrmQuarkToString(widget->core.xrm_name); - else - buffer = "(null)"; - - size = strlen(buffer) + 1; - if (toVal->addr != NULL) - { - if (toVal->size < size) - { - toVal->size = size; - return (False); - } - strcpy((char *)toVal->addr, buffer); - } - else - toVal->addr = (XPointer)buffer; - toVal->size = sizeof(String); + static String buffer; + Cardinal size; + Widget widget; + + widget = *(Widget *) fromVal->addr; + + if (widget) + buffer = XrmQuarkToString(widget->core.xrm_name); + else + buffer = "(null)"; + + size = strlen(buffer) + 1; + if (toVal->addr != NULL) { + if (toVal->size < size) { + toVal->size = size; + return (False); + } + strcpy((char *) toVal->addr, buffer); + } + else { + toVal->addr = (XPointer) buffer; + } + toVal->size = sizeof(String); - return (True); + return (True); } 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/libXmu-1.1.2/src/sharedlib.c new/libXmu-1.1.3/src/sharedlib.c --- old/libXmu-1.1.2/src/sharedlib.c 2013-09-08 06:28:18.000000000 +0200 +++ new/libXmu-1.1.3/src/sharedlib.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -/* - -Copyright 1991, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -#if defined(SUNSHLIB) && !defined(SHAREDCODE) - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include "Atoms.h" - -struct _AtomRec { - char *name; - struct _DisplayRec* head; -}; - -#define DeclareAtom(atom) \ -extern struct _AtomRec __##atom; \ -AtomPtr _##atom = &__##atom; - -DeclareAtom(XA_ATOM_PAIR) -DeclareAtom(XA_CHARACTER_POSITION) -DeclareAtom(XA_CLASS) -DeclareAtom(XA_CLIENT_WINDOW) -DeclareAtom(XA_CLIPBOARD) -DeclareAtom(XA_COMPOUND_TEXT) -DeclareAtom(XA_DECNET_ADDRESS) -DeclareAtom(XA_DELETE) -DeclareAtom(XA_FILENAME) -DeclareAtom(XA_HOSTNAME) -DeclareAtom(XA_IP_ADDRESS) -DeclareAtom(XA_LENGTH) -DeclareAtom(XA_LIST_LENGTH) -DeclareAtom(XA_NAME) -DeclareAtom(XA_NET_ADDRESS) -DeclareAtom(XA_NULL) -DeclareAtom(XA_OWNER_OS) -DeclareAtom(XA_SPAN) -DeclareAtom(XA_TARGETS) -DeclareAtom(XA_TEXT) -DeclareAtom(XA_TIMESTAMP) -DeclareAtom(XA_USER) -DeclareAtom(XA_UTF8_STRING) - -#endif /* SUNSHLIB */
