Date: Thu, 27 Sep 2007 12:33:55 +0200 From: Ben Stuyts <ben@altesco.nl> To: Don Lewis <truckman@FreeBSD.org> Cc: maho@FreeBSD.org, freebsd-openoffice@FreeBSD.org Subject: Re: Build of 2.3.0 on 6-stable fails Message-ID: <C6A975F2-54D6-4B20-83B3-97EFC1F3C12F@altesco.nl> In-Reply-To: <200709260411.l8Q4BD69011520@gw.catspoiler.org> References: <200709260411.l8Q4BD69011520@gw.catspoiler.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 26 Sep 2007, at 06:11, Don Lewis wrote: > On 25 Sep, Ben Stuyts wrote: >> On FreeBSD 6-stable, I get a failure building Ooo 2.3.0. I have the >> following knobs turned on: >> >> WITH_KDE=yes >> WITH_CUPS=yes >> WITH_TTF_BYTECODE_ENABLED=yes >> >> Here's the end of the log: >> >> ============= >> Building project freetype >> ============= >> /home2/ports.work/sources/ports/editors/openoffice.org-2/work/ >> OOG680_m5/freetype >> ------------- >> cd ./unxfbsdi.pro/misc/build && cat ../../../freetype-2.2.1.patch | / >> usr/local/bin/gpatch -p2 && touch so_patched_so_freetype >> patching file freetype-2.2.1/include/freetype/config/ftmodule.h >> Hunk #1 FAILED at 10644. >> Hunk #2 FAILED at 14420. >> Hunk #3 FAILED at 17684. >> Hunk #4 FAILED at 20153. >> 4 out of 4 hunks FAILED -- saving rejects to file freetype-2.2.1/ >> include/freetype/config/ftmodule.h.rej >> patching file freetype-2.2.1/include/freetype/config/ftmodule.h >> Reversed (or previously applied) patch detected! Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 2 out of 2 hunks ignored -- saving rejects to file freetype-2.2.1/ >> include/freetype/config/ftmodule.h.rej >> patching file freetype-2.2.1/include/freetype/config/ftoption.h >> Reversed (or previously applied) patch detected! Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 1 out of 1 hunk ignored -- saving rejects to file freetype-2.2.1/ >> include/freetype/config/ftoption.h.rej >> patching file freetype-2.2.1/src/truetype/ttgload.c >> Reversed (or previously applied) patch detected! Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 3 out of 3 hunks ignored -- saving rejects to file freetype-2.2.1/ >> src/ >> truetype/ttgload.c.rej >> dmake: Error code 1, while making 'unxfbsdi.pro/misc/build/ >> so_patched_so_freetype' >> ---* tg_merge.mk *--- >> >> ERROR: Error 65280 occurred while making /home2/ports.work/sources/ >> ports/editors/openoffice.org-2/work/OOG680_m5/freetype >> dmake: Error code 1, while making 'build_instsetoo_native' >> ---* *--- >> *** Error code 255 >> >> Stop in /sources/ports/editors/openoffice.org-2. > > The trigger is WITH_TTF_BYTECODE_ENABLED=yes, which causes the patch > file files/optpatch-freetype to be applied to the freetype-2.2.1.patch > file in the OO source. The freetype-2.2.1.patch patch file was > apparently changed for the OO 2.3.0 release, and the optpatch-freetype > patch file in the port was not updated to match. > > Where things get interesting is that the patch program applies the > first > chunk of optpatch-freetype and doesn't reject it, even though the > lines > being changed don't match those in the patch. This causes the first > four chunks of freetype-2.2.1.patch to be applied to the wrong file in > the freetype source and to be rejected. This apparently confuses > gpatch, causing it to think that the rest of the chunks of > freetype-2.2.1.patch have already been applied. > > Here's a patch to a patch to a patch that should fix this problem: > > Index: editors/openoffice.org-2/files/optpatch-freetype > =================================================================== > RCS file: /home/ncvs/ports/editors/openoffice.org-2/files/optpatch- > freetype,v > retrieving revision 1.3 > diff -u -r1.3 optpatch-freetype > --- editors/openoffice.org-2/files/optpatch-freetype 19 Nov 2006 > 01:51:45 -0000 1.3 > +++ editors/openoffice.org-2/files/optpatch-freetype 25 Sep 2007 > 23:30:15 -0000 > @@ -5,15 +5,15 @@ > diff -u -r1.2 freetype-2.2.1.patch > --- freetype/freetype-2.2.1.patch 3 Aug 2006 14:58:26 -0000 1.2 > +++ freetype/freetype-2.2.1.patch 18 Nov 2006 07:15:21 -0000 > -@@ -1,5 +1,5 @@ > --*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon > Jan 30 17:49:42 2006 > ----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h > Thu Jul 13 16:04:27 2006 > +@@ -71,5 +71,5 @@ > +-*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon > Jan 30 11:49:42 2006 > +---- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h > Wed Apr 4 20:04:02 2007 > +*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Tue > Jan 31 01:49:42 2006 > +--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h > Sat Nov 18 16:06:09 2006 > *************** > *** 17,24 **** > --- 17,26 ---- > -@@ -24,3 +24,22 @@ > +@@ -94,3 +94,22 @@ > + #endif > > /* EOF */ The patch did the trick. Ooo 2.3.0 builds and runs now. Thanks! Ben
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C6A975F2-54D6-4B20-83B3-97EFC1F3C12F>