From f23acdc9bdc2ed80d398dbfdf0852f1a8b82118c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 25 Jan 2011 13:13:43 +0100
Subject: update Xorg to 7.6

---
 package/libXaw/Makefile                |  6 ++----
 package/libXaw/patches/patch-ltmain_sh | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'package/libXaw')

diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 3eed56635..ba6d24f92 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXaw
-PKG_VERSION:=		1.0.7
+PKG_VERSION:=		1.0.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		67662e6b2dceb2907159215c83364c5a
+PKG_MD5SUM:=		ae09e00c5b7e2b12a11a7db4d4b01d73
 PKG_DESCR:=		X11 Athena Widget library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXext libXmu libXpm
@@ -16,8 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--disable-docs
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXaw*.so* ${IDIR_LIBXAW}/usr/lib/
diff --git a/package/libXaw/patches/patch-ltmain_sh b/package/libXaw/patches/patch-ltmain_sh
index d5ae40796..71e99090b 100644
--- a/package/libXaw/patches/patch-ltmain_sh
+++ b/package/libXaw/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- libXaw-1.0.7.orig/ltmain.sh	2009-10-17 07:26:21.000000000 +0200
-+++ libXaw-1.0.7/ltmain.sh	2011-01-15 22:19:32.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
+--- libXaw-1.0.8.orig/ltmain.sh	2010-10-25 19:47:33.000000000 +0200
++++ libXaw-1.0.8/ltmain.sh	2011-01-24 18:43:21.000000000 +0100
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
-- 
cgit v1.2.3