Compare commits

..

No commits in common. "a610cb628e65de572447c1aae02668c3d38bdb92" and "e6a151ae036bcc75a7fc6995857c73ce87ef0e84" have entirely different histories.

4 changed files with 4 additions and 55 deletions

View File

@ -1,30 +0,0 @@
diff -Naur libgtop-2.40.0.org/sysdeps/bsd/prockernel.c libgtop-2.40.0.sw/sysdeps/bsd/prockernel.c
--- libgtop-2.40.0.org/sysdeps/bsd/prockernel.c 2022-03-02 01:48:18.960000000 +0000
+++ libgtop-2.40.0.sw/sysdeps/bsd/prockernel.c 2022-03-02 01:54:03.870000000 +0000
@@ -33,7 +33,7 @@
#if (!defined __OpenBSD__) && (!defined __bsdi__)
#include <sys/user.h>
#endif
-#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
+#if !defined(__bsdi__) && !(defined(__FreeBSD__) && (defined(__alpha__) || defined(__sw_64__))) && \
!defined(__NetBSD__)
#include <machine/pcb.h>
#endif
@@ -204,7 +204,7 @@
(char *) &pcb, sizeof (pcb)) == sizeof (pcb))
{
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#ifndef __alpha__
+#if !defined __alpha__ && !defined __sw_64__
#if (__FreeBSD_version >= 300003) || defined(__FreeBSD_kernel__)
buf->kstk_esp = (guint64) pcb.pcb_esp;
buf->kstk_eip = (guint64) pcb.pcb_eip;
@@ -240,7 +240,7 @@
#elif defined(__sparc__)
buf->kstk_esp = (guint64) pcb.pcb_sp;
buf->kstk_eip = (guint64) pcb.pcb_pc;
-#elif defined(__alpha__)
+#elif defined(__alpha__) || defined(__sw_64__)
buf->kstk_esp = (guint64) pcb.pcb_context[9];
buf->kstk_eip = (guint64) pcb.pcb_context[8];
#else

BIN
libgtop-2.40.0.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,10 @@
Name: libgtop2
Version: 2.41.2
Release: 1
Version: 2.40.0
Release: 4
Summary: System status information library (version 2)
License: GPLv2+
URL: https://developer.gnome.org/libgtop/stable/
Source0: https://download.gnome.org/sources/libgtop/2.41/libgtop-%{version}.tar.xz
%ifarch sw_64
Patch1: libgtop-2.40.0-sw.patch
%endif
Source0: https://download.gnome.org/sources/libgtop/2.40/libgtop-%{version}.tar.xz
BuildRequires: gettext glib2-devel gobject-introspection-devel
@ -32,9 +29,6 @@ developing applications that use libgtop2.
%configure --disable-gtk-doc
%make_build
%check
make check
%install
%make_install
%delete_la
@ -45,7 +39,7 @@ make check
%defattr(-,root,root)
%doc AUTHORS
%license COPYING
%{_libexecdir}/*
%{_bindir}/*
%{_libdir}/girepository-1.0/GTop-2.0.typelib
%{_libdir}/libgtop-2.0.so.*
%{_datadir}/locale/*
@ -67,21 +61,6 @@ make check
%{_datadir}/gtk-doc/html/libgtop/*
%changelog
* Mon Jan 8 2024 zhangpan <zhangpan103@h-partners.com> - 2.41.2-1
- update to 2.41.2
* Sat Mar 11 2023 zhangpan <zhangpan103@h-partners.com> - 2.41.1-2
- enable test
* Thu Feb 02 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.41.1-1
- update to 2.41.1
* Fri Nov 18 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 2.40.0-6
- Optimize the patch for add sw architecture
* Mon Nov 14 2022 wuzx<wuzx1226@qq.com> - 2.40.0-5
- Add sw64 architecture
* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.40.0-4
- Rebuild for next release