Package: chmsee
Version: 1.0.7-1.1
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd
Hi,
your package FTBFS on GNU/kFreeBSD for two reasons:
- md5.h is included when not on linux. That's not really what should
be checked, rather linux or glibc.
- -lmd is added because the build system is mistaken for (plain)
FreeBSD. Given I'm no cmake master, I've just commented out the
(plain) FreeBSD-specific lines.
Thanks for considering the attached patch.
Mraw,
KiBi.
--- chmsee-1.0.7.orig/CMakeLists.txt
+++ chmsee-1.0.7/CMakeLists.txt
@@ -10,9 +10,6 @@
set(CHMSEE_LIBRARY_DIRS ${CHMSEE_LIBRARY_DIRS} ${XULRUNNER_LIBRARY_DIRS})
set(CHMSEE_LIBRARIES ${CHMSEE_LIBRARIES} ${XULRUNNER_LIBRARIES} chm gcrypt)
-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- set(CHMSEE_LIBRARIES ${CHMSEE_LIBRARIES} md)
-endif()
if(XULRUNNER_VERSION MATCHES "1\\.8\\..*")
set(XULRUNNER18 1)
only in patch2:
unchanged:
--- chmsee-1.0.7.orig/src/models/chmfile.c
+++ chmsee-1.0.7/src/models/chmfile.c
@@ -29,7 +29,7 @@
#include <sys/stat.h>
#include <sys/types.h>
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
#include <fcntl.h>
#include <gcrypt.h>
#else
@@ -267,7 +267,7 @@
return TRUE;
}
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
static char *
MD5File(const char *filename, char *buf)
{
