pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Update qt4 to 4.4.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3cb4e4180d5
branches:  trunk
changeset: 545025:e3cb4e4180d5
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jul 24 12:55:20 2008 +0000

description:
Update qt4 to 4.4.0

Qt 4.4 introduces many new features as well as many improvements and
bugfixes over the 4.3.x series. For more details, see the online
documentation which is included in this distribution. The
documentation is also available at http://doc.trolltech.com/4.4

The Qt version 4.4 series is binary compatible with the 4.3.x series.
A long list of changes can be found in the changes-4.4.0 file in the
distribution.

Update OKed (and initial work provided) by adam@..

diffstat:

 x11/qt4-libs/Makefile         |    7 +-
 x11/qt4-libs/Makefile.common  |    6 +-
 x11/qt4-libs/PLIST            |    8 ++-
 x11/qt4-libs/distinfo         |   37 +++++-----
 x11/qt4-libs/patches/patch-aa |   26 +++---
 x11/qt4-libs/patches/patch-ab |   38 +++++-----
 x11/qt4-libs/patches/patch-ac |    6 +-
 x11/qt4-libs/patches/patch-ad |   12 +-
 x11/qt4-libs/patches/patch-ae |   10 +-
 x11/qt4-libs/patches/patch-af |   12 +-
 x11/qt4-libs/patches/patch-ag |    6 +-
 x11/qt4-libs/patches/patch-aj |    8 +-
 x11/qt4-libs/patches/patch-ak |    6 +-
 x11/qt4-libs/patches/patch-al |   12 +-
 x11/qt4-libs/patches/patch-an |   13 ---
 x11/qt4-libs/patches/patch-ao |   28 ++++----
 x11/qt4-libs/patches/patch-aq |   10 +-
 x11/qt4-libs/patches/patch-ar |    6 +-
 x11/qt4-libs/patches/patch-as |   22 ++++++
 x11/qt4-libs/patches/patch-at |   13 +++
 x11/qt4-qdbus/Makefile        |    7 +-
 x11/qt4-qdbus/PLIST           |   65 ++++++++++++-------
 x11/qt4-tools/Makefile        |   17 +---
 x11/qt4-tools/PLIST           |  137 +++++++++++++++++++++++++++++++----------
 x11/qt4/Makefile.common       |    4 +-
 25 files changed, 314 insertions(+), 202 deletions(-)

diffs (truncated from 1114 to 300 lines):

diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/Makefile     Thu Jul 24 12:55:20 2008 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2008/02/11 23:06:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.24 2008/07/24 12:55:20 markd Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-libs-${QTVERSION}
-PKGREVISION=   2
 COMMENT=       C++ X GUI toolkit
 
 BUILD_TARGET=          sub-src
@@ -33,12 +32,12 @@
 .endfor
        ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
            ${DESTDIR}${QTPREFIX}/bin
-.for incl in corelib gui network opengl qt3support sql svg xml script
+.for incl in corelib gui network opengl qt3support sql svg xml script testlib 3rdparty/webkit/WebCore
        cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
                ${MAKE_PROGRAM} ${INSTALL_TARGET}
 .endfor
        cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
-.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript
+.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtTest QtWebKit
        ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
                ${DESTDIR}${QTPREFIX}/lib/
        sed     -e "s:${WRKSRC}:${QTPREFIX}:g" \
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common      Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/Makefile.common      Thu Jul 24 12:55:20 2008 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.9 2008/06/12 12:50:19 abs Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/07/24 12:55:20 markd Exp $
 # used by x11/qt4-libs/Makefile
 
 DISTNAME=      qt-x11-opensource-src-${QTVERSION}
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.trolltech.com/qt/source/ \
                ftp://ftp.bero.org/pub/qt/source/
+EXTRACT_SUFX=  .tar.bz2
 
 .include "../../x11/qt4/Makefile.common"
 
@@ -27,6 +28,9 @@
 CONFIGURE_ARGS+=       -system-zlib
 CONFIGURE_ARGS+=       -qt-gif # qt4 does not write compressed GIFs
 CONFIGURE_ARGS+=       ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
+# current WebKit fails for missing pthread_getattr_np() in
+# src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
+#CONFIGURE_ARGS+=      -no-webkit
 CONFIGURE_ARGS.SunOS+= -no-xrender
 OPSYSVARS+=            CONFIGURE_ARGS
 CONFIGURE_ARGS+=       < ${FILESDIR}/license-acceptance
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/PLIST
--- a/x11/qt4-libs/PLIST        Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/PLIST        Thu Jul 24 12:55:20 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/12/12 09:53:46 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/07/24 12:55:20 markd Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtGui.pc
@@ -7,6 +7,8 @@
 lib/pkgconfig/QtScript.pc
 lib/pkgconfig/QtSql.pc
 lib/pkgconfig/QtSvg.pc
+lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtWebKit.pc
 lib/pkgconfig/QtXml.pc
 qt4/bin/moc
 qt4/bin/rcc
@@ -20,6 +22,8 @@
 qt4/lib/libQtScript.la
 qt4/lib/libQtSql.la
 qt4/lib/libQtSvg.la
+qt4/lib/libQtTest.la
+qt4/lib/libQtWebKit.la
 qt4/lib/libQtXml.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
@@ -32,6 +36,8 @@
 @dirrm qt4/plugins
 @dirrm qt4/lib
 @dirrm qt4/include/QtXml
+@dirrm qt4/include/QtWebKit
+@dirrm qt4/include/QtTest
 @dirrm qt4/include/QtSvg
 @dirrm qt4/include/QtSql
 @dirrm qt4/include/QtScript
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/distinfo     Thu Jul 24 12:55:20 2008 +0000
@@ -1,23 +1,24 @@
-$NetBSD: distinfo,v 1.22 2008/05/13 18:35:19 drochner Exp $
+$NetBSD: distinfo,v 1.23 2008/07/24 12:55:20 markd Exp $
 
-SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228
-RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292
-Size (qt-x11-opensource-src-4.3.3.tar.gz) = 42341802 bytes
-SHA1 (patch-aa) = 671cf6bdcabc0919a0e0c80a2b82734a85b58757
-SHA1 (patch-ab) = c2a9c3b51a1afa3080aed5ef8fb91032c4dc53c1
-SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = fa55c0803316acf11856fdfd11b360a169fb27de
-SHA1 (patch-ae) = 497966ec97e941f7d9140a6993bed44c3037ff74
-SHA1 (patch-af) = 416f8154074b561e57b87e45ef2f67d3b1caf711
-SHA1 (patch-ag) = 7b2186277bbdccf55468c469cc7505574b7f18ad
+SHA1 (qt-x11-opensource-src-4.4.0.tar.bz2) = 71acc53f5ec7bdc6abbc85409568d0d006a040e3
+RMD160 (qt-x11-opensource-src-4.4.0.tar.bz2) = ddcfe3390e65761a45a6112a8466b3b1e22cc584
+Size (qt-x11-opensource-src-4.4.0.tar.bz2) = 98584925 bytes
+SHA1 (patch-aa) = c1b203fc294dacc18443f0035435b30fa5b8d884
+SHA1 (patch-ab) = 08203775d62d2397b3d120009c448683208bea6f
+SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
+SHA1 (patch-ad) = 2da97a6eba43e43396c335210b5a66d5e895b660
+SHA1 (patch-ae) = 02f17681f1e9b42a88dbb14e7904eca7bd91eeb4
+SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4
+SHA1 (patch-ag) = 62e37b973c7709e917092a7601094d46ac37d4ac
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = e9ca9544f929bb4adf3ccb0ca2cad9352124289d
-SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1
-SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605
+SHA1 (patch-aj) = aabfd55bf93d61db29aefab33040fff6dcb18615
+SHA1 (patch-ak) = ab61338af77848f346dcf3351f87e3ec9dd3af5c
+SHA1 (patch-al) = 7424cb5c11fd035afa7c353389d9af940e0b9141
 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
-SHA1 (patch-an) = 6c9044134516d089e97b47a2750beab0e4c4952f
-SHA1 (patch-ao) = 44d5b5830b237d6e71fc83444029461bace15081
+SHA1 (patch-ao) = 610051176bd491e2aa8cb562d6f9d36a8a38798b
 SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
-SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3
-SHA1 (patch-ar) = 7ed6f3e8db11e15c907eeeb11f691612633f1c34
+SHA1 (patch-aq) = b26e4a3e099bc4710728e30972ad1d74e05964f4
+SHA1 (patch-ar) = d690a582dd3dfb16fe17938c77a01940df1e7c8f
+SHA1 (patch-as) = 614250b087b195c38979f6aa9c000d3d742f544e
+SHA1 (patch-at) = a3b0a81abef7a209cd6a71322eff6771bf0f9c2e
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa     Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/patches/patch-aa     Thu Jul 24 12:55:20 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/07/24 12:55:20 markd Exp $
 
---- qmake/generators/unix/unixmake2.cpp.orig   2007-10-01 15:06:33.000000000 +0200
+--- qmake/generators/unix/unixmake2.cpp.orig   2008-04-28 15:11:14.000000000 +0200
 +++ qmake/generators/unix/unixmake2.cpp
-@@ -227,6 +227,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -234,6 +234,8 @@ UnixMakefileGenerator::writeMakeParts(QT
          if(!project->isEmpty("QMAKE_BUNDLE")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
@@ -11,7 +11,7 @@
          } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -977,8 +979,12 @@ void UnixMakefileGenerator::init2()
+@@ -984,8 +986,12 @@ void UnixMakefileGenerator::init2()
      } else if (project->isActiveConfig("staticlib")) {
          project->values("TARGET").first().prepend("lib");
          project->values("TARGET").first() += ".a";
@@ -25,12 +25,12 @@
      } else {
          project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
          if(project->isActiveConfig("compile_libtool"))
-@@ -1413,7 +1419,7 @@ UnixMakefileGenerator::writePkgConfigFil
-     else
-         libs << "QMAKE_LIBS"; //obvious one
-     libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
--    t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " ";
-+    t << "Libs: -Wl,-R${libdir} -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " ";
-     for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
-         t << project->values((*it)).join(" ") << " ";
-     t << endl;
+@@ -1436,7 +1442,7 @@ UnixMakefileGenerator::writePkgConfigFil
+             bundle = bundle.left(suffix);
+         pkgConfiglibName = "-framework " + bundle + " ";
+     } else {
+-        pkgConfiglibDir = "-L${libdir}";
++        pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
+         pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
+     }
+     t << pkgConfiglibDir << " " << pkgConfiglibName << " ";
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab     Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ab     Thu Jul 24 12:55:20 2008 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
 
---- src/gui/painting/painting.pri.orig 2007-08-07 15:08:41.000000000 +0200
+--- src/gui/painting/painting.pri.orig 2008-04-28 15:11:18.000000000 +0200
 +++ src/gui/painting/painting.pri
-@@ -182,11 +182,11 @@ mac {
+@@ -197,11 +197,11 @@ mac {
  
      win32-g++|!win32:!*-icc* {
          mmx {
--            mmx_compiler.commands = $$QMAKE_CXX -c
-+            mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+-            mmx_compiler.commands = $$QMAKE_CXX -c -Winline
++            mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
              mmx_compiler.commands += -mmmx
              mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
              mmx_compiler.dependency_type = TYPE_C
@@ -16,12 +16,12 @@
              mmx_compiler.input = MMX_SOURCES
              mmx_compiler.variable_out = OBJECTS
              mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -194,22 +194,22 @@ mac {
+@@ -209,22 +209,22 @@ mac {
              QMAKE_EXTRA_COMPILERS += mmx_compiler
          }
          3dnow {
--            mmx3dnow_compiler.commands = $$QMAKE_CXX -c
-+            mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+-            mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
++            mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
              mmx3dnow_compiler.commands += -m3dnow -mmmx
              mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
              mmx3dnow_compiler.dependency_type = TYPE_C
@@ -33,8 +33,8 @@
              silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
              QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
            sse {
--                sse3dnow_compiler.commands = $$QMAKE_CXX -c
-+                sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+-                sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
++                sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
                  sse3dnow_compiler.commands += -m3dnow -msse
                  sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
                  sse3dnow_compiler.dependency_type = TYPE_C
@@ -43,12 +43,12 @@
                  sse3dnow_compiler.input = SSE3DNOW_SOURCES
                  sse3dnow_compiler.variable_out = OBJECTS
                  sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
-@@ -218,11 +218,11 @@ mac {
+@@ -233,11 +233,11 @@ mac {
            }
          }
          sse {
--            sse_compiler.commands = $$QMAKE_CXX -c
-+            sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+-            sse_compiler.commands = $$QMAKE_CXX -c -Winline
++            sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
              sse_compiler.commands += -msse
              sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
              sse_compiler.dependency_type = TYPE_C
@@ -57,12 +57,12 @@
              sse_compiler.input = SSE_SOURCES
              sse_compiler.variable_out = OBJECTS
              sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -230,11 +230,11 @@ mac {
+@@ -245,11 +245,11 @@ mac {
              QMAKE_EXTRA_COMPILERS += sse_compiler
          }
          sse2 {
--            sse2_compiler.commands = $$QMAKE_CXX -c
-+            sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+-            sse2_compiler.commands = $$QMAKE_CXX -c -Winline
++            sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
              sse2_compiler.commands += -msse2
              sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
              sse2_compiler.dependency_type = TYPE_C
@@ -71,12 +71,12 @@
              sse2_compiler.input = SSE2_SOURCES
              sse2_compiler.variable_out = OBJECTS
              sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -242,11 +242,11 @@ mac {
+@@ -257,11 +257,11 @@ mac {
              QMAKE_EXTRA_COMPILERS += sse2_compiler
          }
          iwmmxt {
--            iwmmxt_compiler.commands = $$QMAKE_CXX -c
-+            iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+-            iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
++            iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
              iwmmxt_compiler.commands += -mcpu=iwmmxt
              iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
              iwmmxt_compiler.dependency_type = TYPE_C
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/patches/patch-ac
--- a/x11/qt4-libs/patches/patch-ac     Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ac     Thu Jul 24 12:55:20 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $
+$NetBSD: patch-ac,v 1.2 2008/07/24 12:55:20 markd Exp $
 
---- tools/designer/src/designer/designer.pro.orig      2006-01-30 15:07:57.000000000 +0100
+--- tools/designer/src/designer/designer.pro.orig      2008-04-28 15:11:20.000000000 +0200
 +++ tools/designer/src/designer/designer.pro
-@@ -14,7 +14,7 @@ INCLUDEPATH += \
+@@ -13,7 +13,7 @@ INCLUDEPATH += \
      ../lib/uilib \
      extra
  
diff -r c9ac09ee5d25 -r e3cb4e4180d5 x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad     Thu Jul 24 10:40:21 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ad     Thu Jul 24 12:55:20 2008 +0000



Home | Main Index | Thread Index | Old Index