@@ -11,11 +11,6 @@ in util/Makefile.am is wrong because it adds target cflags to the
compilation of makestrs, which is built for the build machine, which
leads to build failures when cross-compiling.
-We also remove the inclusion of <X11/Xos.h> from makestrs.c, because
-it was the only non-standard header being included (and therefore
-possibly requiring special cflags), but it was in reality not useful
-at all to build makestrs.c.
-
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
util/Makefile.am | 1 -
@@ -34,17 +29,5 @@ index dedfa6b..cc6f3fc 100644
makestrs_SOURCES = makestrs.c
-diff --git a/util/makestrs.c b/util/makestrs.c
-index a52866a..00c861f 100644
---- a/util/makestrs.c
-+++ b/util/makestrs.c
-@@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group.
- /* Constructs string definitions */
-
- #include <stdio.h>
--#include <X11/Xos.h>
- #include <stdlib.h>
- #include <unistd.h>
-
--
1.7.9.5
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2013-May/002234.html
-sha256 843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57 libXt-1.1.4.tar.bz2
+# From http://lists.x.org/archives/xorg-announce/2015-April/002594.html
+sha256 46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a libXt-1.1.5.tar.bz2
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXT_VERSION = 1.1.4
+XLIB_LIBXT_VERSION = 1.1.5
XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXT_LICENSE = MIT
Remove part of 0001-util-don-t-link-makestrs-with-target-cflags.patch because it was applied upstream: http://cgit.freedesktop.org/xorg/lib/libXt/commit/util/makestrs.c?id=f9baaf55ff8cbd4bf018a34f181eda30d03b20dc Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- ...-util-don-t-link-makestrs-with-target-cflags.patch | 17 ----------------- package/x11r7/xlib_libXt/xlib_libXt.hash | 4 ++-- package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-)