On Thu, Mar 30, 2000 at 03:41:30AM -0800, Manish Singh wrote: > GIMP 1.1.19 is out there: > > ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.19/ > > It's been a while. Lots of changes. Read ChangeLog. I go sleep now. > > -Yosh Just grabbed the patch, to apply it to my 1.1.18 source tree. To get the diff to patch properly to the 1.1.18 tree, I renamed the gimp-1.1.18 directory, to gimp-1.1.19, then used bzip2 -cd patch-1.1.18-1.1.19.bz2 | patch -p0 to start the patch.. goes along a little bit, until... ---snip--- bellicha:/cdburn# bzip2 -cd patch-1.1.18-1.1.19.bz2 |patch -p0 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN gimp-1.1.18/ChangeLog gimp-1.1.19/ChangeLog |--- gimp-1.1.18/ChangeLog Fri Mar 3 19:38:41 2000 |+++ gimp-1.1.19/ChangeLog Thu Mar 30 02:51:42 2000 -------------------------- Patching file gimp-1.1.19/ChangeLog 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: -------------------------- |diff -ruN gimp-1.1.18/Makefile.am gimp-1.1.19/Makefile.am |--- gimp-1.1.18/Makefile.am Wed Mar 1 11:41:27 2000 |+++ gimp-1.1.19/Makefile.am Fri Mar 24 14:48:36 2000 -------------------------- Patching file gimp-1.1.19/Makefile.am using Plan A... Hunk #1 succeeded at 44. Hunk #2 succeeded at 62. Hunk #3 succeeded at 103. Hunk #4 succeeded at 122. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN gimp-1.1.18/Makefile.in gimp-1.1.19/Makefile.in |--- gimp-1.1.18/Makefile.in Fri Mar 3 19:09:43 2000 |+++ gimp-1.1.19/Makefile.in Wed Mar 29 21:31:35 2000 -------------------------- Patching file gimp-1.1.19/Makefile.in using Plan A... patch: **** malformed patch at line 890: eye.xbm pixmaps/first.xpm pixmaps/last.xpm pixmaps/layer.xbm pixmaps/linked.xbm pixmaps/locked.xbm pixmaps/lower.xpm pixmaps/mask.xbm pixmaps/navbutton.xpm pixmaps/next.xpm pixmaps/new.xpm pixmaps/no.xpm pixmaps/raise.xpm pixmaps/path.xbm pixmaps/penadd.xpm pixmaps/pendel.xpm pixmaps/penedit.xpm pixmaps/pennorm.xpm pixmaps/penstroke.xpm pixmaps/play.xpm pixmaps/prev.xpm pixmaps/qmasksel.xpm pixmaps/qmasknosel.xpm pixmaps/question.xpm pixmaps/topath.xpm pixmaps/toselection.xpm pixmaps/update.xpm pixmaps/wilber.xpm pixmaps/yes.xpm pixmaps/zoom_in.xpm pixmaps/zoom_out.xpm README.i18n README.win32 README.perl ChangeLog.pre-1-0 PLUGIN_MAINTAINERS MAINTAINERS TODO gtkrc unitrc gimp_logo.ppm gimp_splash.ppm gimp1_1_splash.ppm rmshm user_install user_install.bat ps-menurc gimp.1 gimptool.1 gimp.m4 gimprc.win32 config.h.win32 bellicha:/cdburn# pixmaps/first.xpm pixmaps/last.xpm pixmaps/layer.xbm pixmaps/linked.xbm pixmaps/locked.xbm pixmaps/lower.xpm pixmaps/mask.xbm pixmaps/navbutton.xpm pixmaps/next.xpm pixmaps/new.xpm pixmaps/no.xpm pixmaps/raise.xpm pixmaps/path.xbm pixmaps/penadd.xpm pixmaps/pendel.xpm pixmaps/penedit.xpm pixmaps/pennorm.xpm pixmaps/penstroke.xpm pixmaps/play.xpm pixmaps/prev.xpm pixmaps/qmasksel.xpm pixmaps/qmasknosel.xpm pixmaps/question.xpm pixmaps/topath.xpm pixmaps/toselection.xpm pixmaps/update.xpm pixmaps/wilber.xpm pixmaps/yes.xpm pixmaps/zoom_in.xpm pixmaps/zoom_out.xpm README.i18n README.win32 README.perl ChangeLog.pre-1-0 PLUGIN_MAINTAINERS MAINTAINERS TODO gtkrc unitrc gimp_logo.ppm gimp_splash.ppm gimp1_1_splash.ppm rmshm user_install user_install.bat ps-menurc gimp.1 gimptool.1 gimp.m4 gimprc.win32 config.h.win32 -- snip -- what would be the correct syntax for patching between versions? BL. -- Brad Littlejohn | Email: tyketto@xxxxxxxxxx Unix Systems Administrator, | tyketto@xxxxxxxxxxxxxx Web + NewsMaster, BOFH.. Smeghead! :) | http://www.wizard.com/~tyketto PGP: 1024D/E319F0BF 6980 AAD6 7329 E9E6 D569 F620 C819 199A E319 F0BF
