diff options
Diffstat (limited to 'x11/qt4-libs/patches/patch-aq')
| -rw-r--r-- | x11/qt4-libs/patches/patch-aq | 65 |
1 files changed, 12 insertions, 53 deletions
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index b8fd9c80aff..d05b4d01f1f 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,49 +1,17 @@ -$NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ +$NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $ ---- configure.orig 2009-09-29 13:01:31.000000000 +0200 +--- configure.orig 2010-01-15 17:01:30.000000000 +0000 +++ configure -@@ -2798,7 +2798,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ - fi - - #auto-detect DWARF2 on the mac --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then - if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then - CFG_MAC_DWARF2=no - else -@@ -2807,7 +2807,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF - fi - - # auto-detect support for -Xarch on the mac --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then - if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then - CFG_MAC_XARCH=no - else -@@ -5587,18 +5587,18 @@ fi - - # Set the default arch. Select 32-bit/carbon if nothing else has - # been specified on the configure line. --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" == "" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then - source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" - -- if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then -+ if [ "$QT_MAC_DEFUALT_ARCH" = "x86_64" ]; then - CFG_MAC_ARCHS=" x86" -- elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then -+ elif [ "$QT_MAC_DEFUALT_ARCH" = "ppc64" ]; then - CFG_MAC_ARCHS=" ppc" - else - CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH" - fi - -- [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." -+ [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." - fi - - # enable cocoa and/or carbon on Mac -@@ -6538,7 +6538,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -3069,7 +3069,7 @@ fi + if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then + # get the darwin version. 10.0.0 and up means snow leopard. + VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` +- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then ++ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then + echo + echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " + echo +@@ -7012,7 +7012,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" @@ -52,12 +20,3 @@ $NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -6856,7 +6856,7 @@ EOF - *) ;; - esac - --if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then -+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - cat <<EOF - WARNING: DWARF2 debug symbols are not enabled. Linking webkit - in debug mode will run out of memory on systems with 2GB or less. |