summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2018-07-14 13:44:55 -0500
committerJory A. Pratt <anarchy@gentoo.org>2018-07-14 13:44:55 -0500
commit48bab39bb81a1a384578838abb690c3bf001d15c (patch)
treeff344b2a0f7cddaef34175bc40abfafc718b3924
parentvirtual/rust: needed for musl support (diff)
downloadanarchy-48bab39bb81a1a384578838abb690c3bf001d15c.tar.gz
anarchy-48bab39bb81a1a384578838abb690c3bf001d15c.tar.bz2
anarchy-48bab39bb81a1a384578838abb690c3bf001d15c.zip
app-office/libreoffice: sync with changes from main tree
-rw-r--r--app-office/libreoffice/Manifest5
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch46
-rw-r--r--app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild (renamed from app-office/libreoffice/libreoffice-6.0.5.2.ebuild)49
3 files changed, 73 insertions, 27 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e29d551..9cc73cd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,14 +6,15 @@ AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94aca
AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
AUX libreoffice-6.0.4.2-paxkernel.patch 881 BLAKE2B e0cf510589723842568b6616a28da945204f8b61ed384da4b9a65b5cda7801780985a175c4b9e34d8d40a4762c0363b337ba3eb14d58a08ad314a6e108b78342 SHA512 1b1b69a0116ebb2805f7c0ecf9a5656dfd1a27a15e7d94a7df310f47a4fe817a52fab2151688ec8c0543ae0bfb235770a418ed736968f88ec63850a09b5e337d
+AUX libreoffice-6.0.5.2-enable-gio-w-gtk3.patch 2011 BLAKE2B ecbde1fcb3bbd6ee3d3be9a6b105684bf9b9e18b3c034cfcae216f0b41d8ad47a58838e75b9f20ec620ce2f6a60468d3d436871e71288e3df3dd8e7fd53ebd15 SHA512 ee543bb2825730e2fe5efa32f435e2895e7fc7b546e9844bb1f34b98a734abaa5b8751223fc14f9913a8ccb964666b20347832687157089345a5513159ee7f21
AUX linux-musl.patch 2198 BLAKE2B 2eec2c03ad678170b121f23a12c5b33c502d0edc6ce4970ca5562b9108c1cf21b88908a1d8b628c2f2cc572bdea75ce12b78dd29c5ec1697713bddd646f3a18c SHA512 52da356200beb292a1abcdcd64caaec0d5da59eeeb2741869188ec36da2e03247b926be924078ae1bd7099022ac6d09339523838eba3b207465e8896d4e5068a
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
+DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
-EBUILD libreoffice-6.0.5.2.ebuild 17032 BLAKE2B 24086de205cc9257a42f5a560273b416d5bd97c15da918991d8ea36aae781945a47a4ea0a95af3f57c480a35e81da83adc5c1f5eeaba6bf4562095feef14a27b SHA512 aa8590a08ea6a1993092ef0cd19360e7d2bdeed0eaa0006462969e0a598846a6025f93518e6105b2cf69052f10131ba35b267f2607ac7cc2a55dcf859e4b898e
+EBUILD libreoffice-6.0.5.2-r1.ebuild 17029 BLAKE2B 91f98651938e43275030bf45c1020dca0a765af2f4098c6651e793904ee76e978fb3de268f9f5d0aea6c5cc11f066568c0222ef6af6887ca522bb0d7a602d431 SHA512 b32e8332173f2023911fab1b8a3356fa43038a66e242e59401efae2522189a0f11e82f381307ab173d2c539cfd62ea4a666d6ce41f3c288f5dd5308e5aff3b0a
diff --git a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
new file mode 100644
index 0000000..4a01871
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
@@ -0,0 +1,46 @@
+From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu, 31 May 2018 14:14:48 +0200
+Subject: --enable-gio also for --disable-gtk --enable-gtk3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+...as is used by the Flatpak build. Other settings only checked in that block
+controlled by ENABLE_GTK, and thus potentially erronously left empty for
+--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings.
+GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it
+being empty apparently has no negative effects, so leave it at that for now.
+On the GTK_PRINT-related settings, Caolan commented on IRC: "ENABLE_GTK_PRINT
+is probably best removed entirely I guess, it didn't work out and they're
+redoing the dialog in upstream gtk again I'm told."
+
+Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3
+Reviewed-on: https://gerrit.libreoffice.org/55127
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486)
+Reviewed-on: https://gerrit.libreoffice.org/55164
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e35db48..9da61d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9875,7 +9875,9 @@ if test "$test_gtk" = "yes"; then
+ GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "${GTK_PRINT_LIBS}"
+ GTK_PRINT_LIBS="${filteredlibs}"
++ fi
+
++ if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then
+ AC_MSG_CHECKING([whether to enable GIO support])
+ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
+ dnl Need at least 2.26 for the dbus support.
+--
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 2d47774..2c8224f 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-02.tar.xz"
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -113,10 +113,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libgpg-error
>=dev-libs/liborcus-0.13.3
dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
@@ -135,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ sys-libs/zlib:=
virtual/glu
virtual/jpeg:0
virtual/opengl
@@ -162,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
media-libs/mesa[egl]
x11-libs/gtk+:3
+ x11-libs/pango
)
gtk2? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
+ x11-libs/pango
)
jemalloc? ( dev-libs/jemalloc )
kde? (
@@ -211,10 +214,7 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
@@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/flex
sys-devel/gettext
sys-devel/ucpp
- sys-libs/zlib
virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
@@ -252,16 +251,19 @@ PATCHES=(
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ # 6.0 branch
+ "${FILESDIR}/${P}-enable-gio-w-gtk3.patch" #bug 661062
- # Musl Patches
- "${FILESDIR}/linux-musl.patch"
- "${FILESDIR}/fix-execinfo.patch"
- "${FILESDIR}/fix-includes.patch"
+- # Musl Patches
+- "${FILESDIR}/linux-musl.patch"
+- "${FILESDIR}/fix-execinfo.patch"
+- "${FILESDIR}/fix-includes.patch"
+-
+- # Only to be applied on pax enabled kernels
+- "${FILESDIR}/${PN}-6.0.4.2-paxkernel.patch"
- # Only to be applied on pax enabled kernels
- "${FILESDIR}/${PN}-6.0.4.2-paxkernel.patch"
+ # gtk3-kde5 vcl plugin backported from master
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
)
S="${WORKDIR}/${PN}-${MY_PV}"
@@ -273,6 +275,7 @@ _check_reqs() {
else
CHECKREQS_DISK_BUILD="6G"
fi
+ check-reqs_$1
}
pkg_pretend() {
@@ -285,10 +288,7 @@ pkg_pretend() {
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_pretend
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
pkg_setup() {
@@ -296,10 +296,7 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_setup
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
src_unpack() {
@@ -416,6 +413,7 @@ src_configure() {
--disable-fetch-external
--disable-gstreamer-0-10
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-report-builder
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -428,6 +426,7 @@ src_configure() {
--with-lang=""
--with-parallelism=$(makeopts_jobs)
--with-system-ucpp
+ --with-tls=nss
--with-vendor="Gentoo Foundation"
--with-x
--without-fonts