| 1 |
suka 11/01/24 21:23:08 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-3.3.0_rc4.ebuild |
| 4 |
Log: |
| 5 |
Fix extensions stuff, patch from bug #339057 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 app-office/libreoffice/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- ChangeLog 24 Jan 2011 20:56:06 -0000 1.2 |
| 23 |
+++ ChangeLog 24 Jan 2011 21:23:08 -0000 1.3 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-office/libreoffice |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.2 2011/01/24 20:56:06 suka Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.3 2011/01/24 21:23:08 suka Exp $ |
| 29 |
+ |
| 30 |
+ 24 Jan 2011; Andreas Proschofsky <suka@g.o> |
| 31 |
+ libreoffice-3.3.0_rc4.ebuild, +files/sdext-presenter.diff: |
| 32 |
+ Fix extensions stuff, patch from bug #339057 |
| 33 |
|
| 34 |
24 Jan 2011; Andreas Proschofsky <suka@g.o> |
| 35 |
libreoffice-3.3.0_rc4.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: libreoffice-3.3.0_rc4.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- libreoffice-3.3.0_rc4.ebuild 24 Jan 2011 20:56:06 -0000 1.2 |
| 52 |
+++ libreoffice-3.3.0_rc4.ebuild 24 Jan 2011 21:23:08 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild,v 1.2 2011/01/24 20:56:06 suka Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0_rc4.ebuild,v 1.3 2011/01/24 21:23:08 suka Exp $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
|
| 61 |
@@ -280,6 +280,7 @@ |
| 62 |
epatch "${FILESDIR}/fix-ooo-collision.diff" |
| 63 |
epatch "${FILESDIR}/scrap-pixmap-links.diff" |
| 64 |
epatch "${FILESDIR}/enable-startup-notification.diff" |
| 65 |
+ cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" || die |
| 66 |
|
| 67 |
#Use flag checks |
| 68 |
if use java ; then |
| 69 |
@@ -316,14 +317,12 @@ |
| 70 |
echo $(use_enable debug strip-solver) >> ${CONFFILE} |
| 71 |
|
| 72 |
# Extension stuff |
| 73 |
- echo "--without-extension-integration" >> ${CONFFILE} |
| 74 |
- echo "--disable-pdfimport" >> ${CONFFILE} |
| 75 |
- |
| 76 |
- # breaks the build |
| 77 |
- echo "--disable-minimizer" >> ${CONFFILE} |
| 78 |
- echo "--disable-presenter-console" >> ${CONFFILE} |
| 79 |
- echo "--disable-presenter-extra-ui" >> ${CONFFILE} |
| 80 |
- echo "--disable-presenter-screen" >> ${CONFFILE} |
| 81 |
+ echo "--with-extension-integration" >> ${CONFFILE} |
| 82 |
+ echo "--enable-pdfimport" >> ${CONFFILE} |
| 83 |
+ echo "--enable-minimizer" >> ${CONFFILE} |
| 84 |
+ echo "--enable-presenter-console" >> ${CONFFILE} |
| 85 |
+ echo "--enable-presenter-extra-ui" >> ${CONFFILE} |
| 86 |
+ echo "--enable-presenter-screen" >> ${CONFFILE} |
| 87 |
|
| 88 |
# Misc stuff |
| 89 |
echo "--disable-graphite" >> ${CONFFILE} |
| 90 |
@@ -395,7 +394,7 @@ |
| 91 |
$(use_with templates sun-templates) \ |
| 92 |
--disable-access \ |
| 93 |
--disable-post-install-scripts \ |
| 94 |
- --disable-extensions \ |
| 95 |
+ --enable-extensions \ |
| 96 |
--without-system-libwpd \ |
| 97 |
--without-system-libwpg \ |
| 98 |
--mandir=/usr/share/man \ |
| 99 |
@@ -444,17 +443,6 @@ |
| 100 |
# Add available & useful jars to LibreOffice classpath |
| 101 |
use java && /usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null |
| 102 |
|
| 103 |
-# extensions disabled for now... |
| 104 |
-# elog " Some aditional functionality can be installed via Extension Manager: " |
| 105 |
-# elog " *) PDF Import " |
| 106 |
-# elog " *) Presentation Console " |
| 107 |
-# elog " *) Presentation Minimizer " |
| 108 |
-# elog |
| 109 |
-# elog " Please use the packages provided in " |
| 110 |
-# elog " /usr/$(get_libdir)/${PN}/share/extension/install/ " |
| 111 |
-# elog " instead of those from the SUN extension site. " |
| 112 |
-# elog |
| 113 |
- |
| 114 |
kde4-base_pkg_postinst |
| 115 |
|
| 116 |
} |
Archives