Opened 12 years ago

Closed 12 years ago

Last modified 12 years ago

#33738 closed update (fixed)

Update kdiff3 to 0.9.96

Reported by: gallafent Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch Cc:
Port: kdiff3

Description (last modified by mf2k (Frank Schima))

Attached patches update kdiff3 to latest version.

I've moved to use the Qt version (rather than the KDE version) as the default variant. If anybody really needs the kde version I can have a go at getting that working too. See the commented-out section in the portfile.

I believe this allows tickets #19524 and #33053 to be closed.

I attach two versions of the portfile patch - one has the unfinished work to build the kde4 variant, the other has no variants and simply always builds the qt4 version (and is thus simpler and cleaner, as well as being finished).

The patch to kdiff3.pro is required in order to:

  • allow the portfile to specify the installation path
  • prevent the kdiff3 executable from being pointlessly wrapped in an app bundle.

Attachments (3)

Portfile.diff (1.6 KB) - added by gallafent 12 years ago.
Portfile diff including unfinished work to allow kde4 variant
Portfile.2.diff (1.5 KB) - added by gallafent 12 years ago.
Simpler Portfile diff that just always uses the qt4 approach
patch-src-QT4-kdiff3.pro.diff (407 bytes) - added by gallafent 12 years ago.
Necessary patch to build and install correctly under macports regime

Download all attachments as: .zip

Change History (8)

Changed 12 years ago by gallafent

Attachment: Portfile.diff added

Portfile diff including unfinished work to allow kde4 variant

Changed 12 years ago by gallafent

Attachment: Portfile.2.diff added

Simpler Portfile diff that just always uses the qt4 approach

Changed 12 years ago by gallafent

Necessary patch to build and install correctly under macports regime

comment:1 Changed 12 years ago by gallafent

I think my preference for now is for the second simpler Portfile.2.diff, the necessary extra work with separate kde4 and qt4 variants can be done in the future if anybody wants it after all.

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

Description: modified (diff)
Keywords: haspatch added
Version: 2.0.4

Do you know which license this port uses?

comment:3 Changed 12 years ago by mf2k (Frank Schima)

Resolution: fixed
Status: newclosed

r91081. Thanks. If you know the license, comment here and I'll add it to the portfile.

comment:4 Changed 12 years ago by gallafent

I believe that the licence is GPL-2 - http://kdiff3.sourceforge.net/COPYING

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

Yea, looks good. Thanks. r91082.

Note: See TracTickets for help on using tickets.