[Pkg-kde-extras] Bug#544576: icecc: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: icecc
Version: 0.9.4-1
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs changes to sources and changes to debian packaging.
Please find attached patches with them.

It would also be nice if you can ask upstream
to include source changes.

Thanks in advance

                        Petr
diff -u icecc-0.9.4/debian/control icecc-0.9.4/debian/control
--- icecc-0.9.4/debian/control
+++ icecc-0.9.4/debian/control
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> 
 Uploaders: Fathi Boudra <f...@debian.org>, Mark Purcell <m...@debian.org>
-Build-Depends: debhelper (>= 7), quilt, automake, libtool, docbook2x
+Build-Depends: debhelper (>= 7), quilt, automake, libtool, docbook2x,
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64]
 Homepage: http://en.opensuse.org/Icecream
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/icecream/trunk/
@@ -28,7 +29,7 @@
 Package: libicecc-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdevstat-dev [kfreebsd-any]
 Description: development files for icecc (distributed compiler)
  This package is part if icecc. It provides files which are necessary to build
  icecc-monitor.

only in patch2:
unchanged:
--- icecc-0.9.4.orig/minilzo/lzodefs.h
+++ icecc-0.9.4/minilzo/lzodefs.h
@@ -356,7 +356,7 @@
 #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
 #    define LZO_OS_POSIX_AIX        1
 #    define LZO_INFO_OS_POSIX       "aix"
-#  elif defined(__FreeBSD__)
+#  elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #    define LZO_OS_POSIX_FREEBSD    1
 #    define LZO_INFO_OS_POSIX       "freebsd"
 #  elif defined(__hpux__) || defined(__hpux)
only in patch2:
unchanged:
--- icecc-0.9.4.orig/minilzo/minilzo.c
+++ icecc-0.9.4/minilzo/minilzo.c
@@ -377,7 +377,7 @@
 #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
 #    define LZO_OS_POSIX_AIX        1
 #    define LZO_INFO_OS_POSIX       "aix"
-#  elif defined(__FreeBSD__)
+#  elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #    define LZO_OS_POSIX_FREEBSD    1
 #    define LZO_INFO_OS_POSIX       "freebsd"
 #  elif defined(__hpux__) || defined(__hpux)
only in patch2:
unchanged:
--- icecc-0.9.4.orig/daemon/ncpus.c
+++ icecc-0.9.4/daemon/ncpus.c
@@ -89,7 +89,7 @@
      return 0;
 }
 
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__bsdi__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__bsdi__) || defined(__DragonFly__)
 
 /* http://www.FreeBSD.org/cgi/man.cgi?query=sysctl&sektion=3&manpath=FreeBSD+4.6-stable
    http://www.openbsd.org/cgi-bin/man.cgi?query=sysctl&sektion=3&manpath=OpenBSD+Current
@@ -100,7 +100,7 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #undef HAVE_RS_LOG_ERROR
 #else
 #define HAVE_RS_LOG_ERROR

_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras