Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 518664 - app-office/libreoffice-4.3 version bump
Summary: app-office/libreoffice-4.3 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal with 1 vote (vote)
Assignee: Gentoo Office Team
URL: http://www.libreoffice.org/download/l...
Whiteboard:
Keywords:
Depends on: 520692 521836
Blocks:
  Show dependency tree
 
Reported: 2014-07-31 12:13 UTC by charles17
Modified: 2016-08-11 11:19 UTC (History)
14 users (show)

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


Attachments
libreoffice-4.3.0.4.ebuild.diff (libreoffice-4.3.0.4.ebuild.diff,2.24 KB, patch)
2014-08-02 21:41 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.0.4.ebuild.diff with --disable-mergelibs workaround (libreoffice-4.3.0.4.ebuild.diff,2.45 KB, patch)
2014-08-03 10:45 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.1.ebuild.diff (libreoffice-4.3.1.1.ebuild.diff,3.84 KB, patch)
2014-08-17 13:31 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2.ebuild.diff (libreoffice-4.3.1.2.ebuild.diff,4.18 KB, patch)
2014-08-30 17:43 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-implement--with-system-gltf.patch (libreoffice-4.3.1.2-implement--with-system-gltf.patch,4.48 KB, patch)
2014-08-31 20:51 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-handle-collada-libs-seperately.patch (libreoffice-4.3.1.2-handle-collada-libs-seperately.patch,6.73 KB, patch)
2014-08-31 20:51 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-r1.ebuild.diff (libreoffice-4.3.1.2-r1.ebuild.diff,5.16 KB, patch)
2014-08-31 20:55 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-implement--with-system-coinmp.patch (libreoffice-4.3.1.2-implement--with-system-coinmp.patch,2.79 KB, patch)
2014-09-01 00:57 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-r1.ebuild.diff (libreoffice-4.3.1.2-r1.ebuild.diff,5.36 KB, patch)
2014-09-01 00:59 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch (libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch,9.97 KB, patch)
2014-09-06 19:12 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-r1.ebuild.diff (libreoffice-4.3.1.2-r1.ebuild.diff,5.06 KB, patch)
2014-09-06 19:14 UTC, Andreas Sturmlechner
Details | Diff
libreoffice-4.3.1.2-r1.ebuild.diff (libreoffice-4.3.1.2-r1.ebuild.diff,4.76 KB, patch)
2014-09-13 20:31 UTC, Andreas Sturmlechner
Details | Diff
build.log (build.log,23.91 KB, text/plain)
2014-09-16 12:15 UTC, charles17
Details

Note You need to log in before you can comment on or make changes to this bug.
Comment 1 Alex Xu (Hello71) 2014-07-31 14:49:57 UTC
oops.
Comment 2 Andreas Sturmlechner gentoo-dev 2014-07-31 23:20:59 UTC
There are quite a few dependencies that need version bumps first, plus a new package (dev-libs/librevenge):

--- libreoffice-9999-r2.ebuild  2014-05-18 11:31:06.000000000 +0200
+++ libreoffice-4.3.0.4.ebuild  2014-07-31 01:03:46.984736761 +0200
@@ -97,17 +97,17 @@
        app-arch/unzip
        >=app-text/hunspell-1.3.2-r3
        app-text/mythes
-       app-text/libabw
+       >=app-text/libabw-0.1.0
        >=app-text/libexttextcat-3.2
-       app-text/libebook
-       app-text/libetonyek
+       >=app-text/libebook-0.1.1
+       >=app-text/libetonyek-0.1.1
        app-text/liblangtag
-       app-text/libmspub
-       >=app-text/libmwaw-0.2
-       >=app-text/libodfgen-0.0.3
-       app-text/libwpd:0.9[tools]
-       app-text/libwpg:0.2
-       >=app-text/libwps-0.2.2
+       >=app-text/libmspub-0.1.0
+       >=app-text/libmwaw-0.3.1
+       >=app-text/libodfgen-0.1.0
+       >=app-text/libwpd-0.10:0.9[tools]
+       >=app-text/libwpg-0.3.0:0.2
+       >=app-text/libwps-0.3.0
        >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
        dev-cpp/libcmis:0.4
@@ -118,6 +118,7 @@
        >=dev-libs/icu-4.8.1.1:=
        >=dev-libs/libatomic_ops-7.2d
        >=dev-libs/liborcus-0.7.0:=
+       >=dev-libs/librevenge-0.0.1
        >=dev-libs/nspr-4.8.8
        >=dev-libs/nss-3.12.9
        >=dev-lang/perl-5.0
@@ -130,9 +131,9 @@
        >=media-libs/harfbuzz-0.9.18:=[icu(+)]
        media-libs/lcms:2
        >=media-libs/libpng-1.4
-       >=media-libs/libcdr-0.0.5
-       media-libs/libfreehand
-       media-libs/libvisio
+       >=media-libs/libcdr-0.1.0
+       >=media-libs/libfreehand-0.1.0
+       >=media-libs/libvisio-0.1.0
        >=net-misc/curl-7.21.4
        net-nds/openldap
        sci-mathematics/lpsolve
Comment 3 Andreas Sturmlechner gentoo-dev 2014-08-02 18:52:18 UTC
Instead of filing version bumps for each and every dependency, here's my repo where you can find the ebuilds under app-text/ dev-libs/ and media-libs/

https://github.com/a17r/a17rgentoo
Comment 4 Andreas Sturmlechner gentoo-dev 2014-08-02 21:41:49 UTC
Created attachment 382110 [details, diff]
libreoffice-4.3.0.4.ebuild.diff

For the brave, an ebuild (patch against 9999-r2) that should get you started.

I haven't had a chance to build it all through due to some stability problems with the test box.
Comment 5 Andreas Sturmlechner gentoo-dev 2014-08-03 08:09:49 UTC
Build succeeds, but suffers from the following regression:

https://bugs.launchpad.net/ubuntu/+source/libreoffice/+bug/1333073

It seems the problem is --enable-mergelibs
Comment 6 Andreas Sturmlechner gentoo-dev 2014-08-03 08:37:14 UTC
This:

$ ldd /usr/lib64/libreoffice/program/libexpwraplo.so
        linux-vdso.so.1 (0x00007fff24bfd000)
        libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f83384e2000)
        libuno_cppu.so.3 => /usr/lib64/libreoffice/program/../ure-link/lib/libuno_cppu.so.3 (0x00007f83382a0000)
        libuno_cppuhelpergcc3.so.3 => /usr/lib64/libreoffice/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3 (0x00007f8337fa9000)
        libuno_sal.so.3 => /usr/lib64/libreoffice/program/../ure-link/lib/libuno_sal.so.3 (0x00007f8337d53000)
        libuno_salhelpergcc3.so.3 => /usr/lib64/libreoffice/program/../ure-link/lib/libuno_salhelpergcc3.so.3 (0x00007f8337b4a000)
        libsaxlo.so => not found
        libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.3/libstdc++.so.6 (0x00007f8337841000)
        libm.so.6 => /lib64/libm.so.6 (0x00007f8337547000)
        libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.3/libgcc_s.so.1 (0x00007f8337330000)
        libc.so.6 => /lib64/libc.so.6 (0x00007f8336f88000)
        libreglo.so => /usr/lib64/libreoffice/program/../ure-link/lib/libreglo.so (0x00007f8336d67000)
        libunoidllo.so => /usr/lib64/libreoffice/program/../ure-link/lib/libunoidllo.so (0x00007f8336b0b000)
        libxmlreaderlo.so => /usr/lib64/libreoffice/program/../ure-link/lib/libxmlreaderlo.so (0x00007f8336900000)
        libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f83366e1000)
        libdl.so.2 => /lib64/libdl.so.2 (0x00007f83364dd000)
        librt.so.1 => /lib64/librt.so.1 (0x00007f83362d5000)
        /lib64/ld-linux-x86-64.so.2 (0x00007f833896c000)
        libstorelo.so => /usr/lib64/libreoffice/program/../ure-link/lib/libstorelo.so (0x00007f83360b4000)


So, libsaxlo.so missing from install. Of course, somebody already knew before: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg99330.html
Comment 7 Andreas Sturmlechner gentoo-dev 2014-08-03 10:45:13 UTC
Created attachment 382128 [details, diff]
libreoffice-4.3.0.4.ebuild.diff with --disable-mergelibs workaround

this works indeed (giving us /usr/lib64/libreoffice/program/libsaxlo.so)
Comment 8 Andreas Sturmlechner gentoo-dev 2014-08-17 13:31:05 UTC
Created attachment 383036 [details, diff]
libreoffice-4.3.1.1.ebuild.diff

new bump, still with --disable-mergelibs
- makes coinmp and gltf optional
Comment 9 Andreas Sturmlechner gentoo-dev 2014-08-30 17:43:56 UTC
Created attachment 383974 [details, diff]
libreoffice-4.3.1.2.ebuild.diff

4.3.1 final release, mergelibs still in trouble
Comment 10 Andreas Sturmlechner gentoo-dev 2014-08-31 20:51:09 UTC
Created attachment 384020 [details, diff]
libreoffice-4.3.1.2-implement--with-system-gltf.patch
Comment 11 Andreas Sturmlechner gentoo-dev 2014-08-31 20:51:26 UTC
Created attachment 384022 [details, diff]
libreoffice-4.3.1.2-handle-collada-libs-seperately.patch
Comment 12 Andreas Sturmlechner gentoo-dev 2014-08-31 20:55:20 UTC
Created attachment 384024 [details, diff]
libreoffice-4.3.1.2-r1.ebuild.diff

Upstream now has patches in git master enabling to build with system libgltf and use collada separately.

Requires media-libs/libgltf

Successfully built with USE="gltf" (and without collada) and made sure to work with the duck model from https://wiki.documentfoundation.org/ReleaseNotes/4.3#3D_models
Comment 13 Andreas Sturmlechner gentoo-dev 2014-09-01 00:57:15 UTC
Created attachment 384032 [details, diff]
libreoffice-4.3.1.2-implement--with-system-coinmp.patch

So I've found an --implement-system-coinmp patch in git master that is actually much older than the libgltf/collada but somehow didn't end up in 4.3 branch yet.

Merged with a small change to make it work on top of the collada patch.
Comment 14 Andreas Sturmlechner gentoo-dev 2014-09-01 00:59:05 UTC
Created attachment 384034 [details, diff]
libreoffice-4.3.1.2-r1.ebuild.diff

Use the patch. Seems to work, built fine & functionality is there.
Comment 15 Holger Hoffstätte 2014-09-03 19:45:03 UTC
(In reply to Andreas Sturmlechner from comment #14)
> Created attachment 384034 [details, diff] [details, diff]
> libreoffice-4.3.1.2-r1.ebuild.diff
> 
> Use the patch. Seems to work, built fine & functionality is there.

Tried to do this & the patch worked fine, but after bumping assorted deps (app-text/*) I gave up on libwpg. At least 2 issues: the libwpg dependency needs to be on 0.3.0 (not 0.3) and it also seems to need one or multiple slot bumps in various places (no idea where), otherwise it blocks the whole build.
Comment 16 Andreas Sturmlechner gentoo-dev 2014-09-03 20:08:49 UTC
(In reply to Holger Hoffstätte from comment #15)
> At least 2 issues: the libwpg dependency
> needs to be on 0.3.0 (not 0.3) and it also seems to need one or multiple
> slot bumps in various places (no idea where), otherwise it blocks the whole
> build.
I did bump a few slots where it felt right (e.g. libwpg which libreoffice depends on via :0.3, if you look at it - does seem fine to me), didn't in other places (libebook e.g. requires changes if we want to make it co-installable with 0.0.x) and raised the version dep instead.
Comment 17 Andreas Sturmlechner gentoo-dev 2014-09-06 19:12:58 UTC
Created attachment 384308 [details, diff]
libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch

not going to package libgltf-0.0.0, upstream patch from http://cgit.freedesktop.org/libreoffice/core/commit/?id=a60cc580212e2770c3aef7decfa09b64d4a3e52f
Comment 18 Andreas Sturmlechner gentoo-dev 2014-09-06 19:14:26 UTC
Created attachment 384310 [details, diff]
libreoffice-4.3.1.2-r1.ebuild.diff

some fixes, one less hack, one more patch
Comment 19 charles17 2014-09-12 11:51:15 UTC
(In reply to Andreas Sturmlechner from comment #18)
> Created attachment 384310 [details, diff] [details, diff]
> libreoffice-4.3.1.2-r1.ebuild.diff
> [...]

Could we please have it in portage as ~ for testing?
Comment 20 Andreas Sturmlechner gentoo-dev 2014-09-13 20:31:59 UTC
Created attachment 384690 [details, diff]
libreoffice-4.3.1.2-r1.ebuild.diff

fixed mergelibs as suggested by scarabeus
Comment 21 charles17 2014-09-16 12:15:54 UTC
Created attachment 384836 [details]
build.log

Compilation fails with No package "'apr-util-1' found"
Comment 22 charles17 2014-09-16 12:39:34 UTC
checking for SERF... no
configure: error: Package requirements (serf-1 >= 1.1.0) were not met:
Comment 23 charles17 2014-09-16 19:45:51 UTC
After installation of the missing packages it finally wfm:

$ genlop -t app-office/libreoffice-4.3.1.2
 * app-office/libreoffice

     Tue Sep 16 21:31:42 2014 >>> app-office/libreoffice-4.3.1.2
       merge time: 5 hours, 3 minutes and 42 seconds.
Comment 24 charles17 2014-09-17 05:34:27 UTC
And now it wonts to pull in net-libs/neon, as a hard dependency.
Shouldn't it have that in a USE flag?
Comment 25 Andreas K. Hüttel archtester gentoo-dev 2014-09-18 06:41:29 UTC
Bumped.