pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=380
This commit is contained in:
Tomáš Chvátal 2016-03-03 12:59:38 +00:00 committed by Git OBS Bridge
parent 955d24fbdb
commit 6a982332b4
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch Normal file
View File

@ -0,0 +1,33 @@
From 3cf65156695b965e38f0fd4cacfc9f07e1cd6e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 3 Mar 2016 13:55:34 +0100
Subject: [PATCH] Fix python2 build of pyuno with older py2 versions
SyntaxError: ('invalid syntax', ('//usr/lib64/libreoffice/program//uno.py',
368, 77, " return _ConstantGroup({c.Name.split('.')[-1]:
c.ConstantValue for c in td.Constants})\n"))
Change-Id: Ie87c21fbfd83fc4d6f918eb55128db235c2220a8
---
pyuno/source/module/uno.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index 4c78595..ad77ad3 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -361,7 +361,10 @@ def _impl_getConstantGroupByName( module, group ):
qualifiedName = module + '.' + group
for td in tde:
if td.Name == qualifiedName:
- return _ConstantGroup({c.Name.split('.')[-1]: c.ConstantValue for c in td.Constants})
+ return_dict = dict()
+ for c in td.Constants:
+ return_dict.update({c.Name.split('.')[-1]: c.ConstantValue})
+ return _ConstantGroup(return_dict)
else:
raise ValueError
--
2.7.2

1
libreoffice.changes
View File

@ -9,6 +9,7 @@ Wed Mar 2 16:48:33 UTC 2016 - tchvatal@suse.com
- Add upstreamed patches to fix patch application on sle11:
* 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
* 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
* 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
- Localy disable the services test that SEGVs on sle11
* libreoffice-disable-services-check.patch

2
libreoffice.spec
View File

@ -174,6 +174,7 @@ Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: broken patch command on sle11 fails to apply patch
Patch8: 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
Patch9: 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
Patch11: 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
# PATCH-FIX-SUSE: disable services unittest that fails
Patch10: libreoffice-disable-services-check.patch
# try to save space by using hardlinks
@ -1039,6 +1040,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%endif
%patch8 -p1
%patch9 -p1
%patch11 -p1
%if 0%{?suse_version} < 1130
%patch10 -p1
%endif