[93522] branches/mld-qt-481/dports/aqua/qt4-mac

michaelld at macports.org michaelld at macports.org
Fri May 25 10:25:10 PDT 2012


Revision: 93522
          https://trac.macports.org/changeset/93522
Author:   michaelld at macports.org
Date:     2012-05-25 10:25:09 -0700 (Fri, 25 May 2012)
Log Message:
-----------
qt4-mac branch: Update to 4.8.2; fix qtAddLibrary mkspec function to not add a -L or -F if the variable is empty.  Tweak message printouts to be able to follow which is called from where.

Modified Paths:
--------------
    branches/mld-qt-481/dports/aqua/qt4-mac/Portfile
    branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
    branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff

Modified: branches/mld-qt-481/dports/aqua/qt4-mac/Portfile
===================================================================
--- branches/mld-qt-481/dports/aqua/qt4-mac/Portfile	2012-05-25 16:12:14 UTC (rev 93521)
+++ branches/mld-qt-481/dports/aqua/qt4-mac/Portfile	2012-05-25 17:25:09 UTC (rev 93522)
@@ -11,7 +11,7 @@
 
 name                qt4-mac
 conflicts           qt3 qt3-mac qt4-mac-devel
-version             4.8.1
+version             4.8.2
 categories          aqua
 platforms           macosx
 maintainers         michaelld openmaintainer
@@ -26,9 +26,8 @@
 master_sites        trolltech
 distname            qt-everywhere-opensource-src-${version}
 
-checksums           md5     7960ba8e18ca31f0c6e4895a312f92ff \
-                    sha1    a074d0f605f009e23c63e0a4cb9b71c978146ffc \
-                    rmd160  538e626fae80ca8ca5aac575919f469a9827ad4f
+checksums           sha1    e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 \
+                    rmd160  6a15077aee1e84076380787127b80c7bb97ebe86
 
 minimum_xcodeversions   {8 2.5}
 

Modified: branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff
===================================================================
--- branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff	2012-05-25 16:12:14 UTC (rev 93521)
+++ branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt.prf.diff	2012-05-25 17:25:09 UTC (rev 93522)
@@ -1,5 +1,5 @@
---- mkspecs/features/qt.prf.orig	2012-04-23 14:49:04.000000000 -0400
-+++ mkspecs/features/qt.prf	2012-04-21 22:25:38.000000000 -0400
+--- mkspecs/features/qt.prf.orig	2012-05-11 10:33:42.000000000 -0400
++++ mkspecs/features/qt.prf	2012-05-23 15:31:06.000000000 -0400
 @@ -137,7 +137,15 @@
  #specific module settings
  !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
@@ -7,11 +7,11 @@
 +
  for(QTLIB, $$list($$lower($$unique(QT)))) {
 +
-+#   message('LIBS' qt before $$QTLIB is '$${LIBS}')
-+#   message('INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
-+#   message('QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
-+#   message('QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
-+#   message('QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
++#   message(qt: 'LIBS' qt before $$QTLIB is '$${LIBS}')
++#   message(qt: 'INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
++#   message(qt: 'QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
++#   message(qt: 'QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
++#   message(qt: 'QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
 +
     unset(qlib_style)
     !qt_debug:!qt_release {
@@ -20,11 +20,11 @@
       qtAddLibrary($$qlib)
        }
     }
-+#   message('LIBS' qt after $$QTLIB is '$${LIBS}')
-+#   message('INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
-+#   message('QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
-+#   message('QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
-+#   message('QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
++#   message(qt: 'LIBS' qt after $$QTLIB is '$${LIBS}')
++#   message(qt: 'INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
++#   message(qt: 'QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
++#   message(qt: 'QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
++#   message(qt: 'QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
 +}
 +
 +# remove Qt's libdir from various flags; it is already part of LIBS,
@@ -52,10 +52,10 @@
 +  QMAKE_OBJECTIVE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
  }
  
