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

- Try to finish out the py3 migration.

Browse Source 
- Remove now not needed patch:
  * wizards-create-temlates-with-python-2.6.diff

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=177
This commit is contained in:
Tomáš Chvátal 2014-07-24 08:33:51 +00:00 committed by Git OBS Bridge
parent b715a990ad
commit 49e1ea7deb
3 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libreoffice.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 24 08:33:07 UTC 2014 - tchvatal@suse.com
- Try to finish out the py3 migration.
- Remove now not needed patch:
* wizards-create-temlates-with-python-2.6.diff
-------------------------------------------------------------------
Mon Jul 21 07:09:41 UTC 2014 - tchvatal@suse.com

13
libreoffice.spec
View File

@ -88,8 +88,6 @@ Patch12: mediawiki-no-broken-help.diff
# LO never worked well with it
Patch13: jvmfwk-disable-gcj.diff
Patch14: libreoffice-4.3.0.3-themes-symlinks.patch
# Fix running wizards in py2 as the utf is not there
Patch16: wizards-create-temlates-with-python-2.6.diff
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: ImageMagick
@ -212,6 +210,7 @@ Requires: libreoffice-branding >= 4.0
Requires: libreoffice-icon-themes = %{version}
# We need at least english to launch ourselves.
Requires: libreoffice-l10n-en = %{version}
Requires: python3
Requires(post): coreutils
Requires(post): grep
Requires(post): gtk2
@ -1123,9 +1122,9 @@ for file in $files; do
done
# Symlink uno.py and unohelper.py so that python can find them
mkdir -p %{buildroot}%{python_sitelib}
ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python_sitelib}/uno.py
ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python_sitelib}/unohelper.py
mkdir -p %{buildroot}%{python3_sitelib}
ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py
ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py
# Remove translations source as we need more space
rm -rf translations/source/
@ -1264,8 +1263,8 @@ fi
%files -f file-lists/pyuno_list.txt pyuno
%defattr(-,root,root)
%{python_sitelib}/uno.py
%{python_sitelib}/unohelper.py
%{python3_sitelib}/uno.py
%{python3_sitelib}/unohelper.py
%files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root)

45
wizards-create-temlates-with-python-2.6.diff
View File

@ -1,45 +0,0 @@
diff -urN libreoffice-4.2.0.1.old/wizards/com/sun/star/wizards/common/SystemDialog.py libreoffice-4.2.0.1/wizards/com/sun/star/wizards/common/SystemDialog.py
--- libreoffice-4.2.0.1.old/wizards/com/sun/star/wizards/common/SystemDialog.py 2013-12-30 11:24:14.200021127 +0100
+++ libreoffice-4.2.0.1/wizards/com/sun/star/wizards/common/SystemDialog.py 2014-01-01 14:34:21.173943513 +0100
@@ -15,6 +15,7 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+import locale
import traceback
from .Desktop import Desktop
@@ -140,6 +141,24 @@
traceback.print_exc()
'''
+ The original string is in the system encoding but str accepts only "ascii" in python 2.6
+ This hack is not needed with python-3.0
+ '''
+ def createStr(self, sString):
+ try:
+ strString = str(sString)
+
+ except:
+ try:
+ sCodeSet = locale.nl_langinfo(locale.CODESET)
+ except:
+ sCodeSet = "utf-8"
+
+ strString = str(sString.encode(sCodeSet))
+
+ return strString
+
+ '''
note the result should go through conversion of the product name.
@param filterName
@return the UI localized name of the given filter name.
@@ -153,7 +172,7 @@
xPropertyValue = list(oObject)
for i in xPropertyValue:
if i is not None and i.Name == "UIName":
- return str(i.Value).replace("%productname%", "LibreOffice")
+ return self.createStr(i.Value).replace("%productname%", "LibreOffice")
raise NullPointerException(
"UIName property not found for Filter " + filterName);