diff options
author | mrg <mrg@pkgsrc.org> | 2011-08-14 08:56:21 +0000 |
---|---|---|
committer | mrg <mrg@pkgsrc.org> | 2011-08-14 08:56:21 +0000 |
commit | 1aef3362e1b3a90ab0a3b7912fbb8d379f92c6ff (patch) | |
tree | 5675e38ee9cca554aef1d51fe9b00e48111ea292 /x11/qt4-libs | |
parent | a573111e4b72d7efcf1bd9f2c8a71412eaa39404 (diff) | |
download | pkgsrc-1aef3362e1b3a90ab0a3b7912fbb8d379f92c6ff.tar.gz |
add support for building on netbsd/sparc64 and netbsd/powerpc systems.
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r-- | x11/qt4-libs/distinfo | 6 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ai | 13 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-aq | 58 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-bg | 16 |
5 files changed, 97 insertions, 9 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index a9fac27168c..83dc6331fc8 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,15 +1,17 @@ -$NetBSD: distinfo,v 1.56 2011/08/12 13:24:07 adam Exp $ +$NetBSD: distinfo,v 1.57 2011/08/14 08:56:21 mrg Exp $ SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645 Size (qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173 bytes SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 +SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540 SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 +SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47 SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9 SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb @@ -17,7 +19,7 @@ SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 -SHA1 (patch-aq) = 4eaa78ad4b6f5d4db37c28a9bcc0e2cdd73490ab +SHA1 (patch-aq) = 0650bcff29fddc65d093c0630cdb7ffafb0451cf SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab new file mode 100644 index 00000000000..e9fd7d9d616 --- /dev/null +++ b/x11/qt4-libs/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.13 2011/08/14 08:56:21 mrg Exp $ + +--- src/corelib/arch/powerpc/arch.pri.orig 2011-08-07 17:47:09.000000000 -0700 ++++ src/corelib/arch/powerpc/arch.pri 2011-08-07 17:47:23.000000000 -0700 +@@ -1,7 +1,7 @@ + # + # PowerPC architecture + # +-!*-g++* { ++netbsd* | !*-g++* { + *-64 { + SOURCES += $$QT_ARCH_CPP/qatomic64.s + } else { diff --git a/x11/qt4-libs/patches/patch-ai b/x11/qt4-libs/patches/patch-ai new file mode 100644 index 00000000000..0c21d44277c --- /dev/null +++ b/x11/qt4-libs/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.3 2011/08/14 08:56:21 mrg Exp $ + +--- src/corelib/arch/sparc/arch.pri.orig 2011-08-07 21:39:57.000000000 -0700 ++++ src/corelib/arch/sparc/arch.pri 2011-08-07 21:40:56.000000000 -0700 +@@ -1,7 +1,7 @@ + # + # SPARC architecture + # +-*-64* { ++isEqual(QT_HOST_BITSIZE, 64) | *-64* { + SOURCES += $$QT_ARCH_CPP/qatomic64.s + } + else { diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index 8e46b1f4d38..0dbbd8b1197 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,8 +1,44 @@ -$NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $ +$NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $ ---- configure.orig 2011-02-22 12:02:53.000000000 +0000 -+++ configure -@@ -3297,7 +3297,7 @@ fi +--- configure.orig 2011-03-29 22:16:21.000000000 -0700 ++++ configure 2011-08-07 21:32:05.000000000 -0700 +@@ -2965,13 +2965,13 @@ + CFG_HOST_ARCH=x86_64 + fi + ;; +- *:*:ppc) ++ *:*:ppc|*:*:powerpc) + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " 32-bit PowerPC (powerpc)" + fi + CFG_HOST_ARCH=powerpc + ;; +- *:*:ppc64) ++ *:*:ppc64|*:*:powerpc64) + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " 64-bit PowerPC (powerpc)" + fi +@@ -2995,6 +2995,19 @@ + fi + CFG_HOST_ARCH=sparc + ;; ++ NetBSD:*:sparc) ++ if [ "$OPT_VERBOSE" = "yes" ]; then ++ echo " NetBSD on SPARC" ++ fi ++ CFG_HOST_ARCH=sparc ++ ;; ++ NetBSD:*:sparc64) ++ if [ "$OPT_VERBOSE" = "yes" ]; then ++ echo " NetBSD on SPARC64" ++ fi ++ CFG_HOST_ARCH=sparc ++ CFG_HOST_BITSIZE=64 ++ ;; + QNX:*:*) + case "$UNAME_MACHINE" in + x86pc) +@@ -3297,7 +3310,7 @@ 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}'` @@ -11,7 +47,7 @@ $NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $ echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo -@@ -4755,7 +4755,7 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -4755,7 +4768,7 @@ done QMAKE_BUILD_ERROR=no @@ -20,7 +56,7 @@ $NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 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 -@@ -6580,7 +6580,7 @@ fi +@@ -6580,7 +6593,7 @@ # select Carbon on 10.4 Tiger. if [ "$PLATFORM_MAC" = "yes" ]; then VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -29,7 +65,7 @@ $NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $ CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi -@@ -7788,7 +7788,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -7788,7 +7801,7 @@ [ "$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" @@ -38,3 +74,11 @@ $NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $ if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" +@@ -7983,6 +7996,7 @@ + #configuration + CONFIG += $QTCONFIG_CONFIG + QT_ARCH = $CFG_ARCH ++QT_HOST_BITSIZE = $CFG_HOST_BITSIZE + QT_EDITION = $Edition + QT_CONFIG += $QT_CONFIG + diff --git a/x11/qt4-libs/patches/patch-bg b/x11/qt4-libs/patches/patch-bg new file mode 100644 index 00000000000..5e7328e2d52 --- /dev/null +++ b/x11/qt4-libs/patches/patch-bg @@ -0,0 +1,16 @@ +$NetBSD: patch-bg,v 1.1 2011/08/14 08:56:21 mrg Exp $ + +this ends up going into non-const-able interfaces inside qt4 + + +--- src/dbus/qdbusintegrator.cpp.orig 2011-03-30 05:19:07.000000000 +0000 ++++ src/dbus/qdbusintegrator.cpp 2011-08-08 21:44:34.000000000 +0000 +@@ -71,7 +71,7 @@ + static bool isDebugging; + #define qDBusDebug if (!::isDebugging); else qDebug + +-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) ++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) + + static inline QString dbusServiceString() + { return *orgFreedesktopDBusString(); } |