Ignore:
Timestamp:
Nov 10, 2010, 4:49:38 PM (9 years ago)
Author:
michaelld@…
Message:

qt4-mac: bump to 4.7.1; fix use of CCACHE variable; fix linking with
QtHelp on 10.4 (hopefully).

Location:
trunk/dports/aqua/qt4-mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r73121 r73343  
    1111name                qt4-mac
    1212conflicts           qt4-mac-devel
    13 version             4.7.0
    14 revision            1
     13version             4.7.1
    1514categories          aqua
    1615platforms           macosx
     
    2524master_sites        trolltech
    2625distname            qt-everywhere-opensource-src-${version}
    27 checksums           md5     3a2f25b9b115037277f4fb759194a7a5 \
    28                     sha1    a5796c8f468c8f59249e5c696f913864c979f411 \
    29                     rmd160  3e9c0f0d9843b5c03ad4bd6193aff98531ee0746
     26checksums           md5     6f88d96507c84e9fea5bf3a71ebeb6d7 \
     27                    sha1    fcf764d39d982c7f84703821582bd10c3192e341 \
     28                    rmd160  de6998948eb9f51a9193b9020ba80cfd52d50899
    3029
    3130depends_lib-append  port:zlib port:dbus port:openssl port:sqlite3 \
     
    236235    # build as Carbon only, not cocoa.
    237236    configure.args-append -carbon
     237
     238    # required linking flags?
    238239    configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms -lsqlite3 -lssl -lz
     240
     241    # build all Makefiles during configure, ...
     242    configure.args-delete -fast
     243    # ... then patch them: 10.4 requires -lQtHelp to be followed by
     244    # -lQtCLucene (10.5+ figures this out) as found in Makefiles only.
     245    # If just release, will be just "Makefile".  If using +debug, will
     246    # be "Makefile.Release" and "Makefile.Debug", so do a find on
     247    # "Makefile*" to work no matter which is selected.
    239248    post-configure {
    240         fs-traverse item ${worksrcpath} {
    241             if {"Makefile" == [file tail ${item}]} {
    242                 reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
    243             }
     249        foreach fixfile [exec find ${worksrcpath} -name "Makefile*"] {
     250            reinplace "s|-lQtHelp|-lQtHelp -lQtCLucene|g" ${fixfile}
    244251        }
    245252    }
  • trunk/dports/aqua/qt4-mac/files/patch-mkspecs_common_mac.conf.diff

    r73102 r73343  
    77+# allow CC and CXX to use CCACHE;
    88+# use "make CCACHE=ccache" when building
    9 +QMAKE_CC = "$(CCACHE)" $$QMAKE_CC
    10 +QMAKE_CXX = "$(CCACHE)" $$QMAKE_CXX
     9+QMAKE_CC = $(CCACHE) $$QMAKE_CC
     10+QMAKE_CXX = $(CCACHE) $$QMAKE_CXX
    1111 
    1212 include(unix.conf)
Note: See TracChangeset for help on using the changeset viewer.