[patch] libreoffice-4.3.2.2.ebuild.diff

libreoffice-4.3.2.2.ebuild.diff (text/plain), 2.11 KB, created by Andreas Sturmlechner on 2014-09-28 11:49:05 UTC

--- /usr/portage/app-office/libreoffice/libreoffice-4.3.9999.ebuild	2014-09-16 23:31:04.000000000 +0200
+++ libreoffice-4.3.2.2.ebuild	2014-09-28 10:09:37.296731730 +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-4.3.9999.ebuild,v 1.2 2014/09/16 21:25:00 dilfridge Exp $
+# $Header: $
 
 EAPI=5
 
@@ -97,7 +97,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
@@ -118,7 +118,6 @@
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1
 	>=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
@@ -209,6 +208,7 @@
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
 	>=dev-libs/libxml2-2.7.8
 	dev-libs/libxslt
 	dev-perl/Archive-Zip
@@ -247,6 +247,8 @@
 
 	# 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"
 )
 
 REQUIRED_USE="
@@ -455,6 +457,7 @@
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-largefile \
+		--enable-mergelibs \
 		--enable-neon \
 		--enable-python=system \
 		--enable-randr \
@@ -471,7 +474,6 @@
 		--disable-report-builder \
 		--disable-kdeab \
 		--disable-kde \
-		--disable-mergelibs \
 		--disable-online-update \
 		--disable-systray \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
@@ -580,6 +582,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
 }