Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8e3ab6fec4
!27 [sync] PR-25: Modify sw_64 patch use all arch
From: @openeuler-sync-bot 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
2024-07-17 02:43:03 +00:00
yangchenguang
0bce8a68dd Modify sw_64 patch use all arch
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
(cherry picked from commit 432f16a3b6c5ff3c04a858d58fd8cb18e26d8fbf)
2024-07-17 10:35:44 +08:00
openeuler-ci-bot
8fafece3c0
!23 update to 1.3.0
From: @zppzhangpan 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-08-02 08:46:58 +00:00
zhangpan
b37b863c60 update to 1.3.0 2023-07-20 08:16:15 +00:00
openeuler-ci-bot
1a76d0e034
!12 添加sw架构
From: @wuzx065891 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-11-23 02:39:10 +00:00
wzx
ddf176fcc5 Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
2022-11-23 10:03:02 +08:00
openeuler-ci-bot
6bdb480e6c
!16 【轻量级 PR】:disable static library by default
From: @kerongw 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-10-25 03:09:50 +00:00
kerongw
f69b1f7628
disable static library by default
Signed-off-by: kerongw <wangkerong@h-partners.com>
2022-10-25 02:17:16 +00:00
openeuler-ci-bot
78f32fe318
!9 【轻量级 PR】:enable test
From: @kerongw 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-06-11 06:56:32 +00:00
kerongw
528a0bfa70
enable test 2022-06-06 08:10:43 +00:00
4 changed files with 57 additions and 5 deletions

Binary file not shown.

BIN
libXt-1.3.0.tar.gz Normal file

Binary file not shown.

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

@ -1,12 +1,16 @@
%bcond_without static
Name: libXt Name: libXt
Version: 1.2.1 Version: 1.3.0
Release: 1 Release: 2
License: MIT License: MIT
Summary: X.Org X11 libXt runtime library Summary: X.Org X11 libXt runtime library
URL: https://www.x.org URL: https://www.x.org
Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.gz
BuildRequires: xorg-x11-util-macros autoconf automake libtool make Patch1000: libXt-support-sw_64.patch
BuildRequires: xorg-x11-util-macros autoconf automake libtool make glib2-devel
BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm)
Requires: libX11 >= 1.6 Requires: libX11 >= 1.6
@ -29,10 +33,16 @@ The %{name}-devel package contains libraries and header files for %{name}.
%build %build
autoreconf -ivf autoreconf -ivf
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --with-xfile-search-path="%{_sysconfdir}/X11/%%L/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%l/%%T/\%%N%%C%%S:%{_sysconfdir}/X11/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%L/%%T/%%N%%S:%{_sysconfdir}/X\11/%%l/%%T/%%N%%S:%{_sysconfdir}/X11/%%T/%%N%%S:%{_datadir}/X11/%%L/%%T/%%N%%C%%S:%{_datadir}/X1\1/%%l/%%T/%%N%%C%%S:%{_datadir}/X11/%%T/%%N%%C%%S:%{_datadir}/X11/%%L/%%T/%%N%%S:%{_datadir}/X11/%%\l/%%T/%%N%%S:%{_datadir}/X11/%%T/%%N%%S" %configure --enable-unit-tests --with-xfile-search-path="%{_sysconfdir}/X11/%%L/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%l/%%T/\%%N%%C%%S:%{_sysconfdir}/X11/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%L/%%T/%%N%%S:%{_sysconfdir}/X\11/%%l/%%T/%%N%%S:%{_sysconfdir}/X11/%%T/%%N%%S:%{_datadir}/X11/%%L/%%T/%%N%%C%%S:%{_datadir}/X1\1/%%l/%%T/%%N%%C%%S:%{_datadir}/X11/%%T/%%N%%C%%S:%{_datadir}/X11/%%L/%%T/%%N%%S:%{_datadir}/X11/%%\l/%%T/%%N%%S:%{_datadir}/X11/%%T/%%N%%S" \
%if %{with static}
--disable-static
%endif
V=1 %make_build V=1 %make_build
%check
make check
%install %install
%make_install %make_install
mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
@ -50,7 +60,9 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/X11/*.h %{_includedir}/X11/*.h
%{_libdir}/*.so %{_libdir}/*.so
%if %{without static}
%{_libdir}/*.a %{_libdir}/*.a
%endif
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%files help %files help
@ -59,6 +71,21 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
%{_docdir}/%{name}/*.xml %{_docdir}/%{name}/*.xml
%changelog %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
* Wed Nov 23 2022 wuzx<wuzx1226@qq.com> - 1.2.1-4
- Add sw64 architecture
* Sat Oct 22 2022 wangkerong <wangkerong@h-partners.com> - 1.2.1-3
- disable static library by default
* Mon Jun 06 2022 wangkerong <wangkerong@h-partners.com> - 1.2.1-2
- enable test
* Thu Nov 25 2021 xingxing <xingxing9@huawei.com> - 1.2.1-1 * Thu Nov 25 2021 xingxing <xingxing9@huawei.com> - 1.2.1-1
- updata to 1.2.1 - updata to 1.2.1