Opened 4 years ago

Closed 4 years ago

#61037 closed defect (invalid)

libraw @0.20.0: Patch fails

Reported by: GreyCon (Con Cunningham) Owned by:
Priority: Normal Milestone:
Component: ports Version: 2.6.3
Keywords: Cc:
Port: libraw

Description

:debug:sysinfo macOS 10.15 (darwin/19.6.0) arch i386
:debug:sysinfo MacPorts 2.6.3
:debug:sysinfo Xcode 11.6
:debug:sysinfo SDK 10.15
:debug:sysinfo MACOSX_DEPLOYMENT_TARGET: 10.7

:info:patch patching file libraw_r.pc.in
:info:patch Hunk #1 FAILED at 7.
:info:patch 1 out of 1 hunk FAILED -- saving rejects to file libraw_r.pc.in.rej
:info:patch patching file libraw.pc.in

Patch File attached.

Attachments (1)

patch.diff (716 bytes) - added by GreyCon (Con Cunningham) 4 years ago.
Patch file for libraw

Download all attachments as: .zip

Change History (7)

Changed 4 years ago by GreyCon (Con Cunningham)

Attachment: patch.diff added

Patch file for libraw

comment:1 Changed 4 years ago by iEFdev

It worked here for me on 10.7. The first patch though, had a 78 line offset.

:info:patch patching file Makefile.dist
:info:patch Hunk #1 succeeded at 159 with fuzz 1 (offset 78 lines).
:info:patch patching file libraw.pc.in
:info:patch patching file libraw_r.pc.in
version:1
:debug:sysinfo Mac OS X 10.7 (darwin/11.4.2) arch i386
:debug:sysinfo MacPorts 2.6.3
:debug:sysinfo Xcode 4.6.3
:debug:sysinfo SDK 10.7
:debug:sysinfo MACOSX_DEPLOYMENT_TARGET: 10.7

I've fixed that one. You could try with that patch and see if it helps. Don't forget to clean the port before you run again: sudo port clean libraw

https://raw.githubusercontent.com/macports/macports-ports/8573828/graphics/libraw/files/patch-libraw-no-libstdcxx.diff

comment:2 Changed 4 years ago by Eric F <iEFdev@…>

In 2baba564f9224123078020df33efc58026134972/macports-ports (master):

libraw: fix patch fuzz and offset (https://github.com/macports/macports-ports/pull/8169)

Makefile.dist: Hunk https://github.com/macports/macports-ports/pull/1 had fuzz and a 78 lines offset

In case it till help this ticket:
See: #61037

comment:3 in reply to:  description Changed 4 years ago by iEFdev

Replying to GreyCon:

Patch File attached.

The content of the patchfile you attached … are only parts of the patch, and doesn't match. That's why it fails. It looks like an older patch.

The dates in your patch with 2018-… In the file history, they've been blank or as now: 2020-… Is it a 'home cooked' patch?

comment:4 Changed 4 years ago by GreyCon (Con Cunningham)

Hi, definitely not home-cooked :-) I was following instructions from here https://github.com/darktable-org/darktable/blob/master/packaging/macosx/BUILD.txt to build darktable for mac. I see it includes the line: curl -Lo ~/ports/graphics/libraw/files/patch.diff https://raw.github.com/darktable-org/darktable/master/packaging/macosx/libraw-stdlib.diff So I guess that's where it came from. I got it to build anyway, I just deleted the contents of the patch file. So we may as well close this ticket. Thanks for your help.

comment:5 Changed 4 years ago by iEFdev

Ah ok, so they keep their own set of patches. Those can easily get outdated.

Glad you got it sorted out.

comment:6 Changed 4 years ago by ryandesign (Ryan Carsten Schmidt)

Resolution: invalid
Status: newclosed

We've run into this problem with the darktable installation instructions before. It's inappropriate of them to ask you to install customized patched versions of our ports. They need to make their software compatible with normal unpatched versions of their dependencies. If they believe we should make changes in our ports to enable certain options that they need, they are welcome to file tickets or pull requests with us.

Note: See TracTickets for help on using tickets.