Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 384034 Details for
Bug 518664
app-office/libreoffice-4.3 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
libreoffice-4.3.1.2-r1.ebuild.diff
libreoffice-4.3.1.2-r1.ebuild.diff (text/plain), 5.36 KB, created by
Andreas Sturmlechner
on 2014-09-01 00:59:05 UTC
(
hide
)
Description:
libreoffice-4.3.1.2-r1.ebuild.diff
Filename:
MIME Type:
Creator:
Andreas Sturmlechner
Created:
2014-09-01 00:59:05 UTC
Size:
5.36 KB
patch
obsolete
>--- libreoffice-9999-r2.ebuild 2014-08-15 11:31:04.000000000 +0200 >+++ libreoffice-4.3.1.2-r1.ebuild 2014-09-01 00:47:02.134110633 +0200 >@@ -1,6 +1,6 @@ > # Copyright 1999-2014 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.219 2014/08/15 09:10:14 scarabeus Exp $ >+# $Header: $ > > EAPI=5 > >@@ -60,6 +60,8 @@ > # If you want them gone, patches are welcome. > ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" > ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code >+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" >+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" > ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" > ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? > ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all >@@ -71,8 +73,8 @@ > unset EXT_URI > unset ADDONS_SRC > >-IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk >-gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav" >+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer >++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav" > > LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" > # Unpackaged separate extensions: >@@ -97,17 +99,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[tools] >+ app-text/libwpg:0.3 >+ >=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 +120,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 +133,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 >@@ -142,10 +145,12 @@ > x11-libs/libXrandr > x11-libs/libXrender > bluetooth? ( net-wireless/bluez ) >+ coinmp? ( sci-libs/coinor-mp ) > cups? ( net-print/cups ) > dbus? ( >=dev-libs/dbus-glib-0.92 ) > eds? ( gnome-extra/evolution-data-server ) > firebird? ( >=dev-db/firebird-2.5 ) >+ gltf? ( media-libs/libgltf ) > gnome? ( gnome-base/gconf:2 ) > gtk? ( > x11-libs/gdk-pixbuf[X] >@@ -239,11 +244,17 @@ > PATCHES=( > # not upstreamable stuff > "${FILESDIR}/${PN}-3.7-system-pyuno.patch" >+ >+ # staged for git master >+ "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-gltf.patch" >+ "${FILESDIR}/${PN}-4.3.1.2-handle-collada-libs-seperately.patch" >+ "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" > ) > > REQUIRED_USE=" > ${PYTHON_REQUIRED_USE} > bluetooth? ( dbus ) >+ collada? ( gltf ) > gnome? ( gtk ) > eds? ( gnome ) > telepathy? ( gtk ) >@@ -361,6 +372,11 @@ > -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ > Makefile.in || die > >+ # system libgltf include path >+ sed -i \ >+ -e 's/libgltf\/libgltf.h/libgltf.h/' \ >+ avmedia/source/opengl/ogl{window,player,framegrabber}.hxx || die >+ > if use branding; then > # hack... > mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die >@@ -387,6 +403,9 @@ > --without-system-vigra > " > >+ use coinmp && internal_libs+="--with-system-coinmp" >+ use gltf && internal_libs+="--with-system-libgltf" >+ > # libreoffice extensions handling > for lo_xt in ${LO_EXTS}; do > if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then >@@ -446,7 +465,6 @@ > --enable-cairo-canvas \ > --enable-graphite \ > --enable-largefile \ >- --enable-mergelibs \ > --enable-python=system \ > --enable-randr \ > --enable-randr-link \ >@@ -462,6 +480,7 @@ > --disable-report-builder \ > --disable-kdeab \ > --disable-kde \ >+ --disable-mergelibs \ > --disable-online-update \ > --disable-systray \ > --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ >@@ -482,11 +501,14 @@ > --with-helppack-integration \ > --without-sun-templates \ > $(use_enable bluetooth sdremote-bluetooth) \ >+ $(use_enable coinmp) \ >+ $(use_enable collada) \ > $(use_enable cups) \ > $(use_enable debug) \ > $(use_enable dbus) \ > $(use_enable eds evolution2) \ > $(use_enable firebird firebird-sdbc) \ >+ $(use_enable gltf) \ > $(use_enable gnome gconf) \ > $(use_enable gnome gio) \ > $(use_enable gnome lockdown) \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 518664
:
382110
|
382128
|
383036
|
383974
|
384020
|
384022
|
384024
|
384032
|
384034
|
384308
|
384310
|
384690
|
384836