From owner-freebsd-openoffice Mon Jul 29 21:32:23 2002 Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C51C637B400 for ; Mon, 29 Jul 2002 21:32:13 -0700 (PDT) Received: from pimout1-ext.prodigy.net (pimout1-ext.prodigy.net [207.115.63.77]) by mx1.FreeBSD.org (Postfix) with ESMTP id F29AF43E4A for ; Mon, 29 Jul 2002 21:32:12 -0700 (PDT) (envelope-from wa1ter@hotmail.com) Received: from hotmail.com (adsl-64-175-107-106.dsl.lsan03.pacbell.net [64.175.107.106]) by pimout1-ext.prodigy.net (8.11.0/8.11.0) with ESMTP id g6U4WAQ163224; Tue, 30 Jul 2002 00:32:10 -0400 Message-ID: <3D461815.4000308@hotmail.com> Date: Mon, 29 Jul 2002 21:37:41 -0700 From: walt Organization: none User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.0.0) Gecko/20020714 X-Accept-Language: en-us, en MIME-Version: 1.0 To: ak03@gte.com Cc: freebsd-openoffice@FreeBSD.ORG Subject: Re: OpenOffice 1.0.1 problems - PATCH for testers References: <20020725124512.0d687c27.ak03@gte.com> <20020726101003.2acd6c4b.ak03@gte.com> <3D45CA9E.2070807@sbcglobal.net> <20020729205405.0a9d8844.kabaev@bellatlantic.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: owner-freebsd-openoffice@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Alexander Kabaev wrote: > Hi, > > just allow patch to skip this file. Or remove several last lines from > openoffice.diff starting from line: > -- ../cppu/test/alignment/diagnose.h.orig Sat Jul 27 11:22:00 20 > > >>A small technical problem for me: the patch applies partially but >>then stops to ask for the name of the file to patch: >> > > >>-------------------------- >>File to patch: > > > Type and answer y to 'Skip this patch' question here. I did exactly that on -current and got this error almost immediately: ===> Extracting for openoffice-1.0.1 >> Checksum OK for openoffice/OOo_1.0.1_source.tar.bz2. >> Checksum OK for openoffice/gpc231.tar.Z. >> Checksum OK for openoffice/oo_moz_1.0_includes.tgz. >> Checksum OK for openoffice/oo_moz1.0RC3_i386_FreeBSD-5-gcc3.1-system.tar.gz. >> Checksum OK for openoffice/en_CA.zip. >> Checksum OK for openoffice/en_GB.zip. ===> openoffice-1.0.1 depends on executable: gcc31 - found ===> openoffice-1.0.1 depends on executable: zip - found ===> openoffice-1.0.1 depends on executable: unzip - found ===> openoffice-1.0.1 depends on file: /usr/local/jdk1.3.1/bin/java - found ===> openoffice-1.0.1 depends on executable: imake - found ===> openoffice-1.0.1 depends on executable: gmake - found ===> openoffice-1.0.1 depends on executable: autoconf213 - found ===> openoffice-1.0.1 depends on executable: bison - found ===> openoffice-1.0.1 depends on executable: perl5.6.1 - found ===> openoffice-1.0.1 depends on shared library: X11.6 - found ===> Patching for openoffice-1.0.1 ===> Applying FreeBSD patches for openoffice-1.0.1 Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to ../cppu/inc/cppu/macros.hxx.rej Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to ../cppu/inc/cppu/macros.hxx.rej Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to ../cppu/inc/cppu/macros.hxx.rej >> Patch patch-cppu::inc::cppu::macros.hxx failed to apply cleanly. >> Patch(es) patch-berkeleydb::db-3.2.9.patch patch-bridges::prj::build.lst patch-bridges::source::cpp_uno::gcc2_freebsd_intel-sjlj patch-bridges::source::cpp_uno::gcc2_freebsd_i ntel::makefile.mk patch-bridges::source::cpp_uno::gcc3_freebsd_intel patch-bridges::source::prot_uno::makefile.mk patch-chaos::util::makefile.mk patch-comphelper::util::makefile. mk patch-config_office::configure.in patch-connectivity::source::drivers::adabas::makefile.mk patch-connectivity::source::drivers::calc::makefile.mk patch-connectivity::source::d rivers::dbase::makefile.mk patch-connectivity::source::drivers::file::makefile.mk patch-connectivity::source::drivers::flat::makefile.mk patch-connectivity::source::drivers::jdbc ::makefile.mk patch-connectivity::source::drivers::mozab::makefile.mk patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk patch-connectivity::source::drivers::moz addressbook::makefile.mk patch-cosv::source::strings::streamstr.cxx applied cleanly. *** Error code 1 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-openoffice" in the body of the message