Commit c5975fc8 authored by Max Rees's avatar Max Rees

user/libreoffice: pull in, massive overhaul

parent 92197441
This diff is collapsed.
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index 5fafc1c..408c12c 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
#define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
-#if defined (LINUX)
+#if defined (LINUX) && defined (__GLIBC__)
#include <execinfo.h>
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index f4c9a9c..da6d9cf 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -35,7 +35,7 @@
#endif /* MACOSX */
-#ifdef LINUX
+#if defined(LINUX) && defined(__GLIBC__)
#include <execinfo.h>
#include <link.h>
#define INCLUDE_BACKTRACE
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 1d9a58b..fd648e4 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
}
}
-#elif !defined LINUX
+#elif !defined(__GLIBC__)
int backtrace( void **buffer, int max_frames )
{
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index f177d86..99bb408 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -21,7 +21,7 @@
#include <dbus/dbus.h>
#include <errno.h>
#include <fcntl.h>
- #include <sys/unistd.h>
+ #include <unistd.h>
#include <sys/socket.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 932e928..b65ced7 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -30,7 +30,7 @@
#include <list>
-#include <time.h>
+#include <sys/time.h>
#define VIRTUAL_DESKTOP_WIDTH 1024
#define VIRTUAL_DESKTOP_HEIGHT 768
--- a/avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100
+++ b/avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100
@@ -15,6 +15,7 @@
#if defined(_WIN32)
typedef __int64 libvlc_time_t;
#else
+# include <stdint.h>
typedef int64_t libvlc_time_t;
#endif
gettext-tiny does not currently ship msguniq, so let's cheat around it
--- libreoffice-6.0.6.2/solenv/gbuild/AllLangMoTarget.mk
+++ libreoffice-6.0.6.2/solenv/gbuild/AllLangMoTarget.mk
@@ -40,10 +40,10 @@
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
if test -e $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po; then \
- $(MSGUNIQ) --force-po $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
+ cat $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
else \
echo missing $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po && \
- $(MSGUNIQ) --force-po $(SRCDIR)/solenv/bin/dummy.po | $(MSGFMT) - -o $@; \
+ cat $(SRCDIR)/solenv/bin/dummy.po | $(MSGFMT) - -o $@; \
fi)
#$(info $(call gb_MoTarget_get_target,$(1)))
--- libreoffice-6.0.6.2/configure.ac
+++ libreoffice-6.0.6.2/configure.ac
@@ -11749,18 +11749,6 @@
fi
fi
fi
- if test -z "$MSGUNIQ"; then
- if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msguniq" ; then
- MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
- elif test -x "/opt/lo/bin/msguniq"; then
- MSGUNIQ="/opt/lo/bin/msguniq"
- else
- AC_CHECK_PROGS(MSGUNIQ, [msguniq])
- if test -z "$MSGUNIQ"; then
- AC_MSG_ERROR([msguniq not found. Install GNU gettext, or re-run without languages.])
- fi
- fi
- fi
fi
AC_SUBST(MSGFMT)
AC_SUBST(MSGUNIQ)
--- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000
+++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000
@@ -652,7 +652,7 @@
fi
;;
-linux-gnu*|k*bsd*-gnu*)
+linux-gnu*|linux-musl*|k*bsd*-gnu*)
test_gtk=yes
build_gstreamer_1_0=yes
build_gstreamer_0_10=yes
@@ -4170,7 +4170,7 @@
esac
;;
-linux-gnu*)
+linux-gnu*|linux-musl*)
COM=GCC
USING_X11=TRUE
OS=LINUX
@@ -7197,7 +7197,7 @@
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
- linux-gnu*)
+ linux-gnu*|linux-musl*)
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
@@ -9748,21 +9748,6 @@
fi
AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
-dnl ***************************************
-dnl testing libc version for Linux...
-dnl ***************************************
-if test "$_os" = "Linux"; then
- AC_MSG_CHECKING([whether libc is >= 2.1.1])
- exec 6>/dev/null # no output
- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
- exec 6>&1 # output on again
- if test "$HAVE_LIBC"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([no, upgrade libc])
- fi
-fi
-
dnl =========================================
dnl Check for the Windows SDK.
dnl =========================================
@@ -12775,7 +12760,7 @@
case "$host_os" in
- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
if test "$ENABLE_JAVA" != ""; then
pathmunge "$JAVA_HOME/bin" "after"
fi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment