Opened 13 years ago

Closed 13 years ago

Last modified 13 years ago

#29833 closed update (fixed)

Update afflib to 3.6.12, aimage to 3.2.4

Reported by: jessekornblum@… Owned by: opendarwin.org@…
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch Cc: ryandesign (Ryan Carsten Schmidt)
Port: afflib aimage

Description

Attached please find a patch file for the afflib package to version 3.6.12. Note this port now includes the aimage program, which is currently a separate port. (Should that port be deprecated and removed? Rolled into this one? How does this work?)

Attachments (3)

afflib.diff (798 bytes) - added by jessekornblum@… 13 years ago.
afflib-3.6.12.diff (2.4 KB) - added by ryandesign (Ryan Carsten Schmidt) 13 years ago.
proposed patch for afflib; seems to work
aimage-3.2.4.diff (1.8 KB) - added by ryandesign (Ryan Carsten Schmidt) 13 years ago.
in progress patch for aimage 3.2.4

Download all attachments as: .zip

Change History (10)

Changed 13 years ago by jessekornblum@…

Attachment: afflib.diff added

comment:1 Changed 13 years ago by mf2k (Frank Schima)

Keywords: haspatch added
Owner: changed from macports-tickets@… to opendarwin.org@…
Port: afflib, aimageafflib aimage
Version: 1.9.2

comment:2 in reply to:  description Changed 13 years ago by ryandesign (Ryan Carsten Schmidt)

Replying to jessekornblum@…:

Note this port now includes the aimage program, which is currently a separate port. (Should that port be deprecated and removed? Rolled into this one? How does this work?)

The wiki and the guide both have sections explaining how to handle a port being replaced by (or incorporated into) another. Though this particular case is complicated by the fact that aimage depends on afflib, so afflib will get upgraded first, and will fail to activate because the aimage port's copy of the aimage program will still be there. So in addition to aimage being changed into a stub port using replaced_by, as documented in the aforementioned links, the new afflib will have to use the "deactivate hack" to deactivate aimage if present.

comment:3 Changed 13 years ago by ryandesign (Ryan Carsten Schmidt)

What I wrote would be relevant if the latest afflib had in fact incorporated aimage into itself. But I find no evidence that this has occurred. I find only evidence that the opposite happened before -- aimage used to be part of afflib and was separated from it. What made you think aimage had been integrated into afflib again?

I'm attaching a revised patch which:

  • updates afflib to 3.6.12 and updates aimage to 3.2.4
  • removes unnecessary lines "use_bzip2 no"; that's the default
  • patches configure.ac to not look for things in /usr/local and /sw
  • moves afflib's expat dependency from the s3 variant into the global section of the portfile since it seems to be always required

afflib installs fine for me but aimage fails to build:

gui.cpp: In function 'void my_refresh(imager*, affcallback_info*)':
gui.cpp:285: error: 'class aftimer' has no member named 'timer_text'
gui.cpp:286: warning: cannot pass objects of non-POD type 'struct std::string' through '...'; call will abort at runtime
gui.cpp:286: warning: format '%s' expects type 'char*', but argument 2 has type 'int'
gui.cpp:317: error: 'class aftimer' has no member named 'timer_text'
gui.cpp:359: error: 'class aftimer' has no member named 'timer_text'
gui.cpp:363: warning: cannot pass objects of non-POD type 'struct std::string' through '...'; call will abort at runtime
gui.cpp:376: warning: cannot pass objects of non-POD type 'struct std::string' through '...'; call will abort at runtime
gui.cpp:409: error: 'class aftimer' has no member named 'timer_text'
make[2]: *** [gui.o] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2

This problem was also reported to Debian in March 2011 but nothing has happened there yet. afflib's sourceforge project is barren (no source, no items in any of the trackers or forums) and the afflib homepage gives no indication of there being a public bug tracker. So I don't know how to fix this problem.

Changed 13 years ago by ryandesign (Ryan Carsten Schmidt)

Attachment: afflib-3.6.12.diff added

proposed patch for afflib; seems to work

Changed 13 years ago by ryandesign (Ryan Carsten Schmidt)

Attachment: aimage-3.2.4.diff added

in progress patch for aimage 3.2.4

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

Cc: ryandesign@… added

comment:5 Changed 13 years ago by ryandesign (Ryan Carsten Schmidt)

Updated afflib to 3.6.12 in r83828. aimage remains to be updated.

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

Resolution: fixed
Status: newclosed

Correction: aimage was already updated to 3.2.4 in r83772 via #26505. So since the port now already doesn't build, there's no harm committing my additional change to not search unwanted directories; r83829.

comment:7 Changed 13 years ago by ryandesign (Ryan Carsten Schmidt)

r83830: updated aimage to 3.2.5, which works again with the latest afflib.

Note: See TracTickets for help on using tickets.