Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to kfreebsd

Browse Source
This commit is contained in:
Jeremy Bícha
2024-01-11 10:31:41 -05:00
parent 3ffa633c96
commit e0f418824b
5 changed files with 0 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@@ -12,10 +12,6 @@ Build-Depends: debhelper-compat (= 13),
libglib2.0-dev (>= 2.6.0),
texinfo,
libxt-dev,
libgeom-dev [kfreebsd-any],
libdevstat-dev [kfreebsd-any],
libkvm-dev [kfreebsd-any],
libbsd-dev [kfreebsd-any],
gtk-doc-tools (>= 1.4),
libgirepository1.0-dev (>= 0.10.7-1~)
Standards-Version: 4.6.2

86
debian/patches/03_kfreebsd_installdirs.patch vendored
View File

@@ -1,86 +0,0 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664
Author: Josselin Mouette <joss@debian.org>
The libgtop_server2 binary is launched by the library itself, and has no use
being launched directly. Therefore, it should go in $(libexecdir) instead.
The patch also adds some missing $(DESTDIR) references in the installation
hooks.
Index: libgtop-2.32.0/libgtop-sysdeps.m4
===================================================================
--- libgtop-2.32.0.orig/libgtop-sysdeps.m4 2015-10-07 23:46:35.738589058 +0200
+++ libgtop-2.32.0/libgtop-sysdeps.m4 2015-10-07 23:51:51.006990769 +0200
@@ -40,38 +40,38 @@
netbsd*|bsdi*)
libgtop_sysdeps_dir=bsd
libgtop_need_server=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
openbsd*)
libgtop_sysdeps_dir=openbsd
libgtop_need_server=yes
libgtop_sysdeps_private_mountlist=yes
libgtop_sysdeps_private_fsusage=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
freebsd*|kfreebsd*)
libgtop_sysdeps_dir=freebsd
libgtop_need_server=yes
libgtop_sysdeps_private_mountlist=yes
libgtop_sysdeps_private_fsusage=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
solaris*)
libgtop_sysdeps_dir=solaris
libgtop_need_server=yes
- libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+ libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server'
;;
aix*)
libgtop_sysdeps_dir=aix
libgtop_need_server=yes
libgtop_have_sysinfo=yes
- libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
darwin*)
libgtop_sysdeps_dir=darwin
libgtop_need_server=yes
libgtop_have_sysinfo=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
;;
cygwin*)
libgtop_sysdeps_dir=cygwin
Index: libgtop-2.32.0/src/daemon/Makefile.am
===================================================================
--- libgtop-2.32.0.orig/src/daemon/Makefile.am 2015-10-07 23:46:35.738589058 +0200
+++ libgtop-2.32.0/src/daemon/Makefile.am 2015-10-07 23:46:35.734589003 +0200
@@ -26,7 +26,7 @@
suid_common =
endif
-bin_PROGRAMS = libgtop_daemon2 @server_programs@
+libexec_PROGRAMS = libgtop_daemon2 @server_programs@
EXTRA_PROGRAMS = libgtop_server2
Index: libgtop-2.32.0/configure.ac
===================================================================
--- libgtop-2.32.0.orig/configure.ac 2015-10-07 23:46:35.738589058 +0200
+++ libgtop-2.32.0/configure.ac 2015-10-07 23:46:35.734589003 +0200
@@ -285,8 +285,8 @@
libgtop_save_exec_prefix="$exec_prefix"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-LIBGTOP_BINDIR=`eval echo "${bindir}"`
-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
+LIBGTOP_BINDIR=`eval echo "${libexecdir}"`
+LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"`
prefix="$libgtop_save_prefix"
exec_prefix="$libgtop_save_exec_prefix"

21
debian/patches/04_kfreebsd_version.patch vendored
View File

@@ -1,21 +0,0 @@
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Mon, 15 Jun 2015 17:09:49 +0100
Support GNU/kFreeBSD by using __FreeBSD_kernel_version here,
rather than simply __FreeBSD_version (which is only defined in
FreeBSD itself).
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788709
--- a/sysdeps/freebsd/open.c
+++ b/sysdeps/freebsd/open.c
@@ -43,6 +43,10 @@
server->real_ncpu = ncpus - 1;
server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
+#if defined(__FreeBSD__)
server->os_version_code = __FreeBSD_version;
+#else
+ server->os_version_code = __FreeBSD_kernel_version;
+#endif
}

2
debian/patches/series vendored
View File

@@ -1,3 +1 @@
03_kfreebsd_installdirs.patch
04_kfreebsd_version.patch
mountlist-ignore-snap-squashfs.patch

5
debian/rules vendored
View File

@@ -5,11 +5,6 @@ SHARED_PKG := libgtop-2.0-11
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
LDFLAGS += $(shell pkg-config --libs libbsd-overlay)
endif
%:
dh $@