libxt: Changes to 'debian-unstable'
COPYING | 2
ChangeLog | 414 +++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 123 +++++++------
debian/changelog | 11 +
debian/copyright | 2
debian/libxt6.symbols | 1
include/X11/Intrinsic.h | 9 +
include/X11/IntrinsicI.h | 33 ---
man/Makefile.am | 3
man/XtAsprintf.man | 1
man/XtMalloc.man | 18 ++
src/Alloc.c | 41 ++++
src/Error.c | 18 --
src/Initialize.c | 25 +-
src/Keyboard.c | 26 +-
src/ResConfig.c | 42 +---
src/Resources.c | 95 ----------
src/Selection.c | 2
src/Shell.c | 9 -
src/Varargs.c | 5
util/makestrs.c | 3
21 files changed, 617 insertions(+), 266 deletions(-)
New commits:
commit 7ac14fcdbdb97db0a145ba1bc974bd14434b5ace
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:15:40 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 26f3c40..90ad2c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxt (1:1.1.0-1) UNRELEASED; urgency=low
+libxt (1:1.1.0-1) unstable; urgency=low
[ Julien Cristau ]
* Delete libtool m4 files in clean.
@@ -9,7 +9,7 @@ libxt (1:1.1.0-1) UNRELEASED; urgency=low
* Update symbols file:
+ XtAsprintf
- -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:07:40 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:15:27 +0100
libxt (1:1.0.9-2) unstable; urgency=low
commit eb5345e813d55b8714451056f7676efe0b1b6de5
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:15:24 2011 +0100
Update symbols file (add XtAsprintf).
diff --git a/debian/changelog b/debian/changelog
index c78008b..26f3c40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libxt (1:1.1.0-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
* Update debian/copyright from upstream COPYING.
+ * Update symbols file:
+ + XtAsprintf
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:07:40 +0100
diff --git a/debian/libxt6.symbols b/debian/libxt6.symbols
index 9e8834c..3d3aaa0 100644
--- a/debian/libxt6.symbols
+++ b/debian/libxt6.symbols
@@ -185,6 +185,7 @@ libXt.so.6 libxt6 #MINVER#
XtOpenApplication@Base 0
XtConfigureWidget@Base 0
XtAppWarningMsg@Base 0
+ XtAsprintf@Base 1:1.1.0
XtInsertEventTypeHandler@Base 0
transientShellClassRec@Base 0
XtAppAddTimeOut@Base 0
commit 3f2dac2169cb96832c5e76e8c4ccb29ccf53744b
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:10:02 2011 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 05c5b52..c78008b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxt (1:1.1.0-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:07:40 +0100
diff --git a/debian/copyright b/debian/copyright
index 3f371d6..f69a7e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1993, 2011, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
commit c427b1cf8f3a6cff116a416b983218b16d78110d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:09:27 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 484c7a2..dd53fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,417 @@
+commit 994443524ade46bad03eea0acbd1410d561c591d
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Mar 4 16:30:58 2011 -0800
+
+ configure: Bump version to 1.1.0 for release
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c0a233895cc8270ec0ff0bd2abb88d3f6dd524c3
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Mar 4 12:49:48 2011 -0800
+
+ darwin: Don't use poll() when expected to run on darwin10 and prior
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit abf6062715c7d1390e516261a31abde4ed7ea64e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Feb 2 23:29:46 2011 -0800
+
+ Shell.c: TopLevelSetValues ignores iconic state if shell not yet realized
+
+ Fix originally created by Leo Binchy for Sun to fix Solaris bug
+ 1243761 The XmNiconic resource doesn't work
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b1eaa18835ec7c3a11e580340625b35c18edf7ca
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Feb 2 23:21:02 2011 -0800
+
+ GetResources: protect against underflow when type conversion fails
+
+ Fix originally created by Leo Binchy for Sun to fix Solaris bug 1211553:
+ XtVaCreateManagedWidget with list of resources XtVaTypedArg cause core dump
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 21c1cc98d8210a3ce2a4bf62ecee9168fdd99dcb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Feb 2 22:42:13 2011 -0800
+
+ Remove unused #ifdef UNALIGNED version of Xt macros & functions
+
+ Trying to outsmart the compiler and libc is a losing battle, but
+ since UNALIGNED was never defined, we weren't even trying.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19538f2b4553221b35831e13ec70ed9db436dd32
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:44 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am])
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit 7fd1e98987967b23f66da4b18ebf9798a68cd370
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 16:07:07 2011 -0500
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ This silences an Automake warning.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 84e512a94295387bd0625ce619fc8bd381395c71
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Dec 22 10:49:42 2010 -0800
+
+ Convert ALLOCATE_LOCAL + sprintf to XtAsprintf
+
+ Now that we don't need to separately strlen the format string, put it
+ directly into the function call to clear gcc warnings of:
+ Initialize.c:397: warning: format not a string literal, argument types not checked
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c80650fddec8596ef7278e37aa12ce2076c54e93
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 9 23:36:31 2010 -0800
+
+ Convert ResConfig.c to use XtAsprintf() instead of XtMalloc + sprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ac07da253415ccb8b6322feedf7969967357050e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jan 12 23:09:29 2011 -0800
+
+ Add XtAsprintf() as a new exported API
+
+ Like asprintf() but using XtMalloc() to tie into the Xt memory allocation
+ and error handling subsystems.
+
+ Bumps libXt version to 1.0.99.1 so that modules can set their pkg-config
+ dependency to libXt >= 1.0.99.1 to require XtAsprintf().
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 84f73c49db8071c06f27609ce7cc7a32a17351a9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 9 23:44:42 2010 -0800
+
+ Convert some sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 14145f3e87a039640cd8bdb2e2f4f30ca9b2a710
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Dec 5 01:21:06 2010 -0800
+
+ config: AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a73b8f06b95216083c8335fad45dd0de7f44a529
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Dec 5 01:19:10 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2bf988d229d2b85208cc42094ce7202204d628af
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Dec 5 00:33:44 2010 -0800
+
+ Remove ancient #if defined(macII) hack for A/UX from makestrs.c
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 96508e1b9da790d4b824a42246d1e86379101733
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Dec 5 00:19:30 2010 -0800
+
+ Remove non-USE_SNPRINTF case from src/Error.c
+
+ unifdef -DUSE_SNPRINTF src/Error.c
+ Plus manual removal of old #ifdef notyet section that said not enough
+ platforms had snprintf support yet. Welcome to the new millenium!
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0b780f8cc8bc2606fc3173628c4d3065aae190f8
+Author: walter harms <wharms@bfs.de>
+Date: Sun Nov 7 18:51:19 2010 +0100
+
+ remove strcmp in src/ResConfig.c
+
+ Make remainder check like in the rest of code and replace strcmp()
+
+ Signed-off-by: walter harms <wharms@bfs.de>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 59598f20ba160fd92abcf88a30f0008425e7b1ec
+Author: walter harms <wharms@bfs.de>
+Date: Tue Oct 26 13:46:32 2010 +0200
+
+ QueryEventMask: fix NULL check
+
+ _XtGetPerWidgetInput may return NULL
+ avoid possible NULL references
+
+ Signed-off-by: walter harms <wharms@bfs.de>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8572cba2b9094dcd8ee5b4c5bcf3c38f1f291918
+Author: walter harms <wharms@bfs.de>
+Date: Sat Oct 30 10:47:23 2010 +0200
+
+ src/Resource.c: Fix possible NULL access
+
+ Signed-off-by: walter harms <wharms@bfs.de>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6c75b449f6436b787247e164bee03691af2a4f55
+Author: walter harms <wharms@bfs.de>
+Date: Fri Oct 29 17:24:48 2010 +0200
+
+ XtFree() can handle NULL , remove check
+
+ Signed-off-by: walter harms <wharms@bfs.de>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0d29ca61b94cd34b04c5eedae443620a616d01c3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 28 12:03:25 2010 -0700
+
+ libXt 1.0.9
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 87d019acc715c5ab4a5b2431ec882a0f84946c20
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:03 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit aa70c813f6eac2cad2944a98a1a444ea69dc024f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 5 09:07:30 2010 -0400
+
+ makestrs: Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9d80fae6bc2cff26f320ff5b7b2ca7333ab3d677
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 5 09:04:19 2010 -0400
+
+ makestrs: Use $(SED) from AC_PROG_SED supplied by XORG_DEFAULT_OPTIONS
+
+ Use the appropriate platform version of sed
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 71a7e999a4d99aa54ea7268b928d87e27cea6279
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 5 09:02:41 2010 -0400
+
+ makestrs: remove unsed $(appman_DATA)
+
+ Man page is not installed, this variable is not defined.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0c968d108d8575db0149922b8375533fc54d0b7a
+Author: walter harms <wharms@bfs.de>
+Date: Fri Oct 1 15:13:43 2010 +0200
+
+ Honor that GetClassActions() may return NULL.
+
+ Signed-off-by: Walter <wharms@bfs.de>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6e4dbf06d4d049666cf81207d9f853a0a40c71b7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Sep 23 18:27:46 2010 -0700
+
+ Sun's copyrights belong to Oracle now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 94680a56a32ada91f07db34e02a526dca5ecbbf4
+Author: Ryan Hajdaj <rhajdaj@gotnothin.com>
+Date: Thu Sep 23 18:13:28 2010 -0700
+
+ Bug 1478: Selection.c damages user error handler function
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=1478
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d53a3deb52100596bef9fb7b6c6e7ba15ed18bda
+Author: walter harms <wharms@bfs.de>
+Date: Wed Sep 22 19:25:20 2010 +0200
+
+ fix dereference in TMprint.c
+
+ the current codes checks for
+ eventWidget == NULL after accessing
+ eventWidget->core.tm.proc_table
+
+ now it checks for eventWidget before access eventWidget->core.tm.proc_table.
+
+ Signed-off-by: walter harms <wharms@bfs.de>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 47e73791d4a88e59a797e9dde1ab2d5f58ff774c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Aug 17 10:17:57 2010 -0400
+
+ man: whitespace management
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8c307c168c724368be2b9e784365b40d4b001aa3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Aug 17 09:21:36 2010 -0400
+
+ man: store shadow man pages in git rather than generating them
+
+ Simplify the build process and the makefile.
+
+ Local fix in CVS for bug 5628 is not required
+ as the problem has been fixed in
+ util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 198ac897c7136425a20011a6c99f80cb925d622b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Aug 6 12:32:10 2010 -0400
+
+ man: using the C preprocessor is not required for man pages.
+
+ There were no special symbols needing cpp.
+ Everything can be handled by the default MAN_SUBSTS in util-macros.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 74cb722a974010fa3c82dc57a036f97768b3695b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 20:26:29 2010 -0700
+
+ Move Xt specs from xorg-docs module
+
+ For now, just checked in and included in dist tarballs, not processed
+ into a usable format - same as it was in xorg-docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 56621d3ec521dd30fabb1a77ad1c396baa740569
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue May 18 18:21:32 2010 -0700
+
+ Move sm from Requires to Requires.private in xt.pc
+
+ As explained in https://bugs.freedesktop.org/show_bug.cgi?id=26943
+ since libXt callers need the SM headers but don't necessarily need to
+ link directly to libSM, it should be in Requires.private, not Requires.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f3d2ac478918b99c51e0b4bff97935f2255ab537
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Apr 16 16:08:39 2010 -0700
+
+ Bug 26943: wrong dependencies in xt.pc.in
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=26943
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 723d78fe8e159dee1281f3e4f8dc03825aa334b6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Apr 1 20:30:43 2010 -0400
+
+ config: update and relocate AX_DEFINE_DIR macro
+
+ Remove deprecated acinclude.m4 macro container file
+ Use separate macro files as per autoconf recommendation
+ Use the latest macro from GNU
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 99a1c1f2cfa595500704d54e223f1c9e0ff9a10e
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Fri Apr 2 01:43:22 2010 -0500
+
+ Use automake silent rules for BUILT_SOURCES generation
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Acked-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cf3198fdc302bb017e6cc8014abc3bdbfeb9f6b1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 16:50:34 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5a876831762c5d22101bd2fa71203647858f66b2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 14:53:49 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cba12c108da0c3eb868a5cb08f641b6d036e0d05
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 27 16:30:02 2010 -0400
+
+ config: remove execute permission on configureation file
+
+ Introduced in commit 6baea764567c3327f1d85ba91375adaea6dab46d
+ "Link with winsock for WIN32 platforms"
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit e3bce11a8ea7e0175a6f08367bace9b0eb2b898a
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Mar 15 22:59:04 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index 1996a67..05c5b52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-libxt (1:1.0.9-3) UNRELEASED; urgency=low
+libxt (1:1.1.0-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Delete libtool m4 files in clean.
- -- Julien Cristau <jcristau@debian.org> Tue, 08 Feb 2011 16:56:13 +0100
+ [ Cyril Brulebois ]
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:07:40 +0100
libxt (1:1.0.9-2) unstable; urgency=low
commit 994443524ade46bad03eea0acbd1410d561c591d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 4 16:30:58 2011 -0800
configure: Bump version to 1.1.0 for release
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 2c35ea4..e268aa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXt], [1.0.99.1],
+AC_INIT([libXt], [1.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXt])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit c0a233895cc8270ec0ff0bd2abb88d3f6dd524c3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 4 12:49:48 2011 -0800
darwin: Don't use poll() when expected to run on darwin10 and prior
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 77ce341..2c35ea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,11 +67,25 @@ AC_SUBST(LDFLAGS_FOR_BUILD)
# Map function checks to old Imake #defines
case $host_os in
- # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
- darwin*) ;;
+ # darwin through Snow Leopard has poll() but can't be used to poll character devices.
+ darwin@<:@789@:>@*|darwin10*) ;;
+ darwin*)
+ _ac_xorg_macosx_version_min=""
+ if echo $CPPFLAGS $CFLAGS | grep -q mmacosx-version-min ; then
+ _ac_xorg_macosx_version_min=`echo $CPPFLAGS $CFLAGS | sed 's/^.*-mmacosx-version-min=\(@<:@^ @:>@*\).*$/\1/'`
+ else
+ _ac_xorg_macosx_version_min=$MACOSX_DEPLOYMENT_TARGET
+ fi
+ case $_ac_xorg_macosx_version_min in
+ 10.@<:@0123456@:>@|10.@<:@0123456@:>@.*) ;;
+ *)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+ ;;
+ esac
+ unset _ac_xorg_macosx_version_min
+ ;;
*)
- AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
- [Define to 1 if you have the "poll" function.]))
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
;;
esac
commit abf6062715c7d1390e516261a31abde4ed7ea64e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 23:29:46 2011 -0800
Shell.c: TopLevelSetValues ignores iconic state if shell not yet realized
Fix originally created by Leo Binchy for Sun to fix Solaris bug
1243761 The XmNiconic resource doesn't work
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Shell.c b/src/Shell.c
index ef6dad2..8a44651 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -2482,6 +2482,10 @@ static Boolean TopLevelSetValues(
XFree((XPointer)icon_name.value);
}
}
+ else if (new->topLevel.iconic != old->topLevel.iconic) {
+ if (new->topLevel.iconic)
+ new->wm.wm_hints.initial_state = IconicState;
+ }
return False;
}
commit b1eaa18835ec7c3a11e580340625b35c18edf7ca
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 23:21:02 2011 -0800
GetResources: protect against underflow when type conversion fails
Fix originally created by Leo Binchy for Sun to fix Solaris bug 1211553:
XtVaCreateManagedWidget with list of resources XtVaTypedArg cause core dump
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Resources.c b/src/Resources.c
index 304d3d5..dc0f563 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -857,7 +857,7 @@ static XtCacheRef *GetResources(
register XtTypedArg* arg = typed_args + typed[j] - 1;
register int i;
- for (i = num_typed_args - typed[j]; i; i--, arg++) {
+ for (i = num_typed_args - typed[j]; i > 0; i--, arg++) {
*arg = *(arg+1);
}
num_typed_args--;
commit 21c1cc98d8210a3ce2a4bf62ecee9168fdd99dcb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 22:42:13 2011 -0800
Remove unused #ifdef UNALIGNED version of Xt macros & functions
Trying to outsmart the compiler and libc is a losing battle, but
since UNALIGNED was never defined, we weren't even trying.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
index 26d6036..845ab48 100644
--- a/include/X11/IntrinsicI.h
+++ b/include/X11/IntrinsicI.h
@@ -108,37 +108,6 @@ SOFTWARE.
#define _XBCOPYFUNC _XtBcopy
#include <X11/Xfuncs.h>
-/* If the alignment characteristics of your machine are right, these may be
- faster */
-
-#ifdef UNALIGNED
-
-#define XtMemmove(dst, src, size) \
- if ((char *)(dst) != (char *)(src)) { \
- if (size == sizeof(int)) \
- *((int *) (dst)) = *((int *) (src)); \
- else if (size == sizeof(char)) \
- *((char *) (dst)) = *((char *) (src)); \
- else if (size == sizeof(short)) \
- *((short *) (dst)) = *((short *) (src)); \
- else \
- (void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
- }
-
-#define XtBZero(dst, size) \
- if (size == sizeof(int)) \
- *((int *) (dst)) = 0; \
- else \
- bzero((char *) (dst), (int) (size))
-
-#define XtMemcmp(b1, b2, size) \
- (size == sizeof(int) ? \
- *((int *) (b1)) != *((int *) (b2)) \
- : memcmp((char *) (b1), (char *) (b2), (int) (size)) \
- )
-
-#else
-
#define XtMemmove(dst, src, size) \
if ((char *)(dst) != (char *)(src)) { \
(void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
@@ -150,8 +119,6 @@ SOFTWARE.
#define XtMemcmp(b1, b2, size) \
memcmp((char *) (b1), (char *) (b2), (int) (size))
-#endif
-
/****************************************************************
*
diff --git a/src/Resources.c b/src/Resources.c
index 67d6860..304d3d5 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -109,92 +109,6 @@ void _XtCopyFromParent(
} /* _XtCopyFromParent */
-/* If the alignment characteristics of your machine are right, these may be
- faster */
-
-#ifdef UNALIGNED
-
-void _XtCopyFromArg(
- XtArgVal src,
- char* dst,
- register unsigned int size)
-{
- if (size == sizeof(long)) *(long *)dst = (long)src;
- else if (size == sizeof(short)) *(short *)dst = (short)src;
- else if (size == sizeof(char)) *(char *)dst = (char)src;
- else if (size == sizeof(XtPointer)) *(XtPointer *)dst = (XtPointer)src;
- else if (size == sizeof(char*)) *(char **)dst = (char*)src;
- else if (size == sizeof(XtArgVal)) *(XtArgVal *)dst = src;
- else if (size > sizeof(XtArgVal))
- (void) memmove((char *) dst, (char *) src, (int) size);
- else
- (void) memmove((char *) dst, (char *) &src, (int) size);
-} /* _XtCopyFromArg */
-
-void _XtCopyToArg(
- char* src,
- XtArgVal *dst,
- register unsigned int size)
-{
- if (! (*dst)) {
-#ifdef GETVALUES_BUG
- /* old GetValues semantics (storing directly into arglists) are bad,
- * but preserve for compatibility as long as arglist contains NULL.
- */
- if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src;
- else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src;
- else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src;
- else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src;
- else if (size == sizeof(char*)) *dst = (XtArgVal)*(char**)src;
- else if (size == sizeof(XtArgVal)) *dst = *(XtArgVal*)src;
- else (void) memmove((char*)dst, (char*)src, (int)size);
-#else
- XtErrorMsg("invalidGetValues", "xtGetValues", XtCXtToolkitError,
- "NULL ArgVal in XtGetValues", (String*) NULL, (Cardinal*) NULL);
-#endif
- }
- else {
- /* proper GetValues semantics: argval is pointer to destination */
- if (size == sizeof(long)) *((long*)*dst) = *(long*)src;
- else if (size == sizeof(short)) *((short*)*dst) = *(short*)src;
- else if (size == sizeof(char)) *((char*)*dst) = *(char*)src;
- else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src;
- else if (size == sizeof(char*)) *((char**)*dst) = *(char**)src;
- else if (size == sizeof(XtArgVal)) *((XtArgVal*)*dst)= *(XtArgVal*)src;
- else (void) memmove((char*)*dst, (char*)src, (int)size);
- }
-} /* _XtCopyToArg */
-
-static void CopyToArg(
- char* src,
- XtArgVal *dst,
- register unsigned int size)
-{
- if (! (*dst)) {
- /* old GetValues semantics (storing directly into arglists) are bad,
- * but preserve for compatibility as long as arglist contains NULL.
- */
- if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src;
- else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src;
- else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src;
- else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src;
- else if (size == sizeof(char*)) *dst = (XtArgVal)*(char**)src;
- else if (size == sizeof(XtArgVal)) *dst = *(XtArgVal*)src;
- else (void) memmove((char*)dst, (char*)src, (int)size);
- }
- else {
- /* proper GetValues semantics: argval is pointer to destination */
- if (size == sizeof(long)) *((long*)*dst) = *(long*)src;
- else if (size == sizeof(short)) *((short*)*dst) = *(short*)src;
- else if (size == sizeof(char)) *((char*)*dst) = *(char*)src;
- else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src;
- else if (size == sizeof(char*)) *((char**)*dst) = *(char**)src;
- else if (size == sizeof(XtArgVal)) *((XtArgVal*)*dst)= *(XtArgVal*)src;
- else (void) memmove((char*)*dst, (char*)src, (int)size);
- }
-} /* CopyToArg */
-
-#else
void _XtCopyFromArg(
XtArgVal src,
char* dst,
@@ -313,7 +227,6 @@ static void CopyToArg(
}
} /* CopyToArg */
-#endif
static Cardinal CountTreeDepth(
Widget w)
commit 19538f2b4553221b35831e13ec70ed9db436dd32
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:44 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index 359b2e6..77ce341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,48 +1,57 @@
-dnl
-dnl Copyright © 2003 Keith Packard, Noah Levitt
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Keith Packard not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Keith Packard makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
+#
+# Copyright © 2003 Keith Packard, Noah Levitt
+#
+# 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, and that the name of Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Keith Packard makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libXt], [1.0.99.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXt])
-AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+XORG_CHECK_MALLOC_ZERO
-# Check for progs
-AC_PROG_LIBTOOL
+# Some compilers do not support per target -c and -o flags
AM_PROG_CC_C_O
+# Checks for header files.
+AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>]))
+
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(XT, sm ice x11 xproto kbproto)
+
+# Set-up variables to use build machine compiler when cross-compiling
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
@@ -56,11 +65,6 @@ AC_SUBST(CFLAGS_FOR_BUILD)
LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
AC_SUBST(LDFLAGS_FOR_BUILD)
-PKG_CHECK_MODULES(XT, sm ice x11 xproto kbproto)
-
-# Needed for including Xalloca.h
-AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>]))
-
# Map function checks to old Imake #defines
case $host_os in
# darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
@@ -123,12 +127,11 @@ esac
XT_CFLAGS="$XT_CFLAGS $OS_CFLAGS"
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- util/Makefile
- include/Makefile
- man/Makefile
- specs/Makefile
- xt.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ util/Makefile
+ include/Makefile
+ man/Makefile
+ specs/Makefile
+ xt.pc])
+AC_OUTPUT
commit 7fd1e98987967b23f66da4b18ebf9798a68cd370
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 16:07:07 2011 -0500
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
This silences an Automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f429f12..359b2e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ esac
AC_HAVE_LIBRARY(ws2_32)
Reply to: