| 1 |
commit: 5c817e1b0bcc1f067390ff409feff4e8ffd605d6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 27 19:27:57 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 28 23:18:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c817e1b |
| 7 |
|
| 8 |
app-office/libreoffice: Add 6.0 patchset for gtk3-kde5 vcl plugin |
| 9 |
|
| 10 |
Switches 6.0 branch USE=kde away from kdelibs4. |
| 11 |
|
| 12 |
Thanks-to: Andrius Štikonas <andrius <AT> stikonas.eu> |
| 13 |
Bug: https://bugs.gentoo.org/645558 |
| 14 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 15 |
|
| 16 |
app-office/libreoffice/Manifest | 1 + |
| 17 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 45 ++++++++++++---------- |
| 18 |
2 files changed, 26 insertions(+), 20 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 21 |
index 83d7c49cecb..ca35e8495a0 100644 |
| 22 |
--- a/app-office/libreoffice/Manifest |
| 23 |
+++ b/app-office/libreoffice/Manifest |
| 24 |
@@ -6,6 +6,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 |
| 25 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a |
| 26 |
DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c |
| 27 |
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882 |
| 28 |
+DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9 |
| 29 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 30 |
DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 |
| 31 |
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226 |
| 32 |
|
| 33 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 34 |
index 90f72941a9b..4ef05313f50 100644 |
| 35 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 36 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 37 |
@@ -17,7 +17,7 @@ DEV_URI=" |
| 38 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 39 |
|
| 40 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 41 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
| 42 |
+PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz" |
| 43 |
|
| 44 |
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" |
| 45 |
inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} |
| 46 |
@@ -26,7 +26,7 @@ unset SCM_ECLASS |
| 47 |
DESCRIPTION="A full office productivity suite" |
| 48 |
HOMEPAGE="https://www.libreoffice.org" |
| 49 |
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
| 50 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" |
| 51 |
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
| 52 |
|
| 53 |
# Split modules following git/tarballs |
| 54 |
# Core MUST be first! |
| 55 |
@@ -157,17 +157,23 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 56 |
x11-libs/gdk-pixbuf |
| 57 |
>=x11-libs/gtk+-2.24:2 |
| 58 |
) |
| 59 |
+ kde? ( |
| 60 |
+ dev-qt/qtcore:5 |
| 61 |
+ dev-qt/qtgui:5 |
| 62 |
+ dev-qt/qtx11extras:5 |
| 63 |
+ dev-qt/qtwidgets:5 |
| 64 |
+ kde-frameworks/kconfig:5 |
| 65 |
+ kde-frameworks/kcoreaddons:5 |
| 66 |
+ kde-frameworks/ki18n:5 |
| 67 |
+ kde-frameworks/kio:5 |
| 68 |
+ kde-frameworks/kwindowsystem:5 |
| 69 |
+ ) |
| 70 |
jemalloc? ( dev-libs/jemalloc ) |
| 71 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 72 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 73 |
mysql? ( dev-db/mysql-connector-c++ ) |
| 74 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 75 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 76 |
- kde? ( |
| 77 |
- dev-qt/qtcore:4 |
| 78 |
- dev-qt/qtgui:4 |
| 79 |
- kde-frameworks/kdelibs |
| 80 |
- ) |
| 81 |
" |
| 82 |
|
| 83 |
RDEPEND="${COMMON_DEPEND} |
| 84 |
@@ -230,6 +236,7 @@ DEPEND="${COMMON_DEPEND} |
| 85 |
|
| 86 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 87 |
bluetooth? ( dbus ) |
| 88 |
+ kde? ( gtk ) |
| 89 |
libreoffice_extensions_nlpsolver? ( java ) |
| 90 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 91 |
libreoffice_extensions_scripting-javascript? ( java ) |
| 92 |
@@ -244,6 +251,9 @@ PATCHES=( |
| 93 |
# TODO: upstream |
| 94 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 95 |
"${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602 |
| 96 |
+ |
| 97 |
+ # gtk3-kde5 vcl plugin backported from master |
| 98 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 99 |
) |
| 100 |
|
| 101 |
pkg_pretend() { |
| 102 |
@@ -284,13 +294,9 @@ pkg_setup() { |
| 103 |
} |
| 104 |
|
| 105 |
src_unpack() { |
| 106 |
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} |
| 107 |
- use branding && unpack "${BRANDING}" |
| 108 |
+ default |
| 109 |
|
| 110 |
- if [[ ${PV} != *9999* ]]; then |
| 111 |
- unpack "${P}.tar.xz" |
| 112 |
- unpack "${PN}-help-${PV}.tar.xz" |
| 113 |
- else |
| 114 |
+ if [[ ${PV} = *9999* ]]; then |
| 115 |
local base_uri branch mypv |
| 116 |
base_uri="https://anongit.freedesktop.org/git" |
| 117 |
branch="master" |
| 118 |
@@ -305,7 +311,6 @@ src_unpack() { |
| 119 |
} |
| 120 |
|
| 121 |
src_prepare() { |
| 122 |
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" |
| 123 |
default |
| 124 |
|
| 125 |
AT_M4DIR="m4" eautoreconf |
| 126 |
@@ -360,9 +365,9 @@ src_configure() { |
| 127 |
export PYTHON_LIBS=$(python_get_LIBS) |
| 128 |
|
| 129 |
if use kde; then |
| 130 |
- # bug 544108, bug 599076 |
| 131 |
- export QMAKE4="$(qt4_get_bindir)/qmake" |
| 132 |
- export MOCQT4="$(qt4_get_bindir)/moc" |
| 133 |
+ export QT_SELECT=5 # bug 639620 needs proper fix though |
| 134 |
+ export QT5DIR="$(qt5_get_bindir)/../" |
| 135 |
+ export MOC5="$(qt5_get_bindir)/moc" |
| 136 |
fi |
| 137 |
|
| 138 |
# system headers/libs/...: enforce using system packages |
| 139 |
@@ -398,7 +403,6 @@ src_configure() { |
| 140 |
--disable-gstreamer-0-10 |
| 141 |
--disable-online-update |
| 142 |
--disable-pdfium |
| 143 |
- --disable-qt5 |
| 144 |
--disable-report-builder |
| 145 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") |
| 146 |
--with-build-version="Gentoo official package" |
| 147 |
@@ -421,18 +425,19 @@ src_configure() { |
| 148 |
$(use_enable bluetooth sdremote-bluetooth) |
| 149 |
$(use_enable coinmp) |
| 150 |
$(use_enable cups) |
| 151 |
- $(use_enable debug) |
| 152 |
$(use_enable dbus) |
| 153 |
+ $(use_enable debug) |
| 154 |
$(use_enable eds evolution2) |
| 155 |
$(use_enable firebird firebird-sdbc) |
| 156 |
$(use_enable gstreamer gstreamer-1-0) |
| 157 |
$(use_enable gtk gtk3) |
| 158 |
$(use_enable gtk2 gtk) |
| 159 |
+ $(use_enable kde gtk3-kde5) |
| 160 |
+ $(use_enable kde qt5) |
| 161 |
$(use_enable mysql ext-mariadb-connector) |
| 162 |
$(use_enable odk) |
| 163 |
$(use_enable pdfimport) |
| 164 |
$(use_enable postgres postgresql-sdbc) |
| 165 |
- $(use_enable kde kde4) |
| 166 |
$(use_enable vlc) |
| 167 |
$(use_with coinmp system-coinmp) |
| 168 |
$(use_with googledrive gdrive-client-id ${google_default_client_id}) |
Archives