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

Collapse All | Expand All

(-)libreoffice-4.3.9999.ebuild (-5 / +15 lines)
Lines 60-65 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 )"
63
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
65
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
64
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
66
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
65
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
67
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
Lines 72-78 Link Here
72
unset ADDONS_SRC
74
unset ADDONS_SRC
73
75
74
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
76
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
75
+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc"
77
+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc"
76
78
77
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
79
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
78
# Unpackaged separate extensions:
80
# Unpackaged separate extensions:
Lines 91-96 Link Here
91
[[ ${PV} == *9999* ]] || \
93
[[ ${PV} == *9999* ]] || \
92
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
94
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
93
95
96
# FIXME: collada? ( media-libs/opencollada )
97
#        how to configure system-collada?
94
COMMON_DEPEND="
98
COMMON_DEPEND="
95
	${PYTHON_DEPS}
99
	${PYTHON_DEPS}
96
	app-arch/zip
100
	app-arch/zip
Lines 144-150 Link Here
144
	x11-libs/libXrender
148
	x11-libs/libXrender
145
	bluetooth? ( net-wireless/bluez )
149
	bluetooth? ( net-wireless/bluez )
146
	coinmp? ( sci-libs/coinor-mp )
150
	coinmp? ( sci-libs/coinor-mp )
147
	collada? ( media-libs/opencollada )
148
	cups? ( net-print/cups )
151
	cups? ( net-print/cups )
149
	dbus? ( >=dev-libs/dbus-glib-0.92 )
152
	dbus? ( >=dev-libs/dbus-glib-0.92 )
150
	eds? ( gnome-extra/evolution-data-server )
153
	eds? ( gnome-extra/evolution-data-server )
Lines 244-251 Link Here
244
	# not upstreamable stuff
250
	# not upstreamable stuff
245
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
251
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
246
252
247
	# from master branch
253
	# from 4.4 branch
248
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
254
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
255
	"${FILESDIR}/${PN}-4.3.2.2-boost-1.56.0.patch"
256
	"${FILESDIR}/${PN}-4.3.2.2-implement-with-system-opencollada.patch"
257
	"${FILESDIR}/${PN}-4.3.4.1-detect-kde5-fallback-to-kde4ui.patch"
249
)
258
)
250
259
251
REQUIRED_USE="
260
REQUIRED_USE="
Lines 445-450 Link Here
445
	# --enable-extension-integration: enable any extension integration support
454
	# --enable-extension-integration: enable any extension integration support
446
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
455
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
447
	# --disable-report-builder: too much java packages pulled in without pkgs
456
	# --disable-report-builder: too much java packages pulled in without pkgs
457
	# FIXME: $(use_with collada system-opencollada)
448
	econf \
458
	econf \
449
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
459
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
450
		--with-system-headers \
460
		--with-system-headers \
Lines 454-459 Link Here
454
		--enable-cairo-canvas \
464
		--enable-cairo-canvas \
455
		--enable-graphite \
465
		--enable-graphite \
456
		--enable-largefile \
466
		--enable-largefile \
467
		--enable-mergelibs \
457
		--enable-neon \
468
		--enable-neon \
458
		--enable-python=system \
469
		--enable-python=system \
459
		--enable-randr \
470
		--enable-randr \
Lines 470-476 Link Here
470
		--disable-report-builder \
481
		--disable-report-builder \
471
		--disable-kdeab \
482
		--disable-kdeab \
472
		--disable-kde \
483
		--disable-kde \
473
		--disable-mergelibs \
474
		--disable-online-update \
484
		--disable-online-update \
475
		--disable-systray \
485
		--disable-systray \
476
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
486
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
Lines 511-517 Link Here
511
		$(use_enable opengl) \
521
		$(use_enable opengl) \
512
		$(use_enable postgres postgresql-sdbc) \
522
		$(use_enable postgres postgresql-sdbc) \
513
		$(use_enable telepathy) \
523
		$(use_enable telepathy) \
514
		$(use_enable vba) \
515
		$(use_enable vlc) \
524
		$(use_enable vlc) \
516
		$(use_with coinmp system-coinmp) \
525
		$(use_with coinmp system-coinmp) \
517
		$(use_with gltf system-libgltf) \
526
		$(use_with gltf system-libgltf) \
Lines 582-587 Link Here
582
	# Remove desktop files for support to old installs that can't parse mime
591
	# Remove desktop files for support to old installs that can't parse mime
583
	rm -rf "${ED}"/usr/share/mimelnk/
592
	rm -rf "${ED}"/usr/share/mimelnk/
584
593
594
	# FIXME: Hack add missing file
595
	insinto /usr/$(get_libdir)/${PN}/program
596
	doins "${S}"/instdir/program/libsaxlo.so
597
585
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
598
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
586
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
599
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
587
}
600
}

Return to bug 533160