Date: Mon, 29 Jul 2002 16:07:10 -0700 From: walt <wsheets@sbcglobal.net> To: Alexander Kabaev <ak03@gte.com> Cc: freebsd-openoffice@FreeBSD.ORG Subject: Re: OpenOffice 1.0.1 problems - PATCH for testers Message-ID: <3D45CA9E.2070807@sbcglobal.net> References: <20020725124512.0d687c27.ak03@gte.com> <20020726101003.2acd6c4b.ak03@gte.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Alexander Kabaev wrote: > Hi All, > > I was able to compile OO 1.0.1 with my latest patch applied and so far > it seems to work:.. A small technical problem for me: the patch applies partially but then stops to ask for the name of the file to patch: Patching file files/patch-nas:nas-1.4.1.patch using Plan A... Hunk #1 succeeded at 161. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-rsc::source::rscpp::cpp3.c |=================================================================== |RCS file: files/patch-rsc::source::rscpp::cpp3.c |diff -N files/patch-rsc::source::rscpp::cpp3.c |--- /dev/null 1 Jan 1970 00:00:00 -0000 |+++ files/patch-rsc::source::rscpp::cpp3.c 25 Jul 2002 04:07:30 -0000 -------------------------- Patching file files/patch-rsc::source::rscpp::cpp3.c using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-sal::osl::unx::interlck.c |=================================================================== |RCS file: files/patch-sal::osl::unx::interlck.c |diff -N files/patch-sal::osl::unx::interlck.c |--- /dev/null 1 Jan 1970 00:00:00 -0000 |+++ files/patch-sal::osl::unx::interlck.c 23 Jul 2002 21:08:18 -0000 -------------------------- Patching file files/patch-sal::osl::unx::interlck.c using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-solenv::bin::addsym.awk |=================================================================== |RCS file: files/patch-solenv::bin::addsym.awk |diff -N files/patch-solenv::bin::addsym.awk |--- /dev/null 1 Jan 1970 00:00:00 -0000 |+++ files/patch-solenv::bin::addsym.awk 27 Jul 2002 14:11:35 -0000 -------------------------- Patching file files/patch-solenv::bin::addsym.awk using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-solenv::inc::unxfbsdi.mk |=================================================================== |RCS file: /home/ncvs/ports/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk,v |retrieving revision 1.11 |diff -u -r1.11 patch-solenv::inc::unxfbsdi.mk |--- files/patch-solenv::inc::unxfbsdi.mk 6 Jun 2002 13:23:26 -0000 1.11 |+++ files/patch-solenv::inc::unxfbsdi.mk 24 Jul 2002 00:07:15 -0000 -------------------------- Patching file files/patch-solenv::inc::unxfbsdi.mk using Plan A... Hunk #1 succeeded at 120. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- ../cppu/test/alignment/diagnose.h.orig Sat Jul 27 11:22:00 2002 |+++ ../cppu/test/alignment/diagnose.h Sat Jul 27 11:22:04 2002 -------------------------- File to patch: <waits for me to supply a filename> ==================================================== I don't usually need to supply any info when applying a patch. Am I doing something wrong? #cd /usr/ports/editors/openoffice #patch < /tmp/openoffice.diff [I also tried -p2, -p3, and -p4] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-openoffice" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D45CA9E.2070807>