[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - 3 commits - configure.ac debian/changelog debian/control kit/ChildSession.cpp loolwsd.spec.in
Andras Timar
andras.timar at collabora.com
Tue May 22 14:00:23 UTC 2018
configure.ac | 2 +-
debian/changelog | 5 +++++
debian/control | 2 +-
kit/ChildSession.cpp | 19 +------------------
loolwsd.spec.in | 2 +-
5 files changed, 9 insertions(+), 21 deletions(-)
New commits:
commit ffc419ac4cad5cd05923f145ac1028efb2bf3e2f
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu May 10 12:07:09 2018 +0200
Bump package version to 3.2.2-1
Change-Id: If00e8e391a4ecda9c3660b39565e95493f18d59e
diff --git a/configure.ac b/configure.ac
index 3dc87c69b..db1ccc061 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [3.2.1], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [3.2.2], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 88754fda2..73ad63348 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+loolwsd (3.2.2-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool32
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 10 May 2018 11:20:00 +0100
loolwsd (3.2.1-1) unstable; urgency=medium
* see the git log: http://col.la/cool321
commit 4c69fdd62bbf79d64f1c917f4eec315fbcdbb21b
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu May 10 11:21:54 2018 +0200
In order to use internal dictionaries, ooolinguistic package is required
Change-Id: Ie2251de038c14b10ecd9e3720e3b1c7a75de8e8b
Reviewed-on: https://gerrit.libreoffice.org/54070
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/debian/control b/debian/control
index a40c20bd0..76f676324 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.41), collaboraofficebasis5.3-core (>= 5.3.10.41), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.41), collaboraofficebasis5.3-images (>= 5.3.10.41), collaboraofficebasis5.3-impress (>= 5.3.10.41), collaboraofficebasis5.3-ooofonts (>= 5.3.10.41), collaboraofficebasis5.3-writer (>= 5.3.10.41), collaboraoffice5.3 (>= 5.3.10.41), collaboraoffice5.3-ure (>= 5.3.10.41), collaboraofficebasis5.3-en-us (>= 5.3.10.41), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.41), collaboraofficebasis5.3-en-us-res (>= 5.3.10.41), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.41), collaboraofficebasis5.3-draw (>= 5.3.10.41), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.41), collaboraofficebasis5.3-filter-data (>= 5.3.10.41)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.46), collaboraofficebasis5.3-core (>= 5.3.10.46), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.46), collaboraofficebasis5.3-images (>= 5.3.10.46), collaboraofficebasis5.3-impress (>= 5.3.10.46), collaboraofficebasis5.3-ooofonts (>= 5.3.10.46), collaboraofficebasis5.3-writer (>= 5.3.10.46), collaboraoffice5.3 (>= 5.3.10.46), collaboraoffice5.3-ure (>= 5.3.10.46), collaboraofficebasis5.3-en-us (>= 5.3.10.46), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.46), collaboraofficebasis5.3-en-us-res (>= 5.3.10.46), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.46), collaboraofficebasis5.3-draw (>= 5.3.10.46), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.46), collaboraofficebasis5.3-filter-data (>= 5.3.10.46), collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.46)
Conflicts: collaboraofficebasis5.3-gnome-integration, collaboraofficebasis5.3-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 4ff70c118..e206dcf00 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice5.3 >= 5.3.10.41 collaboraoffice5.3-ure >= 5.3.10.41 collaboraofficebasis5.3-core >= 5.3.10.41 collaboraofficebasis5.3-writer >= 5.3.10.41 collaboraofficebasis5.3-impress >= 5.3.10.41 collaboraofficebasis5.3-graphicfilter >= 5.3.10.41 collaboraofficebasis5.3-en-US >= 5.3.10.41 collaboraofficebasis5.3-calc >= 5.3.10.41 collaboraofficebasis5.3-en-US-res >= 5.3.10.41 collaboraofficebasis5.3-en-US-calc >= 5.3.10.41 collaboraofficebasis5.3-ooofonts >= 5.3.10.41 collaboraofficebasis5.3-images >= 5.3.10.41 collaboraofficebasis5.3-noto-fonts >= 5.3.10.41 collaboraofficebasis5.3-draw >= 5.3.10.41 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.41 collaboraofficebasis5.3-filter-data >= 5.3.10.41
+Requires: collaboraoffice5.3 >= 5.3.10.46 collaboraoffice5.3-ure >= 5.3.10.46 collaboraofficebasis5.3-core >= 5.3.10.46 collaboraofficebasis5.3-writer >= 5.3.10.46 collaboraofficebasis5.3-impress >= 5.3.10.46 collaboraofficebasis5.3-graphicfilter >= 5.3.10.46 collaboraofficebasis5.3-en-US >= 5.3.10.46 collaboraofficebasis5.3-calc >= 5.3.10.46 collaboraofficebasis5.3-en-US-res >= 5.3.10.46 collaboraofficebasis5.3-en-US-calc >= 5.3.10.46 collaboraofficebasis5.3-ooofonts >= 5.3.10.46 collaboraofficebasis5.3-images >= 5.3.10.46 collaboraofficebasis5.3-noto-fonts >= 5.3.10.46 collaboraofficebasis5.3-draw >= 5.3.10.46 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.46 collaboraofficebasis5.3-filter-data >= 5.3.10.46 collaboraofficebasis5.3-ooolinguistic >= 5.3.10.46
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
commit a9422c15829177d0f722f398a4e067fcf41bdc54
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu May 10 09:18:05 2018 +0200
Revert "kit: use NoFileSync flag for save"
Turned out this might corrupt .ods files...
This reverts commit 3a8f847811c24a9d4b73a515b0506732d9bc5c6c.
Change-Id: I554c0697352b093acbfbfd5474f1429a21ea9839
Reviewed-on: https://gerrit.libreoffice.org/54061
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/54073
Reviewed-by: Aron Budea <aron.budea at collabora.com>
Tested-by: Aron Budea <aron.budea at collabora.com>
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index e294b03da..1ba5a08ef 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -952,25 +952,8 @@ bool ChildSession::unoCommand(const char* /*buffer*/, int /*length*/, const std:
}
else
{
- std::string arguments;
- if (tokens[1] == ".uno:Save" && tokens[2] == "{}")
- {
- // Save and no arguments, provide our default.
- std::ostringstream oss;
- oss << "{"
- << "\"NoFileSync\":"
- << "{"
- << "\"type\":\"boolean\","
- << "\"value\":true"
- << "}"
- << "}";
- arguments = oss.str();
- }
- else
- arguments = Poco::cat(std::string(" "), tokens.begin() + 2, tokens.end());
-
getLOKitDocument()->postUnoCommand(tokens[1].c_str(),
- arguments.c_str(),
+ Poco::cat(std::string(" "), tokens.begin() + 2, tokens.end()).c_str(),
bNotify);
}
More information about the Libreoffice-commits
mailing list