[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-2-6-gf06ac95
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit f06ac95947d8db858997aa06f90f4d549128d1d1
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 22 16:08:21 2011 +0000
don't try to #include <sys/prctl.h>, it doesn't exist for FreeBSD
diff --git a/changelog b/changelog
index ea29e8a..033d643 100644
--- a/changelog
+++ b/changelog
@@ -2,11 +2,13 @@ libreoffice (1:3.4.1-3) UNRELEASED; urgency=low
* debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha
+ * debian/patches/no-prctl-on-kfreebsd.diff: don't try to #include <sys/prctl.h>,
+ it doesn't exist for FreeBSD
* debian/rules:
- also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
- -- Rene Engelhard <rene@debian.org> Fri, 22 Jul 2011 08:05:47 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 22 Jul 2011 16:06:11 +0000
libreoffice (1:3.4.1-2) experimental; urgency=low
diff --git a/patches/no-prctl-on-kfreebsd.diff b/patches/no-prctl-on-kfreebsd.diff
new file mode 100644
index 0000000..93ba4f1
--- /dev/null
+++ b/patches/no-prctl-on-kfreebsd.diff
@@ -0,0 +1,23 @@
+--- /dev/null 2011-07-22 18:04:26.354741821 +0000
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/no-prctl-on-kfreebsd.diff 2011-07-21 22:19:00.000000000 +0000
+@@ -0,0 +1,20 @@
++--- sal/osl/unx/thread.c-old 2011-07-22 00:16:33.000000000 +0200
+++++ sal/osl/unx/thread.c 2011-07-22 00:17:41.000000000 +0200
++@@ -37,7 +37,7 @@
++ #include <rtl/textenc.h>
++ #include <sal/macros.h>
++
++-#if defined LINUX
+++#if defined LINUX && ! defined __FreeBSD_kernel__
++ #include <sys/prctl.h>
++ #ifndef PR_SET_NAME
++ #define PR_SET_NAME 15
++@@ -598,7 +598,7 @@
++ }
++
++ void SAL_CALL osl_setThreadName(char const * name) {
++-#if defined LINUX
+++#if defined LINUX && ! defined __FreeBSD_kernel__
++ if (prctl(PR_SET_NAME, (unsigned long) name, 0, 0, 0) != 0) {
++ OSL_TRACE(
++ "%s prctl(PR_SET_NAME) failed with errno %d", OSL_LOG_PREFIX,
--
LibreOffice packaging repository
Reply to: