.gitignore | 1
ChangeLog | 235 ++++++++++++++++++++++++++++++++++++++++
configure.ac | 10 +
debian/changelog | 11 +
debian/control | 9 -
debian/upstream/signing-key.asc | 60 ++++++++++
debian/watch | 1
include/X11/Intrinsic.h | 10 -
include/X11/IntrinsicP.h | 7 +
include/X11/Xtos.h | 3
src/Alloc.c | 2
src/Error.c | 2
src/Initialize.c | 9 +
src/Intrinsic.c | 3
src/Makefile.am | 6 -
src/ResConfig.c | 6 -
src/Resources.c | 21 ---
src/Shell.c | 16 --
src/TMparse.c | 4
util/Makefile.am | 1
util/makestrs.c | 56 +++++----
21 files changed, 381 insertions(+), 92 deletions(-)
New commits:
commit af9c2aa9e28e83257ae5f020fcc53bd4ec52a1cd
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Oct 28 11:13:57 2015 +0000
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 9c11ba5..d787e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libxt (1:1.1.5-1) UNRELEASED; urgency=medium
+libxt (1:1.1.5-1) unstable; urgency=medium
+ * Team upload.
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper build-dep to 9.
* Bump Standards-Version to 3.9.6 and update Vcs-* control fields.
- -- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:03:02 +0000
+ -- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:13:37 +0000
libxt (1:1.1.4-1) unstable; urgency=low
commit 07a61d7554d5f7fe83dc5d6574c27b3d973492ea
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Oct 28 11:08:19 2015 +0000
Bump Standards-Version to 3.9.6 and update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 5956e77..9c11ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxt (1:1.1.5-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper build-dep to 9.
+ * Bump Standards-Version to 3.9.6 and update Vcs-* control fields.
-- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:03:02 +0000
diff --git a/debian/control b/debian/control
index dba651c..4b1f8eb 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,9 @@ Build-Depends:
# specs
xmlto (>= 0.0.20),
xorg-sgml-doctools (>= 1:1.10),
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxt
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxt.git
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/libxt
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libxt.git
Package: libxt6
Section: libs
commit 48f22bd5cbdb5655bfe5cc4ff205b4409a7cc17b
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Oct 28 11:07:44 2015 +0000
Bump debhelper build-dep to 9.
diff --git a/debian/changelog b/debian/changelog
index 69bf8d8..5956e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxt (1:1.1.5-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
+ * Bump debhelper build-dep to 9.
-- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:03:02 +0000
diff --git a/debian/control b/debian/control
index 0482ece..dba651c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8.9.7),
+ debhelper (>= 9),
dh-autoreconf,
libx11-dev (>= 1:0.99.2),
libsm-dev (>= 1:0.99.1),
commit 1ebb3048f0ce9ea51476ae2107d9e87137f2f1ea
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Oct 28 11:07:12 2015 +0000
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index fe4cf22..69bf8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxt (1:1.1.5-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:03:02 +0000
diff --git a/debian/control b/debian/control
index 4f720a4..0482ece 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: libxt
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 8.9.7),
dh-autoreconf,
commit ae8733bfba9b66ae5512fa8c3f89c2f0e52343f0
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Oct 28 11:03:33 2015 +0000
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 098b6a4..3da9d35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,238 @@
+commit e7411e7e5299116604ff1f01d9415802607f1051
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Apr 30 22:36:14 2015 -0700
+
+ libXt 1.1.5
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0c2c7562426aec7bdf9b54a7d6993153e0bce489
+Author: Yaakov Selkowitz <yselkow...@users.sourceforge.net>
+Date: Sun Aug 10 12:44:26 2014 -0500
+
+ Fix _XtInherit on x86_64 Windows
+
+ As noted in Initialize.c, _XtInherit needs special treatment as it's both
called
+ as a function, and used as a value to compare with.
+
+ We need to change this trickery for x86_64, as the symbols are no longer
+ underscore prefixed, and the address is 64 bits.
+
+ We also cannot place the trampoline in the .data section, as it may be
marked
+ no-execute, so we use a special section for it instead.
+
+ v2: Uses of XtInherit must also be marked dllimport, so that they do not
use a
+ thunk, but instead indirect via the __imp_XtInherit auto-import. This
avoids
+ problems with an incorrect relocation being calculated in the case where
libXt
+ and a library using it (e.g. libXaw/libXaw3d/libXm/etc.) are loaded more
than
+ 2GiB apart from each other.
+
+ This is enough to build a working libXt for Cygwin x86_64, because it uses
the
+ LP64 data model. I believe that more patches are needed for libXt to work
+ correctly when built for the Windows LLP64 data model.
+
+ Signed-off-by: Yaakov Selkowitz <yselkow...@cygwin.com>
+ Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harri...@virgin.net>
+
+commit 171d82fa36bb601360da2cc519718c46f137c467
+Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
+Date: Tue Apr 14 12:21:58 2015 +0100
+
+ Include unistd.h for getpid()
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ Reviewed-by: David Macek <david.mace...@gmail.com>
+
+commit af9c277491c9bdc37a6fc5ae5a6c6ca190bfa56c
+Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
+Date: Tue Apr 14 12:19:07 2015 +0100
+
+ Include direct.h header for _getdrives() on Win32
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ Reviewed-by: David Macek <david.mace...@gmail.com>
+
+commit e7094ceaf95a15eae73819d0ffdb9b982075e0d2
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Feb 14 14:10:21 2015 -0800
+
+ unifdef -UCRAY -UCRAY2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 33a6d9dc30188c02a3ec703153728b31d458ec1e
+Author: Rob Clark <robdcl...@gmail.com>
+Date: Mon Jan 26 11:51:48 2015 -0500
+
+ asprintf needs _GNU_SOURCE on some platforms
+
+ Fixes a build break noticed on fedora 21 on arm (although I doubt that
+ is in any way arch specific).
+
+ http://tinderbox.x.org/builds/2015-01-26-0012/logs/libXt/#build
+
+ Signed-off-by: Rob Clark <robdcl...@gmail.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit ca04f74887d53c75e794f643f7e860ba588c3a57
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 18 11:21:45 2015 -0800
+
+ makestrs: Use asprintf() if available
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Hans de Goede <hdego...@redhat.com>
+
+commit fba83e45a8d5dc2ca920ec6c49446d2b54c2db5c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 18 10:58:08 2015 -0800
+
+ makestrs: Replace strcpy()+strcat() calls with snprintf() calls
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Hans de Goede <hdego...@redhat.com>
+
+commit 47fa41960650dd0e97eb78de2af0f5fcd9323b35
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 18 10:43:11 2015 -0800
+
+ makestrs: Replace malloc()+strcpy() calls with strdup() calls
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Hans de Goede <hdego...@redhat.com>
+
+commit f3e5903536f80cb42ee6841f85e013284eb4c2fc
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 18 10:27:42 2015 -0800
+
+ makestrs: use strchr() instead of index()
+
+ Besides being supported by more standards, strchr() has the important
+ characteristic of having a prototype included in <string.h> on Solaris
+ so that 64-bit compiles know it returns a pointer, not an integer.
+ (On Solaris, index() is only found in <strings.h>, for SunOS
compatibility.)
+
+ Without this fix, makestrs segfaulted in 64-bit builds on Solaris after
+ commit f9baaf55ff8cbd4bf018a34f181eda30d03b20dc switched to <string.h>.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Hans de Goede <hdego...@redhat.com>
+
+commit aed2c4d3493cf3a06ad1240f317552fd8bfd687a
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 18 10:34:38 2015 -0800
+
+ If CFLAGS_FOR_BUILD is not set, include CWARNFLAGS in default value
+
+ Help catch errors like missing prototypes in makestrs sooner.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Hans de Goede <hdego...@redhat.com>
+
+commit f9baaf55ff8cbd4bf018a34f181eda30d03b20dc
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Thu Jan 8 09:18:16 2015 +0100
+
+ Use string.h instead of X11/Xos.h.
+
+ Long long ago, Xos.h was needed to choose between <string.h> &
+ <strings.h> depending on the OS in use.
+
+ Today we can rely on C89 & later providing <string.h> everywhere
+ for us.
+
+ Signed-off-by: Thomas Klausner <w...@netbsd.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 51d63a9d82dc4f2407862131bbf3e5d72b4505d3
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sat Sep 21 12:52:15 2013 -0400
+
+ Use $(MKDIR_P) in Makefile.am for better code portability
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 8828fc21cb5b10f06294e460d15c38e234324960
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Wed Jul 10 08:18:26 2013 -0700
+
+ Revert "Avoid shadowing variables."
+
+ This reverts commit 3919044bd7d3bcb85ce3425a43b8889a248a7542.
+ Breaks programs such as xcalc & xlogo on multiple platforms.
+
+commit 9dc5fb0b9640b79a234b58e640e05d8276556beb
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Tue Jun 25 23:02:48 2013 +0200
+
+ Fix char vs. unsigned char warnings.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3919044bd7d3bcb85ce3425a43b8889a248a7542
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Tue Jun 25 23:02:46 2013 +0200
+
+ Avoid shadowing variables.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit d395f487e659ee1091eb60c89c551ba1b61dfe51
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Tue Jun 25 23:02:50 2013 +0200
+
+ Ignore test-driver from automake-1.13.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 71c76a6c500761a2ca0091a55b8c106906fcb125
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Wed Jun 26 00:43:03 2013 +0200
+
+ Mark non-returning function with appropriate attribute.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit ce57783ea5b5c47f5dca172d36a76f91dd7704df
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Wed Jun 26 00:43:32 2013 +0200
+
+ Use appropriate variable type for vsnprintf return value.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0bf255ce5f2aeacece0b685996491729f804fe94
+Author: Thierry Reding <thierry.red...@avionic-design.de>
+Date: Thu Jan 3 10:16:55 2013 +0100
+
+ Fix cross-compilation
+
+ When cross-compiling against a sysroot for instance, a --sysroot option
+ is typically passed via the CPPFLAGS variable. This can cause the build
+ to break in the util subdirectory which requires the CPPFLAGS to be set
+ for the build system.
+
+ Solve this by using the value of CPPFLAGS_FOR_BUILD for CPPFLAGS in the
+ util subdirectory. Cross-compile setups can override the variable when
+ calling the configure script.
+
+ Signed-off-by: Thierry Reding <thierry.red...@avionic-design.de>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 02fd80afd5d2416301e5166e202ff859902c7987
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Sun Jun 2 21:48:38 2013 +0200
+
+ Add missing comma to fix DEBUG build.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit e83d6d66ea28b0aaa7e574dd2471121a5250b934
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu May 30 18:13:27 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index a38a0de..fe4cf22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libxt (1:1.1.4-2) UNRELEASED; urgency=medium
+libxt (1:1.1.5-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Let uscan verify tarball signatures.
- -- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:02:28 +0000
+ -- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:03:02 +0000
libxt (1:1.1.4-1) unstable; urgency=low
commit 3a24a08be16a807a4019c15393bc83af87087a61
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Oct 28 11:02:41 2015 +0000
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 5fc347c..a38a0de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxt (1:1.1.4-2) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcris...@debian.org> Wed, 28 Oct 2015 11:02:28 +0000
+
libxt (1:1.1.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..863981f
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,60 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
+Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
+EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
+a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
+8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
+Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
+xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
+CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
+TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
+ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP
+cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g
+Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO
+6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu
+QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
+BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY
+eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS
+Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
+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
+=tc6G
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 6944267..15384fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/lib/libXt
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/lib/ libXt-(.*)\.tar\.gz
commit e7411e7e5299116604ff1f01d9415802607f1051
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Apr 30 22:36:14 2015 -0700
libXt 1.1.5
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index e60e88d..d903cb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXt], [1.1.4],
+AC_INIT([libXt], [1.1.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXt])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 0c2c7562426aec7bdf9b54a7d6993153e0bce489
Author: Yaakov Selkowitz <yselkow...@users.sourceforge.net>
Date: Sun Aug 10 12:44:26 2014 -0500
Fix _XtInherit on x86_64 Windows
As noted in Initialize.c, _XtInherit needs special treatment as it's both
called
as a function, and used as a value to compare with.
We need to change this trickery for x86_64, as the symbols are no longer
underscore prefixed, and the address is 64 bits.
We also cannot place the trampoline in the .data section, as it may be
marked
no-execute, so we use a special section for it instead.
v2: Uses of XtInherit must also be marked dllimport, so that they do not
use a
thunk, but instead indirect via the __imp_XtInherit auto-import. This avoids
problems with an incorrect relocation being calculated in the case where
libXt
and a library using it (e.g. libXaw/libXaw3d/libXm/etc.) are loaded more
than
2GiB apart from each other.
This is enough to build a working libXt for Cygwin x86_64, because it uses
the
LP64 data model. I believe that more patches are needed for libXt to work
correctly when built for the Windows LLP64 data model.
Signed-off-by: Yaakov Selkowitz <yselkow...@cygwin.com>
Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harri...@virgin.net>
diff --git a/include/X11/IntrinsicP.h b/include/X11/IntrinsicP.h
index bb6570b..f2ded6f 100644
--- a/include/X11/IntrinsicP.h
+++ b/include/X11/IntrinsicP.h
@@ -266,7 +266,12 @@ extern Widget _XtWindowedAncestor( /* internal;
implementation-dependent */
Widget /* object */
);
-extern void _XtInherit(
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(LIBXT_COMPILATION)
+__declspec(dllimport)
+#else
+extern
+#endif
+void _XtInherit(
void
);
diff --git a/src/Initialize.c b/src/Initialize.c
index 9783deb..61c8575 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -245,11 +245,20 @@ void _XtInherit(void)
* cygwin-xfree: http://www.cygwin.com/ml/cygwin-xfree/2003-10/msg00000.html
*/
+#ifdef __x86_64__
+asm (".section .trampoline, \"dwx\" \n\
+ .globl _XtInherit \n\
+ _XtInherit: \n\
+ jmp *_y(%rip) \n\
+_y: .quad __XtInherit \n\
+ .text \n");
+#else
asm (".data\n\
.globl __XtInherit \n\
__XtInherit: jmp *_y \n\
_y: .long ___XtInherit \n\
.text \n");
+#endif
#define _XtInherit __XtInherit
#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c1a664..7f8ba6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ SRCH_DEFINES =
-DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\"
ERRORDB_DEFINES = -DERRORDB=\"$(ERRORDBDIR)/XtErrorDB\"
AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \
- $(XTMALLOC_ZERO_CFLAGS)
+ $(XTMALLOC_ZERO_CFLAGS) -DLIBXT_COMPILATION
AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include -I$(top_builddir)/include/X11
commit 171d82fa36bb601360da2cc519718c46f137c467
Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Tue Apr 14 12:21:58 2015 +0100
Include unistd.h for getpid()
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
Reviewed-by: David Macek <david.mace...@gmail.com>
diff --git a/src/Shell.c b/src/Shell.c
index 2a627cc..f160527 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -87,6 +87,7 @@ in this Software without prior written authorization from The
Open Group.
#include <X11/ICE/ICElib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#ifdef EDITRES
#include <X11/Xmu/Editres.h>
commit af9c277491c9bdc37a6fc5ae5a6c6ca190bfa56c
Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Tue Apr 14 12:19:07 2015 +0100
Include direct.h header for _getdrives() on Win32
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
Reviewed-by: David Macek <david.mace...@gmail.com>
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index 29bf716..7119b09 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -81,6 +81,9 @@ in this Software without prior written authorization from The
Open Group.
#ifndef VMS
#include <sys/stat.h>
#endif /* VMS */
+#ifdef WIN32
+#include <direct.h> /* for _getdrives() */
+#endif
#include <stdlib.h>
commit e7094ceaf95a15eae73819d0ffdb9b982075e0d2
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Feb 14 14:10:21 2015 -0800
unifdef -UCRAY -UCRAY2
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h
index d09acad..794b820 100644
--- a/include/X11/Intrinsic.h
+++ b/include/X11/Intrinsic.h
@@ -147,15 +147,9 @@ typedef int XtCacheType;
* ArgLists rely heavily on the above typedef.
*
****************************************************************/
-#ifdef CRAY
-typedef long Boolean;
-typedef char* XtArgVal;
-typedef long XtEnum;
-#else
typedef char Boolean;
typedef long XtArgVal;
typedef unsigned char XtEnum;
-#endif
typedef unsigned int Cardinal;
typedef unsigned short Dimension; /* Size in pixels */
@@ -1663,12 +1657,8 @@ extern void XtGetConstraintResourceList(
#define XtDefaultFont "XtDefaultFont"
#define XtDefaultFontSet "XtDefaultFontSet"
-#if defined(CRAY)
-#define XtOffset(p_type,field) _Offsetof(p_type,field)
-#else /* ! CRAY */
#define XtOffset(p_type,field) \
((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-#endif /* !CRAY */
#ifdef offsetof
#define XtOffsetOf(s_type,field) offsetof(s_type,field)
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
index 7079321..64b2da8 100644
--- a/include/X11/Xtos.h
+++ b/include/X11/Xtos.h
@@ -52,9 +52,6 @@ SOFTWARE.
#define DEALLOCATE_LOCAL_FALLBACK(_ptr) XtFree((XtPointer)(_ptr))
#include <X11/Xalloca.h>
-#ifdef CRAY
-#define WORD64
-#endif
#if defined (_LP64) || \
defined(__alpha) || defined(__alpha__) || \
diff --git a/src/Resources.c b/src/Resources.c
index 1d2871c..9e0f065 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -86,11 +86,6 @@ static XrmName Qtranslations, QbaseTranslations;
static XrmName Qscreen;
static XrmClass QScreen;
-#ifdef CRAY
-void Cjump();
-char *Cjumpp = (char *) Cjump;
-void Cjump() {}
-#endif
void _XtCopyFromParent(
Widget widget,
@@ -781,13 +776,6 @@ static XtCacheRef *GetResources(
/* Convert default value to proper type */
xrm_default_type = rx->xrm_default_type;
if (xrm_default_type == QCallProc) {
-#ifdef CRAY
- if ( (int) Cjumpp != (int) Cjump)
- (*(XtResourceDefaultProc)
- (((int)(rx->xrm_default_addr))<<2))(
- widget,-(rx->xrm_offset+1), &value);
- else
-#endif
(*(XtResourceDefaultProc)(rx->xrm_default_addr))(
widget,-(rx->xrm_offset+1), &value);
@@ -1123,15 +1111,6 @@ void _XtGetApplicationResources (
XtNumber(quark_cache), &quark_args);
/* Compile resource list if needed */
if (((int) resources->resource_offset) >= 0) {
-#ifdef CRAY2
- if (base == 0) { /* this client is non-portable, but... */
- int count;
- XtResourceList res = resources;
- for (count = 0; count < num_resources; res++, count++) {
- res->resource_offset *= sizeof(long);
- }
- }
-#endif /* CRAY2 */
XrmCompileResourceListEphem(resources, num_resources);
}
table = _XtCreateIndirectionTable(resources,num_resources);
diff --git a/src/Shell.c b/src/Shell.c
index 8a44651..2a627cc 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -108,17 +108,10 @@ in this Software without prior written authorization from
The Open Group.
*
***************************************************************************/
-#ifdef CRAY
-void _XtShellDepth(Widget, int, XrmValue *);
-void _XtShellColormap(Widget, int, XrmValue *);
-void _XtShellAncestorSensitive(Widget, int, XrmValue *);
-void _XtTitleEncoding(Widget, int, XrmValue *);
-#else
static void _XtShellDepth(Widget, int, XrmValue *);
static void _XtShellColormap(Widget, int, XrmValue *);
static void _XtShellAncestorSensitive(Widget, int, XrmValue *);
static void _XtTitleEncoding(Widget, int, XrmValue *);
-#endif
/***************************************************************************
*
@@ -931,9 +924,7 @@ static void XtCopyDefaultDepth(
value->addr = (XPointer)(&DefaultDepthOfScreen(XtScreenOfObject(widget)));
}
-#ifndef CRAY
static
-#endif
void _XtShellDepth(
Widget widget,
int closure,
@@ -952,9 +943,7 @@ static void XtCopyDefaultColormap(
value->addr =
(XPointer)(&DefaultColormapOfScreen(XtScreenOfObject(widget)));
}
-#ifndef CRAY
static
-#endif
void _XtShellColormap(
Widget widget,
int closure,
@@ -965,9 +954,7 @@ void _XtShellColormap(
else _XtCopyFromParent (widget,closure,value);
}
-#ifndef CRAY
static
-#endif
void _XtShellAncestorSensitive(
Widget widget,
int closure,
@@ -979,9 +966,7 @@ void _XtShellAncestorSensitive(
}
/*ARGSUSED*/
-#ifndef CRAY
static
-#endif
void _XtTitleEncoding(
Widget widget,
int offset,
commit 33a6d9dc30188c02a3ec703153728b31d458ec1e
Author: Rob Clark <robdcl...@gmail.com>
Date: Mon Jan 26 11:51:48 2015 -0500
asprintf needs _GNU_SOURCE on some platforms
Fixes a build break noticed on fedora 21 on arm (although I doubt that
is in any way arch specific).
http://tinderbox.x.org/builds/2015-01-26-0012/logs/libXt/#build
Signed-off-by: Rob Clark <robdcl...@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 3633ec6..e60e88d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ fi
AC_SUBST([CC_FOR_BUILD])
DEFAULT_CPPFLAGS_FOR_BUILD="${CPPFLAGS}"
AC_CHECK_FUNC(asprintf,
- [DEFAULT_CPPFLAGS_FOR_BUILD="${DEFAULT_CPPFLAGS_FOR_BUILD} -DHAVE_ASPRINTF"])
+ [DEFAULT_CPPFLAGS_FOR_BUILD="${DEFAULT_CPPFLAGS_FOR_BUILD} -DHAVE_ASPRINTF
-D_GNU_SOURCE"])
CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${DEFAULT_CPPFLAGS_FOR_BUILD}}
AC_SUBST(CPPFLAGS_FOR_BUILD)
DEFAULT_CFLAGS_FOR_BUILD="${CFLAGS} ${CWARNFLAGS}"
commit ca04f74887d53c75e794f643f7e860ba588c3a57
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sun Jan 18 11:21:45 2015 -0800
makestrs: Use asprintf() if available
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 34e6aab..3633ec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,10 @@ if test x"$CC_FOR_BUILD" = x; then
fi
fi
AC_SUBST([CC_FOR_BUILD])
-CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
+DEFAULT_CPPFLAGS_FOR_BUILD="${CPPFLAGS}"
+AC_CHECK_FUNC(asprintf,
+ [DEFAULT_CPPFLAGS_FOR_BUILD="${DEFAULT_CPPFLAGS_FOR_BUILD} -DHAVE_ASPRINTF"])
+CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${DEFAULT_CPPFLAGS_FOR_BUILD}}
AC_SUBST(CPPFLAGS_FOR_BUILD)
DEFAULT_CFLAGS_FOR_BUILD="${CFLAGS} ${CWARNFLAGS}"
CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${DEFAULT_CFLAGS_FOR_BUILD}}
diff --git a/util/makestrs.c b/util/makestrs.c
index f872ec8..5764849 100644
--- a/util/makestrs.c
+++ b/util/makestrs.c
@@ -90,19 +90,26 @@ static int solaris_abi_names = FALSE;
static char* includedir = NULL;
static FILE *ifopen(const char *file, const char *mode)
{
+#ifndef HAVE_ASPRINTF
size_t len;
+#endif
char *buffer;
FILE *ret;
if (includedir == NULL)
return fopen(file, mode);
+#ifdef HAVE_ASPRINTF
+ if (asprintf(&buffer, "%s/%s", includedir, file) == -1)
+ return NULL;
+#else
len = strlen(file) + strlen(includedir) + 1;
buffer = (char*)malloc(len + 1);
if (buffer == NULL)
return NULL;
snprintf(buffer, len + 1, "%s/%s", includedir, file);
+#endif
ret = fopen(buffer, mode);
@@ -269,13 +276,23 @@ static void WriteHeader (char *tagline, File *phile, int
abi)
/* do the right thing for Motif, i.e. avoid _XmXmStrDefs_h_ */
if (strcmp (prefixstr, "Xm") == 0) {
+#ifdef HAVE_ASPRINTF
+ if (asprintf (&fileprotstr, "_%s_", phile->name) == -1)
+ exit (1);
+#else
if ((fileprotstr = malloc (strlen (phile->name) + 3)) == NULL)
exit (1);
(void) sprintf (fileprotstr, "_%s_", phile->name);
+#endif
} else {
+#ifdef HAVE_ASPRINTF
+ if (asprintf (&fileprotstr, "_%s%s_", prefixstr, phile->name) == -1)
+ exit (1);
+#else
if ((fileprotstr = malloc (strlen (phile->name) + strlen (prefixstr) +
3)) == NULL)
exit (1);
(void) sprintf (fileprotstr, "_%s%s_", prefixstr, phile->name);
+#endif
}
for (tmp = fileprotstr; *tmp; tmp++) if (*tmp == '.') *tmp = '_';
commit fba83e45a8d5dc2ca920ec6c49446d2b54c2db5c
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sun Jan 18 10:58:08 2015 -0800
makestrs: Replace strcpy()+strcat() calls with snprintf() calls
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
diff --git a/util/makestrs.c b/util/makestrs.c
index 7853f87..f872ec8 100644
--- a/util/makestrs.c
+++ b/util/makestrs.c
@@ -102,9 +102,7 @@ static FILE *ifopen(const char *file, const char *mode)
if (buffer == NULL)
return NULL;
- strcpy(buffer, includedir);
- strcat(buffer, "/");
- strcat(buffer, file);
+ snprintf(buffer, len + 1, "%s/%s", includedir, file);
ret = fopen(buffer, mode);
@@ -580,8 +578,7 @@ static void DoLine(char *buf)
else
right = buf + 1;
if (buf[0] == 'H') {
- strcpy (lbuf, prefixstr);
- strcat (lbuf, right);
+ snprintf (lbuf, sizeof(lbuf), "%s%s", prefixstr, right);
right = lbuf;
}
commit 47fa41960650dd0e97eb78de2af0f5fcd9323b35
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sun Jan 18 10:43:11 2015 -0800
makestrs: Replace malloc()+strcpy() calls with strdup() calls
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
diff --git a/util/makestrs.c b/util/makestrs.c
index 2c4dcc8..7853f87 100644
--- a/util/makestrs.c
+++ b/util/makestrs.c
@@ -498,9 +498,8 @@ static void DoLine(char *buf)
if ((phile = (File*) malloc (sizeof(File))) == NULL)
exit(1);
- if ((phile->name = malloc (strlen (buf + strlen (file_str)) + 1))
== NULL)
+ if ((phile->name = strdup (buf + strlen (file_str) + 1)) == NULL)
exit(1);
- (void) strcpy (phile->name, buf + strlen (file_str) + 1);
phile->table = NULL;
phile->tablecurrent = NULL;
phile->tabletail = &phile->table;
@@ -517,9 +516,8 @@ static void DoLine(char *buf)
Table* table;
