[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1_rc1-2-2-g84c4d41
The following commit has been merged in the debian-experimental-3.6 branch:
commit 84c4d41aa3e34d5d4fc77f5ac5f76cb8e151ce7f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 20 18:34:47 2012 +0200
fix concat-deps.c for kFreeBSD...
diff --git a/changelog b/changelog
index 96fa2ee..1898235 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
libreoffice (1:3.6.1~rc1-3) UNRELEASED; urgency=low
* debian/patches/fix-S390X-CPUNAME.diff: add, as name says
+ * debian/patches/concat-deps-FreeBSD_kernel.diff: fix concat-deps.c for
+ kFreeBSD...
- -- Rene Engelhard <rene@debian.org> Mon, 20 Aug 2012 18:30:15 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 20 Aug 2012 18:33:08 +0200
libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
diff --git a/patches/concat-deps-FreeBSD-kernel.diff b/patches/concat-deps-FreeBSD-kernel.diff
new file mode 100644
index 0000000..bb0680b
--- /dev/null
+++ b/patches/concat-deps-FreeBSD-kernel.diff
@@ -0,0 +1,22 @@
+From 410b6f01f07f8f1a84f2118c71735cdbb5331d5f Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Mon, 20 Aug 2012 08:01:47 +0000
+Subject: concat-deps.c: add || defined (__FreeBSD_kernel__) for arch-specifics
+
+Change-Id: Ie321ada6d2c078881fdedc61d72c94034297fea3
+---
+diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
+index 3770755..65fda1d 100644
+--- a/solenv/bin/concat-deps.c
++++ b/solenv/bin/concat-deps.c
+@@ -39,7 +39,7 @@
+
+ #if defined(__linux) || defined(__OpenBSD__) || \
+ defined(__FreeBSD__) || defined(__NetBSD__) || \
+- defined(__DragonFly__)
++ defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define CORE_BIG_ENDIAN 0
+ #define CORE_LITTLE_ENDIAN 1
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 38ade7b..9031ca3 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
fix-S390X-CPUNAME.diff
+concat-deps-FreeBSD-kernel.diff
--
LibreOffice packaging repository
Reply to: