[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-1' - 3 commits - debian/changelog loleaflet/dist loolwsd.spec.in

[Andras Timar]

 debian/changelog           |    6 ++++++
 loleaflet/dist/leaflet.css |    4 ++--
 loolwsd.spec.in            |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 3dd226ea612b87862503315932b21879ead4b349
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Mar 19 21:18:25 2018 +0100

    BUmp package version to 3.1.0-5
    
    Change-Id: I6d5753cc12c5c17e62c21e3cdefcf315fd2f5ec3

diff --git a/debian/changelog b/debian/changelog
index dc3499b17..743144b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.1.0-5) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool31
+
+ -- Andras Timar <andras.timar at collabora.com>  Mon, 19 Mar 2018 21:00:00 +0100
+
 loolwsd (3.1.0-4) unstable; urgency=medium
 
   * see the git log: http://col.la/cool31
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 4409aed98..170b88057 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
commit 151daf780eaca6eb5caf2a1b2ac7ac0755425f53
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 13 11:18:28 2018 +0100

    Poco 1.9.0 on openSUSE and SLE12 and higher
    
    Change-Id: Icb2a4c67d47a99495ca010df3ec2b32e87c9985f
    (cherry picked from commit c7cbc36ec76443b717128f54b69cc41cac6f2889)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d7a3f5af7..4409aed98 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -66,7 +66,7 @@ Requires:       libcap2 libpng12-0 %{fillup_prereq}
 %if 0%{?suse_version} >= 1300
 Requires:       systemd
 Requires:       libopenssl1_0_0 libpcre1 libz1
-Requires:       libPocoCrypto51 >= 1.8.1 libPocoFoundation51 >= 1.8.1 libPocoJSON51 >= 1.8.1 libPocoNet51 >= 1.8.1 libPocoNetSSL51 >= 1.8.1 libPocoUtil51 >= 1.8.1 libPocoXML51 >= 1.8.1
+Requires:       libPocoCrypto60 >= 1.9.0 libPocoFoundation60 >= 1.9.0 libPocoJSON60 >= 1.9.0 libPocoNet60 >= 1.9.0 libPocoNetSSL60 >= 1.9.0 libPocoUtil60 >= 1.9.0 libPocoXML60 >= 1.9.0
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
 # cd /opt/collaboraoffice5.3/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:       Mesa-libGL1 Mesa-libglapi0 cups-libs fontconfig krb5 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libkeyutils1 libpng16-16 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
commit 5629c8c573cd7a00d1c9a83aeef3223f0f5c15df
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Mar 19 21:56:44 2018 +0530

    loleaflet: Keep the hidden input width 1x1 to keep safari happy
    
    It's not possible otherwise to focus the <input> html element in Safari.
    Unfortunately, making the input field 1x1 has the disadvantage that on
    IE 11, a very small blinking artifact appears on bigger font size. There
    doesn't seem to be any other solution to hide the cursor on IE without
    messing up with IME candidate window position.
    
    Without this patch, typing doesn't work on Safari at all which is much
    much bigger of an issue than some artifact appearing on IE.
    
    Change-Id: Ib618a96ba2ec3aa621ed448ffbf410113d8975b8
    Reviewed-on: https://gerrit.libreoffice.org/51579
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit a61ddfe9b4dbaa88404a2f346aaaf531d525ca84)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 50f543957..d1a615a50 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -689,8 +689,8 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header {
 	}
 
 input.clipboard {
-	width: 0px;
-	height: 0px;
+	width: 1px;
+	height: 1px;
 	padding: 0px !important; /* w2ui defines "input:not([type=button])" rule which sets
 				    the padding to non-zero. Hence, the !important. Otherwise,
 				    clipboard cursor apperas in MSIE and MSEdge */