diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/libgtop')
4 files changed, 12 insertions, 98 deletions
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch deleted file mode 100644 index 1bd6e101b5..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e865a93000913b4597607289356114cd159f4e28 Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Fri, 21 May 2021 03:02:29 +0000 -Subject: [PATCH] fix compile error for cross compile - -On some distros, such as fedora32, cross compile failed with following -error since host library is used. undefined reference to -`stat64@GLIBC_2.33' - -According doc of ld, set searchdir begins with "=", but not hardcoded -locations. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/26] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 472f44b..ed6a4d7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -270,8 +270,8 @@ AC_ARG_ENABLE(fatal-warnings, - [Define to enable fatal warnings])) - - dnl These definitions are expanded in make. --LIBGTOP_LIBS='-L$(libdir)' --LIBGTOP_INCS='-I$(includedir)/libgtop-2.0' -+LIBGTOP_LIBS='-L=$(libdir)' -+LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0' - - if test x$libgtop_have_sysinfo = xyes ; then - LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO" --- -2.26.2 - diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch deleted file mode 100644 index c4f7da4bf6..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 09:17:29 -0700 -Subject: [PATCH] netload: Include libc net headers unconditionally - -This fixes compile with musl, and this conditional -is not needed now a days if we are still using glibc < 1.0 -we have other bigger problems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sysdeps/linux/netload.c | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c -index c275db2..446bddd 100644 ---- a/sysdeps/linux/netload.c -+++ b/sysdeps/linux/netload.c -@@ -34,8 +34,6 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - --#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 --/* GNU LibC */ - #include <net/if.h> - #include <netinet/ip_icmp.h> - #include <netinet/in.h> -@@ -43,15 +41,6 @@ - #include <netinet/tcp.h> - #include <netinet/udp.h> - #include <net/if.h> --#else /* Libc 5 */ --#include <linux/if.h> --#include <linux/in.h> --#include <linux/ip.h> --#include <linux/icmp.h> --#include <linux/tcp.h> --#include <linux/udp.h> --#endif -- - - #ifdef HAVE_IFADDRS_H - /* needed for IPV6 support */ --- -2.13.2 - diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb deleted file mode 100644 index 6d9398f4e4..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "A library for collecting system monitoring data" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even - -# depends on libxau -inherit features_check -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch" - -SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" - -DEPENDS = "glib-2.0 libxau" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb new file mode 100644 index 0000000000..5587baa0f7 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb @@ -0,0 +1,12 @@ +SUMMARY = "A library for collecting system monitoring data" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "775676df958e2ea2452f7568f28b2ea581063d312773dd5c0b7624c1b9b2da8c" + +DEPENDS = "glib-2.0 libxau" |