diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-aq | 25 |
2 files changed, 19 insertions, 10 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 5bdd550493d..2999fb7e744 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.99 2015/06/25 08:02:25 joerg Exp $ +$NetBSD: distinfo,v 1.100 2015/06/29 21:06:14 markd Exp $ SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6 RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 @@ -20,7 +20,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 -SHA1 (patch-aq) = d2818f69e89a2d0531df57daabd255ddeef0acb9 +SHA1 (patch-aq) = 44dcc5b8445776ddd5dd9ee4580ab6ed4e51bd74 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index fecd310c6d8..20cff98046b 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,6 +1,6 @@ -$NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ +$NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $ ---- configure.orig 2013-06-07 05:16:41.000000000 +0000 +--- configure.orig 2014-04-10 18:37:08.000000000 +0000 +++ configure @@ -3223,13 +3223,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then CFG_HOST_ARCH=x86_64 @@ -18,7 +18,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ if [ "$OPT_VERBOSE" = "yes" ]; then echo " 64-bit PowerPC (powerpc)" fi -@@ -3253,6 +3253,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then +@@ -3259,6 +3259,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then fi CFG_HOST_ARCH=sparc ;; @@ -38,7 +38,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ QNX:*:*) case "$UNAME_MACHINE" in x86pc) -@@ -3561,7 +3574,7 @@ fi +@@ -3567,7 +3580,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}'` @@ -47,7 +47,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo -@@ -5058,7 +5071,7 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -5074,7 +5087,7 @@ if true; then ###[ '!' -f "$outpath/bin/ done QMAKE_BUILD_ERROR=no @@ -56,7 +56,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 -@@ -7158,7 +7171,7 @@ fi +@@ -7198,7 +7211,7 @@ fi # select Carbon on 10.4 Tiger. if [ "$PLATFORM_MAC" = "yes" ]; then VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -65,7 +65,16 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi -@@ -8422,7 +8435,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -7729,7 +7742,7 @@ case "$XPLATFORM" in + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 4*|3.4*) ++ 5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8475,7 +8488,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" @@ -74,7 +83,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -8638,6 +8651,7 @@ cat >>"$QTCONFIG.tmp" <<EOF +@@ -8691,6 +8704,7 @@ cat >>"$QTCONFIG.tmp" <<EOF #configuration CONFIG += $QTCONFIG_CONFIG QT_ARCH = $CFG_ARCH |