Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-ximian/ChangeLog23
-rw-r--r--app-office/openoffice-ximian/files/1.1.2/fpickerkdefix.diff138
-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
5 files changed, 53 insertions, 168 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/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}