diff options
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 23 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/Manifest | 39 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff | 138 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3.patch (renamed from app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.0.patch) | 0 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3 (renamed from app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0) | 5 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild (renamed from app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild) | 55 |
6 files changed, 72 insertions, 188 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 474f01841055..07da3e724daf 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.70 2004/09/04 13:20:08 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.71 2004/09/04 14:32:20 suka Exp $ + +*openoffice-ximian-1.3.3 (04 Sep 2004) + + 04 Sep 2004; suka@gentoo.org -files/1.1.2/fpickerkdefix.diff, + -files/1.1.2/gentoo-1.3.0.patch, +files/1.1.2/gentoo-1.3.3.patch, + -openoffice-ximian-1.3.0.ebuild, +openoffice-ximian-1.3.3.ebuild: + New version of the ooo-build patchset, fixing a few problems, most notably bug + #62611 (does not print). + + Also this marks the deprecation of the ooo-kde use-flag, but don't fear, kde + support is staying, the logic works now like this (according to your USE flag + settings): + + +gnome -kde: gnome interface + ximian iconset +gnome +kde: gnome AND KDE + interface (right interface will displayed according to which desktop + environment you use + ximian iconset -gnome +kde: kde interface + kde icons + + So if you want to have the same result as ooo-kde before, be sure to have + -gnome in your use-flags. + + Also remove the quite broken 1.3.0 version 04 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> openoffice-ximian-1.1.61.ebuild: diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index e8bcaa37a96a..3f2678e4ba28 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,30 +1,29 @@ -MD5 885bfff0ea286795d81279cab7e441d2 ChangeLog 16960 -MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 +MD5 b58bfe40bee2b6de0f040008434b570b openoffice-ximian-1.3.3.ebuild 15886 MD5 84a7b7cc8a310ca581074341880fa8ee openoffice-ximian-1.1.55.ebuild 15343 -MD5 53a519045a2417084987708004a2d020 openoffice-ximian-1.1.61.ebuild 16287 -MD5 331b4f5efdf8403741e7720df558b404 openoffice-ximian-1.3.0.ebuild 15861 MD5 501916073d51ed198116feb3b9610baa openoffice-ximian-1.3.2.ebuild 16013 -MD5 4448ae80f966581ae798bf217b10567d files/digest-openoffice-ximian-1.1.61 290 -MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215 -MD5 d7a99432d55d90db7ec6ecfe341f6477 files/digest-openoffice-ximian-1.3.0 363 +MD5 53a519045a2417084987708004a2d020 openoffice-ximian-1.1.61.ebuild 16287 +MD5 eea1dd9fcba5cf1759d0b0effa7e5f81 ChangeLog 17860 +MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 869a3cbdb85561e3282937db95719796 files/digest-openoffice-ximian-1.3.2 435 -MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035 -MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362 -MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285 -MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603 -MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400 +MD5 af19ccb09648f0e94c2945b1da20ed9d files/digest-openoffice-ximian-1.3.3 435 +MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215 +MD5 4448ae80f966581ae798bf217b10567d files/digest-openoffice-ximian-1.1.61 290 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298 +MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400 MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221 -MD5 6fd623d53d17e17f953232da5b04447f files/1.1.2/fixscale.patch 1035 -MD5 6d4a38ad8c430bb640ef2868a13e2cd4 files/1.1.2/fpickerkdefix.diff 4282 -MD5 5230f0537c695e54b5475d203d213ef6 files/1.1.2/curlfix.patch 1367 -MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362 -MD5 4616da7c365ad64c4cc622165806b1ba files/1.1.2/gentoo-1.3.0.patch 533 +MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603 +MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285 +MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362 +MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035 +MD5 b653592913b5ef15d3599a97d7e8a25f files/1.1.2/gentoo-1.1.61.patch 680 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980 +MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298 MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336 -MD5 b653592913b5ef15d3599a97d7e8a25f files/1.1.2/gentoo-1.1.61.patch 680 -MD5 0165c3a11c99e85ee1fde1c59d580e21 files/1.1.2/rm-nonexistant.diff 334 -MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890 MD5 4616da7c365ad64c4cc622165806b1ba files/1.1.2/gentoo-1.3.2.patch 533 +MD5 0165c3a11c99e85ee1fde1c59d580e21 files/1.1.2/rm-nonexistant.diff 334 +MD5 4616da7c365ad64c4cc622165806b1ba files/1.1.2/gentoo-1.3.3.patch 533 +MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362 +MD5 6fd623d53d17e17f953232da5b04447f files/1.1.2/fixscale.patch 1035 +MD5 5230f0537c695e54b5475d203d213ef6 files/1.1.2/curlfix.patch 1367 diff --git a/app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff b/app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff deleted file mode 100644 index 2c9b31562bf2..000000000000 --- a/app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff +++ /dev/null @@ -1,138 +0,0 @@ ---- patches/OOO_1_1/fpicker-common.diff -+++ patches/OOO_1_1/fpicker-common.diff -@@ -5,9 +5,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -177,9 +177,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -311,9 +311,9 @@ - +# - +# $RCSfile: fpicker-common.diff,v $ - +# --+# $Revision: 1.2 $ -++# $Revision: 1.3 $ - +# --+# last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++# last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - +# - +# The Contents of this file are made available subject to the terms of - +# either of the following licenses -@@ -414,9 +414,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -768,9 +768,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -828,12 +828,12 @@ - +#ifndef _UNXCOMMANDTHREAD_HXX_ - +#define _UNXCOMMANDTHREAD_HXX_ - + --+#ifndef _COM_SUN_STAR_UNO_ANY_H_ --+#include <com/sun/star/uno/Any.h> -++#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -++#include <com/sun/star/uno/Any.hxx> - +#endif - + --+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ --+#include <com/sun/star/uno/Sequence.h> -++#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ -++#include <com/sun/star/uno/Sequence.hxx> - +#endif - + - +#ifndef _OSL_CONDITN_HXX_ -@@ -913,9 +913,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -1894,9 +1894,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -2135,9 +2135,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -2288,9 +2288,9 @@ - + * - + * $RCSfile: fpicker-common.diff,v $ - + * --+ * $Revision: 1.2 $ -++ * $Revision: 1.3 $ - + * --+ * last change: $Author: jholesovsky $ $Date: 2004/08/12 15:04:14 $ -++ * last change: $Author: jholesovsky $ $Date: 2004/08/20 15:01:43 $ - + * - + * The Contents of this file are made available subject to the terms of - + * either of the following licenses -@@ -2352,8 +2352,8 @@ - +#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> - +#endif - + --+#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ --+#include <com/sun/star/uno/Reference.h> -++#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ -++#include <com/sun/star/uno/Reference.hxx> - +#endif - + - +#ifndef _OSL_CONDITN_HXX_ diff --git a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.0.patch b/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3.patch index e5d9cbc33daa..e5d9cbc33daa 100644 --- a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.0.patch +++ b/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3.patch diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3 index 68e1033f51f0..5474ce36fabb 100644 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.0 +++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3 @@ -1,5 +1,6 @@ MD5 d6fd3f6cb34bdbc14287460e1cfa3f76 OOo_1.1.2_source.tar.gz 220632989 -MD5 9772e0deeb9f25dca34a71ad321de4cb ooo-build-1.3.0.tar.gz 2649158 +MD5 4e6545323eb456d1a3aa5980373a607f ooo-build-1.3.3.tar.gz 2790436 +MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710 MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631 -MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540 MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326 +MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540 diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild index 67db1a84acd6..299260100940 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.0.ebuild,v 1.8 2004/08/25 15:14:47 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild,v 1.1 2004/09/04 14:32:20 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -28,7 +28,7 @@ inherit flag-o-matic eutils gcc -IUSE="gnome kde ooo-kde" +IUSE="gnome kde" OO_VER=1.1.2 PATCHLEVEL=OOO_1_1_2 @@ -41,9 +41,10 @@ S="${WORKDIR}/oo_${OO_VER}_src" DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite." SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}_source.tar.gz http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz + http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2 - ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz ) - !ooo-kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )" + gnome? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz ) + !gnome? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )" HOMEPAGE="http://ooo.ximian.com" @@ -54,7 +55,7 @@ KEYWORDS="~x86 ~ppc" RDEPEND="virtual/libc !=sys-libs/glibc-2.3.1* >=dev-lang/perl-5.0 - !ooo-kde? ( >=x11-libs/gtk+-2.0 + gnome? ( >=x11-libs/gtk+-2.0 >=gnome-base/libgnome-2.2 >=gnome-base/gnome-vfs-2.0 >=net-print/libgnomecups-0.1.4 @@ -77,7 +78,7 @@ RDEPEND="virtual/libc ppc? ( >=sys-libs/glibc-2.2.5-r7 >=sys-devel/gcc-3.2.1 ) >=media-libs/freetype-2.1.4 - ooo-kde? ( kde-base/kdelibs )" + kde? ( kde-base/kdelibs )" DEPEND="${RDEPEND} app-shells/tcsh @@ -91,10 +92,6 @@ DEPEND="${RDEPEND} pkg_setup() { ewarn "****************************************************************" - ewarn " This ebuild now also includes optional support for kde " - ewarn " integration. If you want to use it you will have to put " - ewarn " 'ooo-kde' into your USE FLAGS. " - ewarn ewarn " It is important to note that OpenOffice.org is a very fragile " ewarn " build when it comes to CFLAGS. A number of flags have already " ewarn " been filtered out. If you experience difficulty merging this " @@ -227,11 +224,8 @@ src_unpack() { cd ${WORKDIR} unpack ${A} - #Fix build issues - cd ${PATCHDIR} - epatch ${FILESDIR}/${OO_VER}/fpickerkdefix.diff - #Beginnings of our own patchset + cd ${PATCHDIR} epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch #Still needed: The STLport patch @@ -242,14 +236,18 @@ src_unpack() { #Add our own splash screen epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff - if use ooo-kde; then - DISTRO=GentooKDE - ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER} - WIDGETSET=kde - else - DISTRO=Gentoo - ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER} - WIDGETSET=gtk + export DISTRO="Gentoo" + export EXTRACONF="--enable-gtk" + export ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER} + + if use kde; then + export EXTRACONF="${EXTRACONF} --enable-kde" + fi + + if use !gnome; then + export DISTRO="GentooKDE" + export EXTRACONF="--enable-kde" + export ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER} fi einfo "Applying Ximian OO.org Patches" @@ -257,10 +255,14 @@ src_unpack() { einfo "Installing / Scaling Icons" ${PATCHDIR}/bin/scale-icons ${S} - cp -avf ${ICONDIR}/* ${S} + cp -af ${ICONDIR}/* ${S} einfo "Copying splash screens in place" - cp ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ + cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ + + einfo "Copying libpwd tarball in build dir" + mkdir -p ${S}/libwpd/download/ + cp -af ${DISTDIR}/libwpd-snap-20040823.tar.gz ${S}/libwpd/download/ einfo "Munging font mappings ..." ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu @@ -316,7 +318,6 @@ src_compile() { # get linker errors due to the ABI being different (STLport will be # compiled with 2.95.3, while OO is compiled with 3.x). (Az) einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..." - einfo "Using Native widgest set for ${WIDGETSET}" cd ${S}/config_office rm -f config.cache autoconf @@ -333,8 +334,8 @@ src_compile() { --with-system-curl \ --with-system-xrender \ --disable-java \ - --disable-mozilla \ - --enable-${WIDGETSET}" + --disable-mozilla" + myconf="${myconf} ${EXTRACONF}" ./configure ${myconf} || die cd ${S} |