Hello community,
here is the log from the commit of package xorg-x11-libXmu
checked in at Fri Jan 18 01:27:52 CET 2008.
--------
--- xorg-x11-libXmu/xorg-x11-libXmu.changes 2008-01-01 23:14:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-libXmu/xorg-x11-libXmu.changes 2008-01-15 12:28:50.829314000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 15 12:38:14 CET 2008 - sndirsch@suse.de
+
+- update to release 1.0.4
+ * Coverity #52: Dead code in get_os_name()
+
+-------------------------------------------------------------------
Old:
----
libXmu-1.0.3.tar.bz2
New:
----
libXmu-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libXmu.spec ++++++
--- /var/tmp/diff_new_pack.n18630/_old 2008-01-18 01:27:22.000000000 +0100
+++ /var/tmp/diff_new_pack.n18630/_new 2008-01-18 01:27:22.000000000 +0100
@@ -11,11 +11,11 @@
# norootforbuild
Name: xorg-x11-libXmu
-%define dirsuffix 1.0.3
+%define dirsuffix 1.0.4
BuildRequires: pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXt-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 16
+Release: 20
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -79,12 +79,15 @@
/usr/%{_lib}/pkgconfig/*.pc
%changelog
-* Tue Jan 01 2008 - crrodriguez@suse.de
+* Tue Jan 15 2008 sndirsch@suse.de
+- update to release 1.0.4
+ * Coverity #52: Dead code in get_os_name()
+* Tue Jan 01 2008 crrodriguez@suse.de
- fix library-without-ldconfig-* error
- add missing PreReq coreutils
-* Sat Sep 29 2007 - sndirsch@suse.de
+* Sat Sep 29 2007 sndirsch@suse.de
- bumped version to 7.3
-* Wed Nov 08 2006 - sndirsch@suse.de
+* Wed Nov 08 2006 sndirsch@suse.de
- update to release 1.0.3
* Due to some confusion, libXmu 1.0.2 was actually rolled and
released twice. Thus, /releases/development/7.2-RC1/lib/
@@ -93,14 +96,14 @@
libXmu 1.0.3 has no changes from 1.0.2, it's just to clear the
versioning confusion. Thanks to Tilman again for pointing this
out.
-* Sat Oct 14 2006 - sndirsch@suse.de
+* Sat Oct 14 2006 sndirsch@suse.de
- updated to X.org 7.2RC1
-* Wed Aug 02 2006 - sndirsch@suse.de
+* Wed Aug 02 2006 sndirsch@suse.de
- fix setup line
-* Fri Jul 28 2006 - sndirsch@suse.de
+* Fri Jul 28 2006 sndirsch@suse.de
- use "-fno-strict-aliasing"
-* Thu Jul 27 2006 - sndirsch@suse.de
+* Thu Jul 27 2006 sndirsch@suse.de
- use $RPM_OPT_FLAGS
- remove existing /usr/include/X11 symlink in %%pre
-* Thu Jun 22 2006 - sndirsch@suse.de
+* Thu Jun 22 2006 sndirsch@suse.de
- created package
++++++ libXmu-1.0.3.tar.bz2 -> libXmu-1.0.4.tar.bz2 ++++++
++++ 21868 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.0.3/ChangeLog new/libXmu-1.0.4/ChangeLog
--- old/libXmu-1.0.3/ChangeLog 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/ChangeLog 2008-01-14 23:12:27.000000000 +0100
@@ -1,187 +1,272 @@
-2006-04-30 Matthieu Herrb
+commit e2735131202e7801e72ce33def666b6a0a543e26
+Author: Alan Coopersmith
+Date: Mon Jan 14 14:11:43 2008 -0800
- * src/Makefile.am
- Define BITMAPDIR for the case where ${prefix} != /usr
+ Version bump: 1.0.4
-2006-04-26 Adam Jackson
+commit f11b5a161944dc694ee059f88acb20826bd6d90b
+Author: Alan Coopersmith
+Date: Mon Jan 14 11:21:36 2008 -0800
- * configure.ac:
- Bump to 1.0.1
+ Coverity #52: Dead code in get_os_name()
-2006-03-20 Adam Jackson
+commit 6f5ea6a2a0b56674f08f58d95085c0e9a8797fe2
+Author: Alan Coopersmith
+Date: Sun Jan 13 01:58:12 2008 -0800
- * src/Makefile.am:
- Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz)
+ Clear sparse warnings: Using plain integer as NULL pointer
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6f76ccc70a5f5ae834a3e63c9f4f35704837a4d1
+Author: Alan Coopersmith
+Date: Fri Jan 11 20:43:26 2008 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add hooks for checking sources with tools like lint & sparse
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 43ec402bcd6a2333a4e213de3a82d7e3392b0fb0
+Author: James Cloos
+Date: Thu Dec 6 16:38:32 2007 -0500
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7e35135e9ad1ea2ef101402ea26bec62c3cbb69a
+Author: James Cloos
+Date: Mon Sep 3 05:53:43 2007 -0400
- * xmu.pc.in:
- * xmuu.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a3e01af0f4b56b3b8891040cf0f7208265bbea2a
+Author: Daniel Stone
+Date: Wed Nov 8 20:01:35 2006 +0200
- * configure.ac:
- Update package version number for RC1 release.
+ bump to 1.0.3
-2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7beb4c2909af805e61d073a6f2b93234eb91834d
+Author: Adam Jackson
+Date: Fri Oct 13 16:22:06 2006 -0400
- * Makefile.am:
- Add missing file to EXTRA_DIST
+ Bump to 1.0.2
-2005-07-08 Keith Packard
+commit 339368b404a807d1c494b260314da16d044986ff
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:59:01 2006 -0700
- * .cvsignore:
- * include/.cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
+ renamed: .cvsignore -> .gitignore
-2005-05-21 Alan Coopersmith
+commit 60620a4b7eeb004e55ba57aef8df33f6adc930f0
+Author: Matthias Hopf
+Date: Mon Jul 3 19:33:05 2006 +0200
- * configure.ac:
- Add XTRANS_CONNECTION_FLAGS to get network transport #defines
- for CvdStdSel.c
- * src/Makefile.am:
- Add libXmuu_la_LIBADD
+ Added README missing from CVS conversion.
-2005-01-29 Daniel Stone
+commit 05a5c96fcef9822ff3c0312427d2c2672f73b551
+Author: Matthieu Herrb
+Date: Sun Apr 30 14:22:53 2006 +0000
- * CvtStdSel.c (get_os_name):
- Change uname == 0 to uname >= 0 (X.Org HEAD).
+ Define BITMAPDIR for the case where ${prefix} != /usr
- * include/X11/Xmu/SysUtil.h:
- * include/X11/Xmu/Xmu.h:
- Add gcc format attribute (X.Org HEAD).
+commit 0aa6a46099fb319c82da51b8a73566007ad5acbd
+Author: Adam Jackson
+Date: Thu Apr 27 00:18:38 2006 +0000
-2005-01-01 Phil Blundell
+ Bump to 1.0.1
- * configure.ac (XMUU_CFLAGS, XMUU_LIBS): New.
- * xmuu.pc.in: Use XMUU_CFLAGS+XMUU_LIBS, not XMU_CFLAGS+XMU_LIBS.
+commit 7bb6398aa024d782706125bebd93468f9cc8a0ec
+Author: Adam Jackson
+Date: Mon Mar 20 19:57:04 2006 +0000
-2004-05-17 Eric Anholt
+ Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz)
- * EditresCom.c:
- * WidgetNode.c: (XmuWnFetchResources):
- Axe the Xaw header dependency again.
+commit 78ab364fec59fa84ac914d51628dfb8ac4a048a5
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:30 2005 +0000
-2004-05-10 Eric Anholt
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- * xmu.pc.in:
- * xmuu.pc.in:
- Properly include LIBS/CFLAGS in .pc and linking.
- Bump to version 6.2.3.
+commit 1d93f5a9968e6e9af8f15c60107b1691009d1bd8
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:44 2005 +0000
-2004-04-13 Daniel Stone
+ Update package version number for X11R7 RC3 release.
- * EditresCom.c:
- X11R6.7 merge - various minor cleanups.
+commit 5a807bcce047a8072db2c0cef05a84aa6e6cd3ca
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:42 2005 +0000
- * Bump version to 6.2.2 for xlibs 1.0.1.
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
-2004-03-17 Carlos Romero
+commit c50ca633b633d25ba672fb19ac182cea40242069
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:11 2005 +0000
- (Commit sponsored by Daniel Stone.)
- * Makefile.am:
- * xmu.pc.in:
- * configure.ac:
- Various cleanups to build system, including correct use of pkg-config.
+ Update package version number for RC1 release.
-2003-12-23 Jeremy C. Reed
+commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26
+Author: Kevin E Martin
+Date: Wed Oct 5 19:57:36 2005 +0000
- * ChangeLog
- Caught up on all missing by me starting Dec. 16.
+ Add missing file to EXTRA_DIST
-2003-12-23 Jeremy C. Reed
+commit bf4087e453d8fd83630976cd6e7e31c63737a4a1
+Author: Søren Sandmann Pedersen
+Date: Mon Oct 3 20:55:36 2005 +0000
- * Makefile.am
- * configure.ac
- Fix versions for Xmu and Xmuu libraries. Using
- -version-number 6:2:1 for Xmu. And using -version-info
- 1:0:1 for Xmuu. (This may be out of order, need to test
- again.)
+ Remvoe README file that is symlinked from monolith
-2003-12-23 Jeremy C. Reed
+commit 82b5da0b34780df3fe91c4b617cb541ee767d794
+Author: Alan Coopersmith
+Date: Sat Jul 30 19:15:16 2005 +0000
- * configure.ac
- * xmu.pc.in
- * xmuu.pc.in
- Fix LIBS and CFLAGS for xmuu.pc.in and xmu.pc.in. Also use
- pkgconfig info for Xt for xmu.pc.in.
+ Add -D flags to clear various warnings (Stefan Dirsch)
-2003-12-23 Jeremy C. Reed
+commit 43f43567e3c8c63f6b70d7e529827cd5f15e15d3
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:52 2005 +0000
- * EditresCom.c
- * WidgetNode.c
- Get rid of X11/Xaw/Cardinals.h include. Xmu should
- not depend on Xaw to build, because Xaw needs many Xmu
- functions to build. In WidgetNode.c, define ZERO (which
- X11/Xaw/Cardinals.h would define).
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
-2003-12-17 Jeremy C. Reed
+commit e9ee49d99a20458e5f36bba48a7ea65bb5230a8d
+Author: Daniel Stone
+Date: Sat Jul 16 07:16:27 2005 +0000
- * Makefile.am
- Don't repeat source filenames for both Xmu and Xmuu.
- Just list in libXmuu_la_SOURCES; and use that variable in
- the libXmu_la_SOURCES list. (As suggested by keithp on
- xlibs@ list.)
+ Set soversions to 6.2.0 and 1.0.0 with -version-number.
-2003-12-16 Jeremy C. Reed
+commit 81f5815d0c42b7065eb8e5aeef8e115e7398128f
+Author: Keith Packard
+Date: Sat Jul 9 06:43:26 2005 +0000
- * .cvsignore
- Add two ltconfig related files for CVS to ignore.
+ Add .cvsignore files
-2003-12-16 Jeremy C. Reed
+commit 56ef5803a7def4f0d08ce8863e317b250c9c0ce4
+Author: Daniel Stone
+Date: Sun Jul 3 07:00:57 2005 +0000
- * Lower.c
- Comment out snprintf.c include. (Maybe as a temporary
- workaround.) Later, maybe have autoconf check for it.
+ Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
+ Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
+ Add #include or , as appropriate, to all
+ source files in the xserver/xorg tree, predicated on defines of
+ HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
+ .
-2003-12-16 Jeremy C. Reed
+commit 5a64c1de0a1d620039afbb0805ae23f10470e815
+Author: Alan Coopersmith
+Date: Sun May 22 19:06:20 2005 +0000
- * INSTALL
- Add autoconf (./configure) INSTALL instructions.
+ Add XTRANS_CONNECTION_FLAGS to get network transport #defines for
+ CvdStdSel.c
+ Add libXmuu_la_LIBADD
-2003-12-16 Jeremy C. Reed
+commit 506a8f64c84b3db3ad64d03ee698c1de227247de
+Author: Alan Coopersmith
+Date: Sun May 22 04:36:38 2005 +0000
- * AUTHORS
- * COPYING
- * ChangeLog
- * Makefile.am
- * NEWS
- * autogen.sh
- * configure.ac
- * xmu.pc.in
- * xmuu.pc.in
- Add beginnings of autoconf/automake/pkgconfig framework for Xmu
- and mini Xmu (Xmuu).
+ Move #ifdef HAVE_CONFIG_H outside of #ifdef SYSVNET
-2003-12-16 Jeremy C. Reed
+commit 9ca353477c403ab1341e994a5a42a998d29e9a58
+Author: Adam Jackson
+Date: Thu May 19 00:22:32 2005 +0000
- * include/Makefile.am
- Using automake/autoconf for headers. (Note that
- headers from original xc/Xmu were moved in CVS to this
- Xmu/include/X11/Xmu/ directory.)
+ revert last change, didn't do right thing at all, sorry for the noise
-2003-12-16 Jeremy C. Reed
+commit 0a662934f050cff90e82d463ec809c3758b260b1
+Author: Adam Jackson
+Date: Thu May 19 00:10:08 2005 +0000
- * include/.cvsignore
- Add .cvsignore for CVS to ignore Makefile and Makefile.in.
+ Require automake 1.7 in AM_INIT_AUTOMAKE
-2003-12-16 Jeremy C. Reed
+commit 2e403190ff21b0bb277391a73741cfc6d5005ac3
+Author: Søren Sandmann Pedersen
+Date: Wed May 18 19:38:36 2005 +0000
- * .cvsignore
- Add .cvsignore to list files that should be ignored by CVS.
+ - Add Xmu build system
+
+commit 7cea083d37cfaaad321bddca0fb75b3308956938
+Author: Søren Sandmann Pedersen
+Date: Wed May 18 19:30:41 2005 +0000
+
+ - Add Xmu to symlink.sh
+ - Conditionally include config.h in Xmu sources
+
+commit ab0973b4595cfe27c81202bfb4a148780b05bb02
+Author: Alan Coopersmith
+Date: Wed Dec 22 08:28:16 2004 +0000
+
+ Bug #2123 https://bugs.freedesktop.org/show_bug.cgi?id=2123 Attachment
+ #1587 https://bugs.freedesktop.org/attachment.cgi?id=1587 Call to
+ uname should not check for return == 0, but for >= 0 instead
+
+commit ece6cefc8e0238071f89de520d4a969fede53bd6
+Author: Eric Anholt
+Date: Tue May 18 04:45:29 2004 +0000
+
+ Remove Xaw header dependency from Xmu library build.
+ http://freedesktop.org/cgi-bin/bugzilla/attachment.cgi?bugid=634
+
+commit 51156051e17f4ec53cbfe34f3a79f38d5884b78d
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:45 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 832c5a7d7b07b88f6468daabae56d9daeeee0db8
+Author: Egbert Eich
+Date: Sun Mar 14 08:32:24 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 410cf462f4a8733c58303de686f07fbd98f2e30e
+Author: Egbert Eich
+Date: Wed Mar 3 12:11:29 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit b00bc81852e56578939fb4d63796f8e0cd187cbf
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit aa59d04a1a50b5978e886c2e7248f77bea515ce0
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:44 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 0d10732a71487293bd70c2675ced6bffb6093c8d
+Author: Egbert Eich
+Date: Thu Jan 29 08:08:06 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 6b975651aef1797eb795bd876486c565c52f66fd
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 865329b4e079334b4cb846347ab9a572ac946228
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 709dda59a506e0c4ad17b085aa381f35cd86176f
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
+
+commit e3925d3087dc381a24b47c5602e086645e942fcf
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:39 2003 +0000
+
+ R6.6 is the Xorg base-line
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.0.3/config.h.in new/libXmu-1.0.4/config.h.in
--- old/libXmu-1.0.3/config.h.in 2006-11-08 19:02:28.000000000 +0100
+++ new/libXmu-1.0.4/config.h.in 2008-01-14 23:12:06.000000000 +0100
@@ -39,6 +39,9 @@
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
@@ -57,6 +60,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
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.0.3/configure.ac new/libXmu-1.0.4/configure.ac
--- old/libXmu-1.0.3/configure.ac 2006-11-08 19:01:29.000000000 +0100
+++ new/libXmu-1.0.4/configure.ac 2008-01-14 23:11:22.000000000 +0100
@@ -5,7 +5,7 @@
AC_PREREQ(2.57)
AC_INIT([libXmu],
- 1.0.3,
+ 1.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXmu)
@@ -17,6 +17,11 @@
AM_CONFIG_HEADER([config.h])
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
+
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
@@ -51,6 +56,18 @@
AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()])
AC_SUBST(HAS_SNPRINTF)
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xmu])
+LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
+AC_SUBST(LINTLIBUU)
+
+if test "x$GCC" = "xyes"; then
+ GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
+ XMU_CFLAGS="$GCC_WARNINGS $XMU_CFLAGS"
+fi
+
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
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.0.3/Makefile.am new/libXmu-1.0.4/Makefile.am
--- old/libXmu-1.0.3/Makefile.am 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/Makefile.am 2008-01-12 05:35:35.000000000 +0100
@@ -10,3 +10,19 @@
xmuu.pc.in \
autogen.sh \
include/X11/Xmu/WhitePoint.h
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
+if LINT
+# Check source code with tools like lint & sparse
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif 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.0.3/missing new/libXmu-1.0.4/missing
--- old/libXmu-1.0.3/missing 2006-11-08 19:02:31.000000000 +0100
+++ new/libXmu-1.0.4/missing 2008-01-14 23:12:07.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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.0.3/src/Clip.c new/libXmu-1.0.4/src/Clip.c
--- old/libXmu-1.0.3/src/Clip.c 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/src/Clip.c 2008-01-12 17:36:09.000000000 +0100
@@ -799,8 +799,8 @@
XmuScanlineNot(XmuScanline *scanline, int minx, int maxx)
{
XmuSegment *z;
- static XmuSegment x = { 0, 0, 0 };
- static XmuScanline and = { 0, &x, 0 };
+ static XmuSegment x = { 0, 0, NULL };
+ static XmuScanline and = { 0, &x, NULL };
if (!scanline)
return (scanline);
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.0.3/src/CvtStdSel.c new/libXmu-1.0.4/src/CvtStdSel.c
--- old/libXmu-1.0.3/src/CvtStdSel.c 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/src/CvtStdSel.c 2008-01-14 20:19:56.000000000 +0100
@@ -114,7 +114,9 @@
#ifdef OS_NAME
return XtNewString(OS_NAME);
#else
+#if defined(X_OS_FILE) || defined(MOTD_FILE)
FILE *f = NULL;
+#endif
#ifdef USE_UNAME
struct utsname utss;
@@ -142,6 +144,7 @@
#ifdef MOTD_FILE
f = fopen(MOTD_FILE, "r");
#endif
+#if defined(X_OS_FILE) || defined(MOTD_FILE)
if (f) {
char motd[512];
motd[0] = '\0';
@@ -155,6 +158,7 @@
return XtNewString(motd);
}
}
+#endif
#ifdef sun
return XtNewString("SunOS");
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.0.3/src/Makefile.am new/libXmu-1.0.4/src/Makefile.am
--- old/libXmu-1.0.3/src/Makefile.am 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/src/Makefile.am 2008-01-12 05:36:55.000000000 +0100
@@ -2,10 +2,12 @@
BITMAP_DEFINES = -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_srcdir}/include/X11/Xmu \
- $(XMU_CFLAGS) $(BITMAP_DEFINES) -D_BSD_SOURCE
+ $(BITMAP_DEFINES) -D_BSD_SOURCE
+
+AM_CFLAGS = $(XMU_CFLAGS)
libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
@@ -62,3 +64,24 @@
WidgetNode.c \
Xct.c \
sharedlib.c
+
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) $(XEXT_LIBS)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
+
+$(LINTLIB): $(libXmu_la_SOURCES)
+ $(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES)
+
+$(LINTLIBUU): $(libXmuu_la_SOURCES)
+ $(LINT) -y -oXmuu -x $(ALL_LINT_FLAGS) $(libXmuu_la_SOURCES)
+endif MAKE_LINT_LIB
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.0.3/src/StdCmap.c new/libXmu-1.0.4/src/StdCmap.c
--- old/libXmu-1.0.3/src/StdCmap.c 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/src/StdCmap.c 2008-01-12 17:36:51.000000000 +0100
@@ -91,7 +91,7 @@
vinfo_template.depth = depth;
vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask;
if ((vinfo = XGetVisualInfo(dpy, vinfo_mask, &vinfo_template, &n)) == NULL)
- return 0;
+ return NULL;
/* Check the validity of the combination of visual characteristics,
* allocation, and colormap property. Create an XStandardColormap
@@ -101,7 +101,7 @@
if (! valid_args(vinfo, red_max, green_max, blue_max, property)
|| ((stdcmap = XAllocStandardColormap()) == NULL)) {
XFree((char *) vinfo);
- return 0;
+ return NULL;
}
/* Fill in the XStandardColormap structure */
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.0.3/src/StrToWidg.c new/libXmu-1.0.4/src/StrToWidg.c
--- old/libXmu-1.0.3/src/StrToWidg.c 2006-11-08 18:51:59.000000000 +0100
+++ new/libXmu-1.0.4/src/StrToWidg.c 2008-01-13 10:57:09.000000000 +0100
@@ -63,8 +63,11 @@
int i;
if (*num_args != 1)
+ {
+ i = 0;
XtErrorMsg("wrongParameters", "cvtStringToWidget", "xtToolkitError",
- "StringToWidget conversion needs parent arg", NULL, 0);
+ "StringToWidget conversion needs parent arg", NULL, &i);
+ }
parent = *(Widget*)args[0].addr;
/* try to match names of normal children */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org