[libreoffice] 01/01: fix kfreebsd-* build

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 9c8b8df98acf7238dd670da2e5a93a8185b4391f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 4 22:51:44 2017 +0100

    fix kfreebsd-* build
---
 changelog                           |  1 +
 patches/sal-fix-kfreebsd-build.diff | 23 +++++++++++++++++++++++
 patches/series                      |  1 +
 3 files changed, 25 insertions(+)

diff --git a/changelog b/changelog
index 88e6c1c..377c421 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ libreoffice (1:6.0.0~beta2~git20171208-1) UNRELEASED; urgency=medium
 
   * debian/patches/apparmor-complain.diff: set complain mode for oosplash
     and soffice.bin profiles
+  * debian/patches/sal-fix-kfreebsd-build.diff: add from gerrit
 
   * debian/control.in: remove openjdk conflicts ...
   * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
diff --git a/patches/sal-fix-kfreebsd-build.diff b/patches/sal-fix-kfreebsd-build.diff
new file mode 100644
index 0000000..b6cf568
--- /dev/null
+++ b/patches/sal-fix-kfreebsd-build.diff
@@ -0,0 +1,23 @@
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Mon, 4 Dec 2017 21:33:35 +0000 (+0100)
+Subject: Condition for definition of LastIdent must match condition for its use
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=68f8e48e8c264056d60628da488404348f9f2f17
+
+Condition for definition of LastIdent must match condition for its use
+
+Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa
+---
+
+diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
+index 639e8b6..affbc5c 100644
+--- a/sal/osl/unx/thread.cxx
++++ b/sal/osl/unx/thread.cxx
+@@ -567,7 +567,7 @@ static int HashSize = SAL_N_ELEMENTS(HashTable);
+ 
+ static pthread_mutex_t HashLock = PTHREAD_MUTEX_INITIALIZER;
+ 
+-#if ! (defined LINUX || defined MACOSX || defined IOS)
++#if ! ((defined LINUX && !defined __FreeBSD_kernel__) || defined MACOSX || defined IOS)
+ static oslThreadIdentifier LastIdent = 0;
+ #endif
+ 
diff --git a/patches/series b/patches/series
index 67407c8..1f52720 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ disable-unused-test-programs.diff
 disable-tests-somehow-needing-more-fonts.diff
 tdf108963-test.diff
 apparmor-complain.diff
+sal-fix-kfreebsd-build.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git