Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 388174 Details for
Bug 523934
app-office/libreoffice-4.3.2.2 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.3.2.ebuild.diff
libreoffice-4.3.3.2.ebuild.diff (text/plain), 4.20 KB, created by
Andreas Sturmlechner
on 2014-11-01 20:13:05 UTC
(
hide
)
Description:
libreoffice-4.3.3.2.ebuild.diff
Filename:
MIME Type:
Creator:
Andreas Sturmlechner
Created:
2014-11-01 20:13:05 UTC
Size:
4.20 KB
patch
obsolete
>--- libreoffice-4.3.1.2.ebuild 2014-10-24 23:31:04.000000000 +0200 >+++ libreoffice-4.3.3.2.ebuild 2014-11-01 21:03:11.235576041 +0100 >@@ -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-4.3.1.2.ebuild,v 1.4 2014/10/24 21:05:21 dilfridge Exp $ >+# $Header: $ > > EAPI=5 > >@@ -60,8 +60,6 @@ > # 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 >@@ -74,7 +72,7 @@ > unset ADDONS_SRC > > 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" >++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test valgrind +vba vlc" > > LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" > # Unpackaged separate extensions: >@@ -97,7 +95,7 @@ > ${PYTHON_DEPS} > app-arch/zip > app-arch/unzip >- >=app-text/hunspell-1.3.2-r3 >+ >=app-text/hunspell-1.3.3 > app-text/mythes > >=app-text/libabw-0.1.0 > >=app-text/libexttextcat-3.2 >@@ -146,6 +144,7 @@ > x11-libs/libXrender > bluetooth? ( net-wireless/bluez ) > coinmp? ( sci-libs/coinor-mp ) >+ collada? ( media-libs/opencollada ) > cups? ( net-print/cups ) > dbus? ( >=dev-libs/dbus-glib-0.92 ) > eds? ( gnome-extra/evolution-data-server ) >@@ -182,6 +181,9 @@ > >=net-libs/telepathy-glib-0.18.0 > >=x11-libs/gtk+-2.24:2 > ) >+ valgrind? ( >+ dev-util/valgrind >+ ) > " > > RDEPEND="${COMMON_DEPEND} >@@ -245,13 +247,14 @@ > # not upstreamable stuff > "${FILESDIR}/${PN}-3.7-system-pyuno.patch" > >- # from libreoffice-4-3 branch >- "${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-upgrade-to-libgltf-0.0.1.patch" >+ # upstream bug filed (f.d.o bug #85743) >+ "${FILESDIR}/${PN}-4.3.3.2-make-valgrind-support-optional.patch" > > # from master branch > "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" >+ "${FILESDIR}/${PN}-4.3.2.2-boost-1.56.0.patch" >+ "${FILESDIR}/${PN}-4.3.2.2-add-dbtools-to-libmerged.patch" >+ "${FILESDIR}/${PN}-4.3.2.2-implement-with-system-opencollada.patch" > ) > > REQUIRED_USE=" >@@ -460,6 +463,7 @@ > --enable-cairo-canvas \ > --enable-graphite \ > --enable-largefile \ >+ --enable-mergelibs \ > --enable-neon \ > --enable-python=system \ > --enable-randr \ >@@ -476,7 +480,6 @@ > --disable-report-builder \ > --disable-kdeab \ > --disable-kde \ >- --disable-mergelibs \ > --disable-online-update \ > --disable-systray \ > --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ >@@ -517,6 +520,7 @@ > $(use_enable opengl) \ > $(use_enable postgres postgresql-sdbc) \ > $(use_enable telepathy) \ >+ $(use_enable valgrind) \ > $(use_enable vba) \ > $(use_enable vlc) \ > $(use_with coinmp system-coinmp) \ >@@ -524,6 +528,7 @@ > $(use_with java) \ > $(use_with mysql system-mysql-cppconn) \ > $(use_with odk doxygen) \ >+ $(use_with collada system-opencollada) \ > ${internal_libs} \ > ${java_opts} \ > ${ext_opts} >@@ -585,6 +590,10 @@ > # Remove desktop files for support to old installs that can't parse mime > rm -rf "${ED}"/usr/share/mimelnk/ > >+ # FIXME: Hack add missing file >+ insinto /usr/$(get_libdir)/${PN}/program >+ doins "${S}"/instdir/program/libsaxlo.so >+ > pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin > pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin > }
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 523934
:
385664
|
385666
|
387786
|
387788
|
388172
| 388174