Cyril Brulebois <[email protected]> (20/11/2009): > Package: chmsee > Version: 1.0.7-1.1 > Severity: important > Tags: patch > User: [email protected] > Usertags: kfreebsd
I've just uploaded an NMU. There was no reply to the previous one, so I didn't see a point in using DELAYED after a month without any reply. Please find attached the source debdiff. Mraw, KiBi.
diff -u chmsee-1.0.7/debian/changelog chmsee-1.0.7/debian/changelog --- chmsee-1.0.7/debian/changelog +++ chmsee-1.0.7/debian/changelog @@ -1,3 +1,15 @@ +chmsee (1.0.7-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTFBS on GNU/kFreeBSD (Closes: #557159): + - Remove FreeBSD detection from CMakeLists.txt, so that -lmd doesn't + get added for GNU/kFreeBSD. That's not meant to be a final + solution, just a temporary band-aid until a CMake master drives by. + - Tweak src/models/chmfile.c to check for __GLIBC__ in addition to + checking for __linux__. + + -- Cyril Brulebois <[email protected]> Mon, 21 Dec 2009 08:21:07 +0100 + chmsee (1.0.7-1.1) unstable; urgency=low * Non-maintainer upload for transition to xulrunner 1.9.1. only in patch2: unchanged: --- 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) {
signature.asc
Description: Digital signature
