Package: conky
Severity: important
Version: 1.4.9-1
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd
Hi,
as you know, the current version fails to build on GNU/kFreeBSD.
It needs changed build-dependencies and small tweaks
in source and also in building rules.
Please find attached patch with that.
After applying, please rerun autoconf.
It would also be nice if you can ask upstream
to include source changes.
Thanks in advance
Petr
diff -u conky-1.4.9/debian/control conky-1.4.9/debian/control
--- conky-1.4.9/debian/control
+++ conky-1.4.9/debian/control
@@ -4,7 +4,9 @@
Maintainer: Kapil Hari Paranjape <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), quilt, libx11-dev, libxft-dev,
libxdamage-dev, libxext-dev, pkg-config (>= 0.19), libglib2.0-dev,
- libiw-dev
+ libiw-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64]
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/conky
Homepage: http://conky.sf.net
Standards-Version: 3.7.2
diff -u conky-1.4.9/debian/rules conky-1.4.9/debian/rules
--- conky-1.4.9/debian/rules
+++ conky-1.4.9/debian/rules
@@ -8,6 +8,7 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
CFLAGS = -Wall -g
@@ -17,6 +18,10 @@
CFLAGS += -O2
endif
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ EXTRA_CONF_ARGS=--enable-wlan
+endif
+
DEB_QUILT_PATCHES = debian/patches
patch: debian/patch-stamp
@@ -39,7 +44,7 @@
--prefix=/usr --sysconfdir=/etc \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-debug \
- --enable-wlan
+ $(EXTRA_CONF_ARGS)
touch debian/configure-stamp
only in patch2:
unchanged:
--- conky-1.4.9.orig/configure.ac.in
+++ conky-1.4.9/configure.ac.in
@@ -51,7 +51,7 @@
Linux*)
WANT_SYSINFO=yes
;;
- FreeBSD*)
+ FreeBSD*|GNU/kFreeBSD*)
WANT_KVM=yes
WANT_DEVSTAT=yes
;;
@@ -79,7 +79,7 @@
AM_CONDITIONAL(BUILD_LINUX, test x$uname = xLinux)
#AM_CONDITIONAL(BUILD_SOLARIS, test x$uname = xSunOS)
-AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD)
+AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD -o x$uname =
xGNU/kFreeBSD)
#AM_CONDITIONAL(BUILD_NETBSD, test x$uname = xNetBSD)
AM_CONDITIONAL(BUILD_OPENBSD, test x$uname = xOpenBSD)
only in patch2:
unchanged:
--- conky-1.4.9.orig/configure.ac
+++ conky-1.4.9/configure.ac
@@ -51,7 +51,7 @@
Linux*)
WANT_SYSINFO=yes
;;
- FreeBSD*)
+ FreeBSD*|GNU/kFreeBSD*)
WANT_KVM=yes
WANT_DEVSTAT=yes
;;
@@ -79,7 +79,7 @@
AM_CONDITIONAL(BUILD_LINUX, test x$uname = xLinux)
#AM_CONDITIONAL(BUILD_SOLARIS, test x$uname = xSunOS)
-AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD)
+AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD -o x$uname =
xGNU/kFreeBSD)
#AM_CONDITIONAL(BUILD_NETBSD, test x$uname = xNetBSD)
AM_CONDITIONAL(BUILD_OPENBSD, test x$uname = xOpenBSD)
only in patch2:
unchanged:
--- conky-1.4.9.orig/src/conky.c
+++ conky-1.4.9/src/conky.c
@@ -1058,7 +1058,7 @@
OBJ_pop3,
OBJ_pop3_unseen,
OBJ_pop3_used,
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) ||
defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
OBJ_apm_adapter,
OBJ_apm_battery_time,
OBJ_apm_battery_life,
@@ -3122,7 +3122,7 @@
#ifndef __OpenBSD__
OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
#endif /* !__OpenBSD__ */
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) ||
defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
OBJ(apm_adapter, 0) END
OBJ(apm_battery_life, 0) END
OBJ(apm_battery_time, 0) END
@@ -4966,7 +4966,7 @@
format_seconds(p, p_max_size, (int)
cur->uptime);
}
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) ||
defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
OBJ(apm_adapter) {
char *msg;
msg = get_apm_adapter();
@@ -7773,7 +7773,7 @@
optind = 0;
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null",
O_RDONLY, "kvm_open")) == NULL)
CRIT_ERR( "cannot read kvm");
@@ -7935,7 +7935,7 @@
*/
main_loop();
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
kvm_close(kd);
#endif
only in patch2:
unchanged:
--- conky-1.4.9.orig/src/conky.h
+++ conky-1.4.9/src/conky.h
@@ -41,14 +41,14 @@
#include <langinfo.h>
#include <wchar.h>
#include <sys/param.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/mount.h>
#include <sys/ucred.h>
#include <fcntl.h>
#include <kvm.h>
#endif /* __FreeBSD__ */
-#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && (defined(i386) ||
defined(__i386__))
#include <machine/apm_bios.h>
#endif /* __FreeBSD__ */
@@ -613,11 +613,11 @@
void update_mail_count();
/* in freebsd.c */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
kvm_t *kd;
#endif
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) ||
defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
#ifdef __OpenBSD__
typedef struct apm_power_info *apm_info_t;
#endif
only in patch2:
unchanged:
--- conky-1.4.9.orig/src/freebsd.c
+++ conky-1.4.9/src/freebsd.c
@@ -270,7 +270,7 @@
p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
for (i = 0; i < n_processes; i++) {
-#if __FreeBSD__ < 5
+#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5)
if (p[i].kp_proc.p_stat == SRUN)
#else
if (p[i].ki_stat == SRUN)
