[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 3 commits - bundled/include debian/changelog debian/control loolwsd.spec.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 23 21:54:37 UTC 2019
bundled/include/LibreOfficeKit/LibreOfficeKit.h | 10 ++++++++++
bundled/include/LibreOfficeKit/LibreOfficeKit.hxx | 12 ++++++++++++
bundled/include/LibreOfficeKit/LibreOfficeKitInit.h | 1 +
debian/changelog | 6 ++++++
debian/control | 2 +-
loolwsd.spec.in | 8 ++++++--
6 files changed, 36 insertions(+), 3 deletions(-)
New commits:
commit bdf2f619e92f1056666615b67c101442ddcb32ee
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jan 23 22:51:57 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jan 23 22:51:57 2019 +0100
Bump package version to 4.0.0-5
Change-Id: I969151adec90edef63126129e3612a66f732f1ec
diff --git a/debian/changelog b/debian/changelog
index 07388db6b..252c78c81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.0-5) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool4
+
+ -- Andras Timar <andras.timar at collabora.com> Wed, 23 Jan 2019 22:50:00 +0100
+
loolwsd (4.0.0-4) unstable; urgency=medium
* see the git log: http://col.la/cool4
diff --git a/debian/control b/debian/control
index 3b4b5723a..7c891a7c4 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}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.20), collaboraofficebasis6.0-core (>= 6.0.10.20), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.20), collaboraofficebasis6.0-images (>= 6.0.10.20), collaboraofficebasis6.0-impress (>= 6.0.10.20), collaboraofficebasis6.0-ooofonts (>= 6.0.10.20), collaboraofficebasis6.0-writer (>= 6.0.10.20), collaboraoffice6.0 (>= 6.0.10.20), collaboraoffice6.0-ure (>= 6.0.10.20), collaboraofficebasis6.0-en-us (>= 6.0.10.20), collaboraofficebasis6.0-draw (>= 6.0.10.20), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.20), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.20), collaboraoffice6.0-dict-en (>= 6.0.10.20)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.21), collaboraofficebasis6.0-core (>= 6.0.10.21), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.21), collaboraofficebasis6.0-images (>= 6.0.10.21), collaboraofficebasis6.0-impress (>= 6.0.10.21), collaboraofficebasis6.0-ooofonts (>= 6.0.10.21), collaboraofficebasis6.0-writer (>= 6.0.10.21), collaboraoffice6.0 (>= 6.0.10.21), collaboraoffice6.0-ure (>= 6.0.10.21), collaboraofficebasis6.0-en-us (>= 6.0.10.21), collaboraofficebasis6.0-draw (>= 6.0.10.21), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.21), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.21), collaboraoffice6.0-dict-en (>= 6.0.10.21)
Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-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 1678c505b..9a7233932 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 4%{?dist}
+Release: 5%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice6.0 >= 6.0.10.20 collaboraoffice6.0-ure >= 6.0.10.20 collaboraofficebasis6.0-core >= 6.0.10.20 collaboraofficebasis6.0-writer >= 6.0.10.20 collaboraofficebasis6.0-impress >= 6.0.10.20 collaboraofficebasis6.0-graphicfilter >= 6.0.10.20 collaboraofficebasis6.0-en-US >= 6.0.10.20 collaboraofficebasis6.0-calc >= 6.0.10.20 collaboraofficebasis6.0-ooofonts >= 6.0.10.20 collaboraofficebasis6.0-images >= 6.0.10.20 collaboraofficebasis6.0-draw >= 6.0.10.20 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.20 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.20 collaboraoffice6.0-dict-en >= 6.0.10.20
+Requires: collaboraoffice6.0 >= 6.0.10.21 collaboraoffice6.0-ure >= 6.0.10.21 collaboraofficebasis6.0-core >= 6.0.10.21 collaboraofficebasis6.0-writer >= 6.0.10.21 collaboraofficebasis6.0-impress >= 6.0.10.21 collaboraofficebasis6.0-graphicfilter >= 6.0.10.21 collaboraofficebasis6.0-en-US >= 6.0.10.21 collaboraofficebasis6.0-calc >= 6.0.10.21 collaboraofficebasis6.0-ooofonts >= 6.0.10.21 collaboraofficebasis6.0-images >= 6.0.10.21 collaboraofficebasis6.0-draw >= 6.0.10.21 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.21 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.21 collaboraoffice6.0-dict-en >= 6.0.10.21
Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
commit a775471d53d9cb88cbc7a257db521e41810158be
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jan 23 22:48:21 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jan 23 22:48:21 2019 +0100
re-add X11 dependencies (temporarily)
Change-Id: Ie0f2724d22b7c830f890cf437302b4b7f156b96a
diff --git a/debian/control b/debian/control
index 844c3377a..3b4b5723a 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}, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.20), collaboraofficebasis6.0-core (>= 6.0.10.20), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.20), collaboraofficebasis6.0-images (>= 6.0.10.20), collaboraofficebasis6.0-impress (>= 6.0.10.20), collaboraofficebasis6.0-ooofonts (>= 6.0.10.20), collaboraofficebasis6.0-writer (>= 6.0.10.20), collaboraoffice6.0 (>= 6.0.10.20), collaboraoffice6.0-ure (>= 6.0.10.20), collaboraofficebasis6.0-en-us (>= 6.0.10.20), collaboraofficebasis6.0-draw (>= 6.0.10.20), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.20), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.20), collaboraoffice6.0-dict-en (>= 6.0.10.20)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.20), collaboraofficebasis6.0-core (>= 6.0.10.20), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.20), collaboraofficebasis6.0-images (>= 6.0.10.20), collaboraofficebasis6.0-impress (>= 6.0.10.20), collaboraofficebasis6.0-ooofonts (>= 6.0.10.20), collaboraofficebasis6.0-writer (>= 6.0.10.20), collaboraoffice6.0 (>= 6.0.10.20), collaboraoffice6.0-ure (>= 6.0.10.20), collaboraofficebasis6.0-en-us (>= 6.0.10.20), collaboraofficebasis6.0-draw (>= 6.0.10.20), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.20), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.20), collaboraoffice6.0-dict-en (>= 6.0.10.20)
Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-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 b44064517..1678c505b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -47,6 +47,7 @@ Requires: keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng
Requires: poco-crypto >= 1.7.8 poco-foundation >= 1.7.8 poco-json >= 1.7.8 poco-net >= 1.7.8 poco-netssl >= 1.7.8 poco-util >= 1.7.8 poco-xml >= 1.7.8
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
Requires: expat fontconfig freetype
+Requires: avahi-libs cups-libs dbus-libs gnutls libdrm libgcc libgcrypt libgpg-error libICE libSM libtasn1 libuuid libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrender libXxf86vm mesa-dri-drivers mesa-libGL
%endif
%if 0%{?fedora} || 0%{?rhel} >= 7
# loolwsd dependencies
@@ -55,6 +56,7 @@ Requires: keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng
Requires: poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >= 1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >= 1.7.5
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
Requires: expat fontconfig freetype
+Requires: avahi-libs cups-libs dbus-libs libdrm libICE libSM libuuid libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrender libxshmfence libXxf86vm mesa-libGL mesa-libglapi
%endif
%if 0%{?suse_version}
@@ -70,6 +72,7 @@ Requires: libPocoCrypto60 >= 1.9.0 libPocoFoundation60 >= 1.9.0 libPocoJSO
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
# cd /opt/collaboraoffice6.0/program ; for i in soffice.bin *.so ;do ldd $i | grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16
+Requires: Mesa-libGL1 Mesa-libglapi0 cups-libs krb5 libavahi-client3 libavahi-common3 libavahi-glib1 libcom_err2 libdbus-1-3 libdrm2 libkeyutils1 libuuid1 libICE6 libselinux1 libSM6 libX11-6 libX11-xcb1 libXau6 libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libXdamage1 libXext6 libXfixes3 libXrender1 libxshmfence1 libXxf86vm1
%endif
# SLES11SP4
@@ -77,6 +80,7 @@ Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16
Requires: libattr libopenssl0_9_8 pcre zlib
Requires: libPocoCrypto49 >= 1.7.9 libPocoFoundation49 >= 1.7.9 libPocoJSON49 >= 1.7.9 libPocoNet49 >= 1.7.9 libPocoNetSSL49 >= 1.7.9 libPocoUtil49 >= 1.7.9 libPocoXML49 >= 1.7.9
Requires: fontconfig freetype2 libexpat1
+Requires: cups-libs glibc keyutils-libs krb5 libcom_err2 libdrm libgcc_s1 libstdc++6 libuuid1 Mesa pcre xorg-x11-libICE xorg-x11-libs xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libxcb xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXrender
%endif
%if 0%{?name_suffix:1}
Provides: loleaflet = 1.5.8, loolwsd
commit 3f6310d4c386432a3dec5a3f977ce4b7940c9c3d
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jan 23 16:07:49 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jan 23 16:07:49 2019 +0100
updated bundled LOK headers
Change-Id: Id99ab260d9af7fad223d1e17e61ddc06d759ad0e
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 4dd23a2cb..2df1cea6d 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -94,6 +94,16 @@ struct _LibreOfficeKitClass
@since LibreOffice 6.0
*/
int (*runMacro) (LibreOfficeKit *pThis, const char* pURL);
+
+ /** @see lok::Office::signDocument().
+ @since LibreOffice 6.2
+ */
+ bool (*signDocument) (LibreOfficeKit* pThis,
+ const char* pUrl,
+ const unsigned char* pCertificateBinary,
+ const int nCertificateBinarySize,
+ const unsigned char* pPrivateKeyBinary,
+ const int nPrivateKeyBinarySize);
};
#define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 5d7771cf8..31e95a09c 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -791,6 +791,18 @@ public:
{
return mpThis->pClass->runMacro( mpThis, pURL );
}
+
+ /**
+ * Exports the document and signes its content.
+ */
+ bool signDocument(const char* pURL,
+ const unsigned char* pCertificateBinary, const int nCertificateBinarySize,
+ const unsigned char* pPrivateKeyBinary, const int nPrivateKeyBinarySize)
+ {
+ return mpThis->pClass->signDocument(mpThis, pURL,
+ pCertificateBinary, nCertificateBinarySize,
+ pPrivateKeyBinary, nPrivateKeyBinarySize);
+ }
};
/// Factory method to create a lok::Office instance.
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 5dbf2f83f..6667d2b92 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -88,6 +88,7 @@ extern "C"
#else
+ #pragma warning(disable:4996)
#if !defined WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
More information about the Libreoffice-commits
mailing list