-+#message(QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
-+#message(QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
-+#message(QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
-+#message(QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
++#message(qt: QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
++#message(qt: QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
++#message(qt: QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
++#message(qt: QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
 +
  qt_compat {
     !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us

Modified: branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff
===================================================================
--- branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff	2012-05-25 16:12:14 UTC (rev 93521)
+++ branches/mld-qt-481/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff	2012-05-25 17:25:09 UTC (rev 93522)
@@ -1,12 +1,12 @@
---- mkspecs/features/qt_functions.prf.orig	2012-05-02 11:09:26.000000000 -0400
-+++ mkspecs/features/qt_functions.prf	2012-05-02 11:39:42.000000000 -0400
-@@ -16,24 +16,29 @@
+--- mkspecs/features/qt_functions.prf.orig	2012-05-11 10:33:49.000000000 -0400
++++ mkspecs/features/qt_functions.prf	2012-05-25 13:15:09.000000000 -0400
+@@ -16,24 +16,54 @@
  }
  
  defineTest(qtAddLibrary) {
-+#    message('LIBS' before $$1 is '$${LIBS}')
-+#    message('INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
-+#    message('QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
++#    message(qtAddLibrary: 'LIBS' before $$1 is '$${LIBS}')
++#    message(qtAddLibrary: 'INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
++#    message(qtAddLibrary: 'QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
 +
 +    # reorder the includes path: user, this library, Qt headers
 +    INCLUDEPATH -= $$QMAKE_INCDIR_QT
@@ -16,11 +16,36 @@
 +
 +    # first time through, append the path for Qt's installed libraries:
 +    # -after- all of the other necessary libraries and paths
++
 +    mac:!static:contains(QT_CONFIG, qt_framework) {
-+      !contains(LIBS,-F$$QMAKE_FRAMEWORKDIR_QT):LIBS = $$LIBS -F$$QMAKE_FRAMEWORKDIR_QT
-+      !contains(LIBS,-F$$QMAKE_LIBDIR_QT):LIBS = $$LIBS -F$$QMAKE_LIBDIR_QT
++      isEmpty(QMAKE_FRAMEWORKDIR_QT) {
++         !contains(LIBS,-F$$[QT_INSTALL_PREFIX]/Library/Frameworks) {
++	   LIBS = $$LIBS -F$$[QT_INSTALL_PREFIX]/Library/Frameworks
++	 }
++      } else {
++        !contains(LIBS,-F$$QMAKE_FRAMEWORKDIR_QT) {
++ 	  LIBS = $$LIBS -F$$QMAKE_FRAMEWORKDIR_QT
++	}
++      }
++      isEmpty(QMAKE_LIBDIR_QT) {
++         !contains(LIBS,-F$$[QT_INSTALL_PREFIX]/lib) {
++	   LIBS = $$LIBS -F$$[QT_INSTALL_PREFIX]/lib
++	 }
++      } else {
++        !contains(LIBS,-F$$QMAKE_LIBDIR_QT) {
++ 	  LIBS = $$LIBS -F$$QMAKE_LIBDIR_QT
++	}
++      }
 +    }
-+    !contains(LIBS,-L$$QMAKE_LIBDIR_QT):LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
++    isEmpty(QMAKE_LIBDIR_QT) {
++       !contains(LIBS,-L$$[QT_INSTALL_PREFIX]/lib) {
++         LIBS = $$LIBS -L$$[QT_INSTALL_PREFIX]/lib
++       }
++    } else {
++      !contains(LIBS,-L$$QMAKE_LIBDIR_QT) {
++        LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
++      }
++    }
  
      LIB_NAME = $$1
      unset(LINKAGE)
@@ -44,7 +69,7 @@
      	        FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers
      	        !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
      	          INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-@@ -42,8 +47,7 @@
+@@ -42,8 +72,7 @@
      	        LINKAGE = -framework $${LIB_NAME}
         	        break()
                }
@@ -54,7 +79,7 @@
      }
      symbian {
          isEqual(LIB_NAME, QtCore) {
-@@ -73,7 +77,16 @@
+@@ -73,7 +102,16 @@
      isEmpty(LINKAGE) {
         if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
             win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
@@ -72,17 +97,17 @@
         }
         isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
      }
-@@ -83,6 +96,9 @@
+@@ -83,6 +121,9 @@
          QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
      }
      LIBS += $$LINKAGE
-+#    message('LIBS' after $$1 is now '$${LIBS}')
-+#    message('INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
-+#    message('QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
++#    message(qtAddLibrary: 'LIBS' after $$1 is now '$${LIBS}')
++#    message(qtAddLibrary: 'INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
++#    message(qtAddLibrary: 'QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
      export(LIBS)
      export(INCLUDEPATH)
      export(QMAKE_FRAMEWORKPATH)
-@@ -119,4 +135,3 @@
+@@ -119,4 +160,3 @@
  
      return(true)
  }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120525/58911e82/attachment-0001.html>


More information about the macports-changes mailing list