OK, I get the same error when using this command:

patch -p1 -i khtml-fsdg.patch

It's actually khtm-fsdg.diff

After changing the name of the command and issuing it in the directory kde4libs-whatever-version/khtml/html, the output is always this, whether on Brigantia or Toutatis:

----------------------------------
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ru kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp kdelibs-4.8.0/khtml/html/html_objectimpl.cpp |--- kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp 2012-01-30 19:46:27.684114289 +0100 |+++ kdelibs-4.8.0/khtml/html/html_objectimpl.cpp 2012-01-30 19:47:47.222111046 +0100
--------------------------
File to patch:
-------------------------------------

It's easy enough to get past. If I type the name of the file, the patch applies. However, if I am to (eventually, hopefully) write a helper off of this diff, won't the diff need to apply correctly on the first shot, without having to specify the exact name of the file to edit?

This must be occurring because the diff itself references kdelibs-4.8.0, whereas on Brigantia the diff is in the 4.7.4 folder and on Toutatis it is in the 4.8.5 folder. Additionally, Trisquel is renaming the kdelibs directories to kde4libs-version-number, instead of kdelibs-version-number.

Should I edit the first three lines with the Trisquel-correct directory names to get the patch/diff to apply on the first shot?

Reply via email to