[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: The patch use-free-jaxp-from-system.diff is broken (was Re: backporting openoffice.org-2.0.1-2 to sarge)



[ no need to Cc me, I read -openoffice.. And you *STILL* want to fix
your line wrapping. And also please fix your quoting. Thanks... ]

Kai-Cheung Leung wrote:
> use-free-jaxp-from-system.diff: testing...( patch -l -p0  -d /DVD/src/openoffice.org-2.0.1/ooo-build/build/ooa680-m1 -- dry-run ) < /DVD/src/openoffice.org-2.0.1/ooo-build/patches/src680/./use-free-jaxp-from-system.diff
> patching file external/prj/d.lst
> Hunk #1 FAILED at 23.
> 1 out of 1 hunk FAILED -- saving rejects to file external/prj/d.lst.rej
> patching file helpcontent2/settings.pmk
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file helpcontent2/settings.pmk.rej
> Testing patch use-free-jaxp-from-system.diff failed. at /DVD/src/openoffice.org-2.0.1/ooo-build/
> patches/apply.pl line 54.
> make[1]: *** [stamp/patch.apply] Error 1
> make[1]: Leaving directory `/DVD/src/openoffice.org-2.0.1/ooo-build'
> make: *** [debian/stampdir/build] Error 2
> abc@debian1:/DVD/src/openoffice.org-2.0.1$
> 
> So what's wrong here?  Is this patch really broken?  

Yes. Although I think this paztch isn't really broken itself but we need
a -sarge version of it. I'll look.

Regards,

Rene



Reply to: