Sun Aug 14 08:56:21 2011 UTC ()
add support for building on netbsd/sparc64 and netbsd/powerpc systems.


(mrg)
diff -r1.56 -r1.57 pkgsrc/x11/qt4-libs/distinfo
diff -r0 -r1.13 pkgsrc/x11/qt4-libs/patches/patch-ab
diff -r0 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-ai
diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-aq
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-bg
cvs diff -r1.56 -r1.57 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2011/08/12 13:24:07 1.56
+++ pkgsrc/x11/qt4-libs/distinfo 2011/08/14 08:56:21 1.57
@@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
1$NetBSD: distinfo,v 1.56 2011/08/12 13:24:07 adam Exp $ 1$NetBSD: distinfo,v 1.57 2011/08/14 08:56:21 mrg Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e 3SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e
4RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645 4RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645
5Size (qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173 bytes 5Size (qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173 bytes
6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
 7SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
7SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 8SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
8SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea 9SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea
9SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540 10SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540
10SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 11SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
11SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033 12SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033
12SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 14SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47
13SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 15SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
14SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9 16SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9
15SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb 17SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb
16SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
17SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 19SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
18SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4 20SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
19SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
20SHA1 (patch-aq) = 4eaa78ad4b6f5d4db37c28a9bcc0e2cdd73490ab 22SHA1 (patch-aq) = 0650bcff29fddc65d093c0630cdb7ffafb0451cf
21SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 23SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
22SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 24SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
23SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed 25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
24SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b 26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
25SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf 27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
26SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b 28SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
27SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635 29SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635
28SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94 30SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
29SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d 31SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d
30SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9 32SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
31SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5 33SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
32SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f 34SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f
33SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d 35SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d
File Added: pkgsrc/x11/qt4-libs/patches/patch-ab
$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 {
File Added: pkgsrc/x11/qt4-libs/patches/patch-ai
$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 {
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2011/03/03 05:50:04 1.9
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2011/08/14 08:56:21 1.10
@@ -1,40 +1,84 @@ @@ -1,40 +1,84 @@
1$NetBSD: patch-aq,v 1.9 2011/03/03 05:50:04 adam Exp $ 1$NetBSD: patch-aq,v 1.10 2011/08/14 08:56:21 mrg Exp $
2 2
3--- configure.orig 2011-02-22 12:02:53.000000000 +0000 3--- configure.orig 2011-03-29 22:16:21.000000000 -0700
4+++ configure 4+++ configure 2011-08-07 21:32:05.000000000 -0700
5@@ -3297,7 +3297,7 @@ fi 5@@ -2965,13 +2965,13 @@
 6 CFG_HOST_ARCH=x86_64
 7 fi
 8 ;;
 9- *:*:ppc)
 10+ *:*:ppc|*:*:powerpc)
 11 if [ "$OPT_VERBOSE" = "yes" ]; then
 12 echo " 32-bit PowerPC (powerpc)"
 13 fi
 14 CFG_HOST_ARCH=powerpc
 15 ;;
 16- *:*:ppc64)
 17+ *:*:ppc64|*:*:powerpc64)
 18 if [ "$OPT_VERBOSE" = "yes" ]; then
 19 echo " 64-bit PowerPC (powerpc)"
 20 fi
 21@@ -2995,6 +2995,19 @@
 22 fi
 23 CFG_HOST_ARCH=sparc
 24 ;;
 25+ NetBSD:*:sparc)
 26+ if [ "$OPT_VERBOSE" = "yes" ]; then
 27+ echo " NetBSD on SPARC"
 28+ fi
 29+ CFG_HOST_ARCH=sparc
 30+ ;;
 31+ NetBSD:*:sparc64)
 32+ if [ "$OPT_VERBOSE" = "yes" ]; then
 33+ echo " NetBSD on SPARC64"
 34+ fi
 35+ CFG_HOST_ARCH=sparc
 36+ CFG_HOST_BITSIZE=64
 37+ ;;
 38 QNX:*:*)
 39 case "$UNAME_MACHINE" in
 40 x86pc)
 41@@ -3297,7 +3310,7 @@
6 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then 42 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
7 # get the darwin version. 10.0.0 and up means snow leopard. 43 # get the darwin version. 10.0.0 and up means snow leopard.
8 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` 44 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
9- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then 45- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
10+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then 46+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then
11 echo 47 echo
12 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " 48 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
13 echo 49 echo
14@@ -4755,7 +4755,7 @@ if true; then ###[ '!' -f "$outpath/bin/ 50@@ -4755,7 +4768,7 @@
15 done 51 done
16  52
17 QMAKE_BUILD_ERROR=no 53 QMAKE_BUILD_ERROR=no
18- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes 54- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
19+ (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes 55+ (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes
20 [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake 56 [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
21 [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h 57 [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
22 [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 58 [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
23@@ -6580,7 +6580,7 @@ fi 59@@ -6580,7 +6593,7 @@
24 # select Carbon on 10.4 Tiger. 60 # select Carbon on 10.4 Tiger.
25 if [ "$PLATFORM_MAC" = "yes" ]; then 61 if [ "$PLATFORM_MAC" = "yes" ]; then
26 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` 62 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
27- if [ "$VERSION" == 8 ]; then 63- if [ "$VERSION" == 8 ]; then
28+ if [ "$VERSION" = 8 ]; then 64+ if [ "$VERSION" = 8 ]; then
29 CFG_MAC_COCOA="no"; 65 CFG_MAC_COCOA="no";
30 CFG_MAC_CARBON="yes"; 66 CFG_MAC_CARBON="yes";
31 fi 67 fi
32@@ -7788,7 +7788,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 68@@ -7788,7 +7801,7 @@
33 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" 69 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
34 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 70 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
35 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 71 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
36-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 72-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
37+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 73+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
38  74
39 if [ "$PLATFORM_QWS" != "yes" ]; then 75 if [ "$PLATFORM_QWS" != "yes" ]; then
40 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" 76 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
 77@@ -7983,6 +7996,7 @@
 78 #configuration
 79 CONFIG += $QTCONFIG_CONFIG
 80 QT_ARCH = $CFG_ARCH
 81+QT_HOST_BITSIZE = $CFG_HOST_BITSIZE
 82 QT_EDITION = $Edition
 83 QT_CONFIG += $QT_CONFIG
 84
File Added: pkgsrc/x11/qt4-libs/patches/patch-bg
$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(); }