Opened 12 years ago

Closed 11 years ago

#38706 closed update (fixed)

Update of digikam port

Reported by: jgosmann (Jan Gosmann) Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version: 2.1.3
Keywords: haspatch maintainer Cc: cgilles (HumanDynamo), cooljeanius (Eric Gallager)
Port: digikam

Description

I did a few updates to the digikam port:

  • Added kde4-baseapps and kde4-runtime dependency. They are not absolutely necessary. But some functionality like trash or Flickr authentication depends on these. This change should resolve #31926 and #37592
  • Changed hard-coded /opt/local to ${prefix}

Attachments (1)

Portfile-digikam.diff (6.5 KB) - added by jgosmann (Jan Gosmann) 11 years ago.
Patch file for digikam port

Download all attachments as: .zip

Change History (10)

comment:1 Changed 12 years ago by ryandesign (Ryan Carsten Schmidt)

Keywords: maintainer added

This patch does not apply.

$ patch Portfile < ~/Downloads/Portfile-digikam.diff 
patching file Portfile
Hunk #1 FAILED at 66.
Hunk #2 FAILED at 82.
Hunk #3 FAILED at 153.
3 out of 3 hunks FAILED -- saving rejects to file Portfile.rej

Please submit a new patch based on the current version of the Portfile in the repository.

comment:2 Changed 12 years ago by cooljeanius (Eric Gallager)

Cc: egall@… added

Cc Me!

comment:3 Changed 12 years ago by jgosmann (Jan Gosmann)

Sorry, I had an alias for diff producing an incompatible format. I replaced the patch file with one which should work.

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

It's a properly-formatted unified diff, but it does not apply to this file: browser:trunk/dports/kde/digikam/Portfile@104234

comment:5 Changed 12 years ago by cooljeanius (Eric Gallager)

Maybe attaching the rejects file (i.e. Portfile.rej) for Jan to look at could help here?

Last edited 12 years ago by cooljeanius (Eric Gallager) (previous) (diff)

comment:6 Changed 12 years ago by jgosmann (Jan Gosmann)

I accidently saved the Portfile from the repository at the wrong location and therefore did the diff against an old revision. :/

I hope, it works now.

comment:7 Changed 11 years ago by mf2k (Frank Schima)

This patch has whitespace changes making it very hard to evaluate the changes because every line is different. And the revision is inexplicably increased from 0 to 4. Can you please submit a patch with only functional changes?

Changed 11 years ago by jgosmann (Jan Gosmann)

Attachment: Portfile-digikam.diff added

Patch file for digikam port

comment:8 Changed 11 years ago by jgosmann (Jan Gosmann)

Fixed the whitespace problems and update to Digikam 3.2.

comment:9 Changed 11 years ago by eborisch (Eric A. Borisch)

Resolution: fixed
Status: newclosed

Applied patch in r108333.

Note: See TracTickets for help on using tickets.