rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

foo

Browse Source
f41
Caolán McNamara 7 years ago
parent 06190bf97d
commit 31d169da36
4 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File

6
.gitignore vendored
Unescape View File

@ -10,3 +10,9 @@
/libreoffice-help-6.0.4.2.tar.xz.asc
/libreoffice-translations-6.0.4.2.tar.xz
/libreoffice-translations-6.0.4.2.tar.xz.asc
/libreoffice-6.0.5.2.tar.xz
/libreoffice-6.0.5.2.tar.xz.asc
/libreoffice-help-6.0.5.2.tar.xz
/libreoffice-help-6.0.5.2.tar.xz.asc
/libreoffice-translations-6.0.5.2.tar.xz
/libreoffice-translations-6.0.5.2.tar.xz.asc

37
0001-Resolves-tdf-116951-rhbz-1569331-start-is-G_MAXINT.patch
Unescape View File

@ -1,37 +0,0 @@
From a1e24ab0a98ea6155c581907aca42532311218df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 24 Apr 2018 11:39:20 +0100
Subject: [PATCH] Resolves: tdf#116951 rhbz#1569331 start is G_MAXINT
and text is nullptr, seeing as an end G_MAXINT translates to str len,
assume the same for start
Change-Id: I76b8bb0e66694129d36bbe08a6d55fc434f3434f
---
vcl/unx/gtk3/gtk3gtkframe.cxx | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 113fcb425963..8a18974d2635 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3977,8 +3977,14 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
ExtTextInputAttr sal_attr = ExtTextInputAttr::NONE;
pango_attr_iterator_range (iter, &start, &end);
- if (end == G_MAXINT)
- end = pText ? g_utf8_strlen(pText, -1) : 0;
+ if (start == G_MAXINT || end == G_MAXINT)
+ {
+ auto len = pText ? g_utf8_strlen(pText, -1) : 0;
+ if (end == G_MAXINT)
+ end = len;
+ if (start == G_MAXINT)
+ start = len;
+ }
if (end == start)
continue;
--
2.14.3

7
libreoffice.spec
Unescape View File

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
%global libo_version 6.0.4
%global libo_version 6.0.5
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 5%{?libo_prerelease}%{?dist}
Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/
@ -2329,6 +2329,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
* Fri Jun 22 2018 Caolán McNamara <caolanm@redhat.com> - 1:6.0.5.2-1
- latest 6.0 release
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1:6.0.4.2-5
- Rebuilt for Python 3.7

12
sources
Unescape View File

@ -5,9 +5,9 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6f
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (libreoffice-6.0.4.2.tar.xz) = 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
SHA512 (libreoffice-6.0.4.2.tar.xz.asc) = 31045e72c36cc5b0c27bbfc58c85e3ca2a9b1c1c8633545310d47aa3eb30a2d0b0505146a8f6edc22b21293c8aae412e42516fc655f6274ccffd517ab20db994
SHA512 (libreoffice-help-6.0.4.2.tar.xz) = ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
SHA512 (libreoffice-help-6.0.4.2.tar.xz.asc) = da32dbcf3ac6d0717b3d9acb3d4372a8a43ca05615426aadd0ff9cc16b9d013cc6bbb5544fc5adffd65d8ffa930664246b86747e22a36610ce57cf62a02ff3c2
SHA512 (libreoffice-translations-6.0.4.2.tar.xz) = 470e1d9d17dcbd4cebd2429d0c2711ee1730be32178684b3128471387708a24b6ee357ea261ac36f6b6a5d8acbcb4fa1ea5c216186705edcb2406bc5cb765124
SHA512 (libreoffice-translations-6.0.4.2.tar.xz.asc) = 4814ba3ca29a1ce083faa4eaf9d3e2c30e335f366520efee79b691cc033dc4beb67793afbacb4fb077dc37931360bfc13f94c41ac15f0c092bd4419a1ad0b900
SHA512 (libreoffice-6.0.5.2.tar.xz) = 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
SHA512 (libreoffice-6.0.5.2.tar.xz.asc) = 2838a1fc47d4a013cd0e6c37b1d3b32cbeb73184361b008f5a8e42d3d381cb37b868bbaded12c8c654798484f07f9d9a5e99487edd35c355f3a7ee395b1aab04
SHA512 (libreoffice-help-6.0.5.2.tar.xz) = 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
SHA512 (libreoffice-help-6.0.5.2.tar.xz.asc) = c7109e1d112386ddebd2990f87e24e25a1d5ba70e896bbc3f747dc62cf6061191d6baac31d1db2642c258256e9b4310c9c877a864a2e1c92bffc05b21e2a429d
SHA512 (libreoffice-translations-6.0.5.2.tar.xz) = 5de62e013412cc0c681d7447bcbf2cebdeb4f2d6033c320dd95f6f8e39c7716ab9e0d2b864c4495c001381acbc6889e03577b767c7f0a010bacb954bc6887cee
SHA512 (libreoffice-translations-6.0.5.2.tar.xz.asc) = 04d610d8bf83ee5ac8799a45aeadd197208c8ff8d621503a175f98e90fc74f3a6c9e4c4be0399fdb8a963fbff63ad5ee8644dde5b76bf3576e71faef6d4ebe6d

Write Preview
Loading…
Cancel
Save