Re: macos patch

Solomon Peachy via Gimp-print-devel <[email protected]> Thu, 14 Nov 2024 08:10:28 -0500

Newsgroups	gmane.linux.printing.gimp-print.devel
Message-ID	<[email protected]>

On Mon, Oct 28, 2024 at 02:51:02PM -0500, Matt wrote:
> I looked at the files in ./macosx and am attaching a patch to take 
> care of the most important issues. These issues are where the version 
> numbers are hard coded into scripts (5.2 vs 5.3).  The patch also adds 
> provisions for the commandtodyesub filter. The two files that have 
> changes are:

I wanted to apply the patches as-is, but they mostly fail to apply:

$ patch -p5 --dry-run < /tmp/guten_macosx.patch 
checking file macosx/makegutenpkg.sh
Hunk #1 FAILED at 44.
Hunk #2 FAILED at 73.
Hunk #3 FAILED at 107.
Hunk #4 FAILED at 115.
Hunk #5 FAILED at 126.
Hunk #6 FAILED at 177.
6 out of 8 hunks FAILED
checking file macosx/scripts/uninstall-gutenprint.command
Hunk #1 FAILED at 117.
Hunk #2 FAILED at 130.
2 out of 3 hunks FAILED

So... I don't know what you used as the "before", but the files you're 
modifying haven't changed since 2019 and 2017, respectively.  Maybe you 
had non-local commits?

Instead of trying to diff two separate git trees, you could make sure 
you have your local WIP repo up-to-date, and generate a patch with 
something like:

  git diff origin/master

Or, if you have these things committed locally, you could do something like

  git format-patch origin/master

And that will generate one patch file for each commit missing upstream.

(Make sure you do a 'git pull --rebase' first though)

 - Solomon
-- 
Solomon Peachy			      pizza at shaftnet dot org (email&xmpp)
                                      @pizza:shaftnet dot org   (matrix)
Dowling Park, FL                      speachy (libera.chat)

_______________________________________________
Gimp-print-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gimp-print-devel

signature.asc (application/pgp-signature, 833 B)