Opened 5 years ago

Closed 5 years ago

Last modified 5 years ago

#47155 closed update (fixed)

djview @4.10 Update to new version

Reported by: stevecheckoway (Stephen Checkoway) Owned by: NicosPavlov
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch Cc: xfacter@…
Port: djview

Description

I'm attaching a diff to the Portfile and two new patch files to update djview to version 4.10.

The current version contains a workaround for a bug in qmake (see r73290 for the same workaround in another port) where an extra -arch flag gets passed to the linker which breaks the link. The workaround removes the flag post-configure. In 4.10, the file that needs the workaround is Makefile.qmake which isn't built until make is invoked. One of the patch files patches Makefile.am (and Makefile.in) to modify the rule that creates Makefile.qmake to delete the extra -arch.

The other patch file fixes the invocation of $(MAKE) -f Makefile.qmake djview which fails on OS X because Makefile.qmake does not have a djview target. The default target in Makefile.qmake works just as well, so we use that.

The second patch should be upstreamed (which I'll do shortly). The qmake bug should really be fixed and the first patch deleted, but I don't have time to investigate qmake.

Attachments (3)

Portfile.diff (2.0 KB) - added by stevecheckoway (Stephen Checkoway) 5 years ago.
patch-makefile-qmake-workaround.diff (1.2 KB) - added by stevecheckoway (Stephen Checkoway) 5 years ago.
patch-makefile-target-fix.diff (567 bytes) - added by stevecheckoway (Stephen Checkoway) 5 years ago.

Download all attachments as: .zip

Change History (10)

Changed 5 years ago by stevecheckoway (Stephen Checkoway)

Attachment: Portfile.diff added

Changed 5 years ago by stevecheckoway (Stephen Checkoway)

Changed 5 years ago by stevecheckoway (Stephen Checkoway)

comment:1 Changed 5 years ago by stevecheckoway (Stephen Checkoway)

I forgot to mention that the existing patch file is no longer needed, as far as I can tell.

comment:2 Changed 5 years ago by mf2k (Frank Schima)

Cc: nicos@… removed
Owner: changed from macports-tickets@… to nicos@…
Version: 2.3.3

comment:3 Changed 5 years ago by NicosPavlov

Resolution: fixed
Status: newclosed

Update done in r 133897. Thanks for the submission.

comment:4 Changed 5 years ago by xfacter@…

I just noticed the macports version is using qt4 still, but the new version should compile with qt5. Any way to update that?

comment:5 Changed 5 years ago by xfacter@…

Cc: xfacter@… added

Cc Me!

comment:6 in reply to:  4 Changed 5 years ago by stevecheckoway (Stephen Checkoway)

Replying to xfacter@…:

I just noticed the macports version is using qt4 still, but the new version should compile with qt5. Any way to update that?

The webpage says it's written in qt4 so I didn't try anything else. Changing it should be a matter of changing the PortGroup line. I haven't tried though.

comment:7 Changed 5 years ago by NicosPavlov

Both are possible apparently. For now, I just updated the port. However, as qt4 and qt5 are mutually exclusive in Macports, this should be done by variants to avoid cutting the port for a whole bunch of users.

Note: See TracTickets for help on using tickets.