Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 589040 - app-office/libreoffice-9999 libreoffice-5.2-system-pyuno.patch fails to apply on pyuno/source/module/uno.py
Summary: app-office/libreoffice-9999 libreoffice-5.2-system-pyuno.patch fails to apply...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Office Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-07-17 21:48 UTC by jospezial
Modified: 2016-09-20 09:26 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
libreoffice-5.2-system-pyuno.patch (libreoffice-5.2-system-pyuno.patch,1.63 KB, patch)
2016-08-28 21:59 UTC, cyrillic
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jospezial 2016-07-17 21:48:12 UTC
>>> Preparing source in /var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999 ...
 * Applying libreoffice-5.2-system-pyuno.patch ...
1 out of 1 hunk FAILED -- saving rejects to file pyuno/source/module/uno.py.rej
 [ !! ]
 * ERROR: app-office/libreoffice-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /usr/portage/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
 * 

The patch fails in pyuno/source/module/uno.py

There were big changes on that file:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=deb989dd6d1f86e74864131be50ed92d8d43768c
"* Fixing pep8 violations * Improving comments, docstrings, and unifying coding style * Using functionality copied from six library for Python 2/3 compatibility * Using standard traceback formatting "
Comment 1 myopetz 2016-08-14 22:39:52 UTC
I got the same error message

>>> Source unpacked in /var/tmp/portage/app-office/libreoffice-9999/work
>>> Preparing source in /var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999 ...
 * Applying libreoffice-5.2-system-pyuno.patch ...
1 out of 1 hunk FAILED -- saving rejects to file pyuno/source/module/uno.py.rej                               [ !! ]
 * ERROR: app-office/libreoffice-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /usr/portage/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
 * 
 * Call stack:
 *               ebuild.sh, line  115:  Called src_prepare
 *             environment, line 8098:  Called eapply '/usr/portage/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch'
 *             environment, line 2371:  Called _eapply_patch '/usr/portage/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch'
 *             environment, line 2309:  Called __helpers_die 'patch -p1  failed with /usr/portage/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch'
 *   isolated-functions.sh, line  117:  Called die
 * The specific snippet of code:
 *              die "$@"
 * 
 * If you need support, post the output of `emerge --info '=app-office/libreoffice-9999::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=app-office/libreoffice-9999::gentoo'`.
!!! When you file a bug report, please include the following information:
GENTOO_VM=  CLASSPATH="" JAVA_HOME="/etc/java-config-2/current-system-vm"
JAVACFLAGS="" COMPILER=""
and of course, the output of emerge --info =libreoffice-9999
 * The complete build log is located at '/var/log/portage/app-office:libreoffice-9999:20160814-223705.log'.
 * For convenience, a symlink to the build log is located at '/var/tmp/portage/app-office/libreoffice-9999/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/app-office/libreoffice-9999/temp/environment'.
 * Working directory: '/var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999'
 * S: '/var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999'
Comment 2 cyrillic 2016-08-28 21:59:56 UTC
Created attachment 444350 [details, diff]
libreoffice-5.2-system-pyuno.patch

This is the patch that I am using.
Comment 3 jospezial 2016-08-29 07:40:48 UTC
(In reply to cyrillic from comment #2)
> Created attachment 444350 [details, diff] [details, diff]
> libreoffice-5.2-system-pyuno.patch
> 
> This is the patch that I am using.

Thank you.
Your patch applies and libreoffice-9999 compiles and works.
Comment 4 Andreas Sturmlechner gentoo-dev 2016-09-20 09:26:51 UTC
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b3ed54

app-office/libreoffice: Fix system-pyuno.patch, libxmlsec tarball

Gentoo-bug: 577278
    bump libxmlsec tarball to 1.2.22
Gentoo-bug: 589040
    adapted patch kindly provided by 'cyrillic'