On Sun, Sep 11, 2011 at 8:19 PM, patrick keshishian <pkesh...@gmail.com> wrote: > On Thu, Sep 8, 2011 at 2:59 PM, Matthias Kilian <k...@outback.escape.de> > wrote: >> On Tue, Sep 06, 2011 at 07:39:53PM -0500, Amit Kulkarni wrote: >>> I checked this out... working fine on amd64. everything okay. >> >> Thanks for testing. I'll commit it in two weeks if nobody gives any >> negative report. > > Hmm... I am trying to build xpdf but looks like > patches/patch-splash_SplashXPathScanner_cc does not apply correctly. > > > ===> Extracting for xpdf-3.03 > ===> Patching for xpdf-3.03 > ===> Ignoring patchfile patch-Makefile_in.orig > ===> Ignoring patchfile patch-doc_sample-xpdfrc.orig > 2 out of 3 hunks failed--saving rejects to splash/SplashXPathScanner.cc.rej > ***> patch-splash_SplashXPathScanner_cc did not apply cleanly > ===> Ignoring patchfile patch-splash_SplashXPathScanner_cc.orig > ===> Ignoring patchfile patch-splash_SplashXPathScanner_cc.rej > ===> Ignoring patchfile patch-splash_SplashXPath_cc.orig > ===> Ignoring empty patchfile patch-xpdf_Catalog_cc > ===> Ignoring patchfile patch-xpdf_Catalog_cc.orig > ===> Ignoring patchfile patch-xpdf_GlobalParams_cc.orig > ===> Ignoring empty patchfile patch-xpdf_Object_h > ===> Ignoring patchfile patch-xpdf_Object_h.orig > ===> Ignoring empty patchfile patch-xpdf_SplashOutputDev_cc > ===> Ignoring patchfile patch-xpdf_SplashOutputDev_cc.orig > ===> Ignoring empty patchfile patch-xpdf_Stream_cc > ===> Ignoring patchfile patch-xpdf_Stream_cc.orig > ===> Ignoring patchfile patch-xpdf_XRef_cc.orig > *** Error code 1
hmm... applying Matthias's patch I see this: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: patches/patch-splash_SplashXPathScanner_cc |=================================================================== |RCS file: patches/patch-splash_SplashXPathScanner_cc |diff -N patches/patch-splash_SplashXPathScanner_cc |--- patches/patch-splash_SplashXPathScanner_cc 3 Mar 2011 21:22:13 -0000 1.3 |+++ /dev/null 1 Jan 1970 00:00:00 -0000 -------------------------- Patching file patches/patch-splash_SplashXPathScanner_cc using Plan A... Empty context always matches. Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to patches/patch-splash_SplashXPathScann Manually removing this patch file, make install is continuing along just fine. --patrick
