Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 523934 | Differences between
and this patch

Collapse All | Expand All

(-)libreoffice-4.3.1.2.ebuild (-10 / +12 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2014 Gentoo Foundation
1
# Copyright 1999-2014 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $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 $
3
# $Header: $
4
4
5
EAPI=5
5
EAPI=5
6
6
Lines 60-67 Link Here
60
# If you want them gone, patches are welcome.
60
# If you want them gone, patches are welcome.
61
ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
61
ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
62
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
62
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
63
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
64
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
65
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
63
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
66
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
64
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
67
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
65
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
Lines 97-103 Link Here
97
	${PYTHON_DEPS}
95
	${PYTHON_DEPS}
98
	app-arch/zip
96
	app-arch/zip
99
	app-arch/unzip
97
	app-arch/unzip
100
	>=app-text/hunspell-1.3.2-r3
98
	>=app-text/hunspell-1.3.3
101
	app-text/mythes
99
	app-text/mythes
102
	>=app-text/libabw-0.1.0
100
	>=app-text/libabw-0.1.0
103
	>=app-text/libexttextcat-3.2
101
	>=app-text/libexttextcat-3.2
Lines 146-151 Link Here
146
	x11-libs/libXrender
144
	x11-libs/libXrender
147
	bluetooth? ( net-wireless/bluez )
145
	bluetooth? ( net-wireless/bluez )
148
	coinmp? ( sci-libs/coinor-mp )
146
	coinmp? ( sci-libs/coinor-mp )
147
	collada? ( media-libs/opencollada )
149
	cups? ( net-print/cups )
148
	cups? ( net-print/cups )
150
	dbus? ( >=dev-libs/dbus-glib-0.92 )
149
	dbus? ( >=dev-libs/dbus-glib-0.92 )
151
	eds? ( gnome-extra/evolution-data-server )
150
	eds? ( gnome-extra/evolution-data-server )
Lines 245-257 Link Here
245
	# not upstreamable stuff
244
	# not upstreamable stuff
246
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
245
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
247
246
248
	# from libreoffice-4-3 branch
249
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-gltf.patch"
250
	"${FILESDIR}/${PN}-4.3.1.2-handle-collada-libs-seperately.patch"
251
	"${FILESDIR}/${PN}-4.3.1.2-upgrade-to-libgltf-0.0.1.patch"
252
253
	# from master branch
247
	# from master branch
254
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
248
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
249
	"${FILESDIR}/${PN}-4.3.2.2-boost-1.56.0.patch"
250
	"${FILESDIR}/${PN}-4.3.2.2-add-dbtools-to-libmerged.patch"
251
	"${FILESDIR}/${PN}-4.3.2.2-implement-with-system-opencollada.patch"
255
)
252
)
256
253
257
REQUIRED_USE="
254
REQUIRED_USE="
Lines 460-465 Link Here
460
		--enable-cairo-canvas \
457
		--enable-cairo-canvas \
461
		--enable-graphite \
458
		--enable-graphite \
462
		--enable-largefile \
459
		--enable-largefile \
460
		--enable-mergelibs \
463
		--enable-neon \
461
		--enable-neon \
464
		--enable-python=system \
462
		--enable-python=system \
465
		--enable-randr \
463
		--enable-randr \
Lines 476-482 Link Here
476
		--disable-report-builder \
474
		--disable-report-builder \
477
		--disable-kdeab \
475
		--disable-kdeab \
478
		--disable-kde \
476
		--disable-kde \
479
		--disable-mergelibs \
480
		--disable-online-update \
477
		--disable-online-update \
481
		--disable-systray \
478
		--disable-systray \
482
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
479
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
Lines 524-529 Link Here
524
		$(use_with java) \
521
		$(use_with java) \
525
		$(use_with mysql system-mysql-cppconn) \
522
		$(use_with mysql system-mysql-cppconn) \
526
		$(use_with odk doxygen) \
523
		$(use_with odk doxygen) \
524
		$(use_with collada system-opencollada) \
527
		${internal_libs} \
525
		${internal_libs} \
528
		${java_opts} \
526
		${java_opts} \
529
		${ext_opts}
527
		${ext_opts}
Lines 585-590 Link Here
585
	# Remove desktop files for support to old installs that can't parse mime
583
	# Remove desktop files for support to old installs that can't parse mime
586
	rm -rf "${ED}"/usr/share/mimelnk/
584
	rm -rf "${ED}"/usr/share/mimelnk/
587
585
586
	# FIXME: Hack add missing file
587
	insinto /usr/$(get_libdir)/${PN}/program
588
	doins "${S}"/instdir/program/libsaxlo.so
589
588
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
590
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
589
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
591
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
590
}
592
}

Return to bug 523934