summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/libreoffice-4.4.1.2.ebuild5
2 files changed, 9 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 9bc47ae5f8cd..7906a656488e 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.622 2015/02/26 20:02:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.623 2015/02/28 11:48:35 remi Exp $
+
+ 28 Feb 2015; Rémi Cardona <remi@gentoo.org> libreoffice-4.4.1.2.ebuild:
+ Add bashisms removal patch back, it's not in 4.4, but in the
+ 'feature/priorities' branch in upstream git.
*libreoffice-4.4.1.2 (26 Feb 2015)
diff --git a/app-office/libreoffice/libreoffice-4.4.1.2.ebuild b/app-office/libreoffice/libreoffice-4.4.1.2.ebuild
index 6dfb77bb9a39..4ee715423c11 100644
--- a/app-office/libreoffice/libreoffice-4.4.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.1.2.ebuild,v 1.1 2015/02/26 20:02:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.1.2.ebuild,v 1.2 2015/02/28 11:48:35 remi Exp $
EAPI=5
@@ -252,6 +252,9 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
"${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch"
+
+ # from feature/priorities branch
+ "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
)
REQUIRED_USE="