Modify sw_64 patch use all arch

Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
(cherry picked from commit 432f16a3b6c5ff3c04a858d58fd8cb18e26d8fbf)
This commit is contained in:
yangchenguang 2024-07-17 09:53:44 +08:00 committed by openeuler-sync-bot
parent 8fafece3c0
commit 0bce8a68dd
3 changed files with 31 additions and 15 deletions

View File

@ -1,11 +0,0 @@
diff -Naur libXt-1.2.1.org/include/X11/Xtos.h libXt-1.2.1.sw/include/X11/Xtos.h
--- libXt-1.2.1.org/include/X11/Xtos.h 2022-02-26 01:04:27.600000000 +0000
+++ libXt-1.2.1.sw/include/X11/Xtos.h 2022-02-26 01:05:17.470000000 +0000
@@ -55,6 +55,7 @@
#if defined (_LP64) || \
defined(__alpha) || defined(__alpha__) || \
+ defined(__sw_64) || defined(__sw_64__) || \
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \

25
libXt-support-sw_64.patch Normal file
View File

@ -0,0 +1,25 @@
From d900b21bed8c9ed15c85e2e87f76fbe4d656a3b2 Mon Sep 17 00:00:00 2001
From: yangchenguang <yangchenguang@kylinsec.com.cn>
Date: Wed, 17 Jul 2024 10:09:14 +0800
Subject: [PATCH] libXt support sw_64
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
---
include/X11/Xtos.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
index 84910c0..9a3844d 100644
--- a/include/X11/Xtos.h
+++ b/include/X11/Xtos.h
@@ -59,6 +59,7 @@ SOFTWARE.
# endif
# elif defined (_LP64) || \
defined(__alpha) || defined(__alpha__) || \
+ defined(__sw_64) || defined(__sw_64__) || \
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
--
2.39.1

View File

@ -2,14 +2,13 @@
Name: libXt
Version: 1.3.0
Release: 1
Release: 2
License: MIT
Summary: X.Org X11 libXt runtime library
URL: https://www.x.org
Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.gz
%ifarch sw_64
Patch1: libXt-1.2.1-sw.patch
%endif
Patch1000: libXt-support-sw_64.patch
BuildRequires: xorg-x11-util-macros autoconf automake libtool make glib2-devel
BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm)
@ -72,6 +71,9 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
%{_docdir}/%{name}/*.xml
%changelog
* Wed Jul 17 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 1.3.0-2
- Modify sw_64 patch use all arch
* Thu Jul 20 2023 zhangpan <zhangpan103@h-partners.com> - 1.3.0-1
- update to 1.3.0