Changes 4.4.3:

* Updated application icons and other graphics to reflect the look and feel of the new Qt brand. * Copyright of Qt has been transferred to Nokia Corporation.
author: adam <adam> 2008-10-26 14:02:33 +0000
committer: adam <adam> 2008-10-26 14:02:33 +0000
commit: 49a024c8ea43af8001c29f3c4c18b804af2ba80c (patch)
tree: e8779b7070f6855aa85112fd0d985ff221d02279
parent: 1c3040c5ab1ad45e5cc5203eb023fd6527abe9ad (diff)
download: pkgsrc-49a024c8ea43af8001c29f3c4c18b804af2ba80c.tar.gz
18 files changed, 111 insertions, 88 deletions
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 0a5c2598847..61f3dda5070 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2008/07/24 12:55:20 markd Exp $
+# $NetBSD: Makefile.common,v 1.11 2008/10/26 14:02:33 adam Exp $
 # used by x11/qt4-libs/Makefile
 
 DISTNAME=	qt-x11-opensource-src-${QTVERSION}
@@ -38,10 +38,10 @@ CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 LIBQT?=			-lQtCore -lQtGui
 
 MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
-MAKE_ENV+=		QTDIR=${WRKSRC:Q}
+MAKE_ENV+=		QTDIR=${WRKSRC}
 
 # avoid creating a .qt directory in the users home directory
-SCRIPTS_ENV+=		HOME=${WRKDIR:Q}
+SCRIPTS_ENV+=		HOME=${WRKDIR}
 
 .include "../../mk/compiler.mk"
 
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index d13892db506..b87eccde8cc 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.24 2008/09/17 12:23:01 joerg Exp $
+$NetBSD: distinfo,v 1.25 2008/10/26 14:02:33 adam Exp $
 
-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 (qt-x11-opensource-src-4.4.3.tar.bz2) = 099bcc2dfda73f093f7e80e9004114d41db40b51
+RMD160 (qt-x11-opensource-src-4.4.3.tar.bz2) = 3c73d9c549523efa0e760965c38c7876b4636861
+Size (qt-x11-opensource-src-4.4.3.tar.bz2) = 103961247 bytes
+SHA1 (patch-aa) = 7f2bd5a4052e931b1562d02eaa6a9c2966567e37
+SHA1 (patch-ab) = 0575619a679ec81a17ede2a39cdaccb938b16fcd
 SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
-SHA1 (patch-ad) = 2da97a6eba43e43396c335210b5a66d5e895b660
-SHA1 (patch-ae) = 02f17681f1e9b42a88dbb14e7904eca7bd91eeb4
+SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5
+SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9
 SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4
-SHA1 (patch-ag) = 62e37b973c7709e917092a7601094d46ac37d4ac
+SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = aabfd55bf93d61db29aefab33040fff6dcb18615
-SHA1 (patch-ak) = ab61338af77848f346dcf3351f87e3ec9dd3af5c
-SHA1 (patch-al) = 7424cb5c11fd035afa7c353389d9af940e0b9141
+SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203
+SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a
+SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
-SHA1 (patch-ao) = 610051176bd491e2aa8cb562d6f9d36a8a38798b
+SHA1 (patch-ao) = e74125f5230db3e1b339c76c06a54470dd0631db
 SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
-SHA1 (patch-aq) = b26e4a3e099bc4710728e30972ad1d74e05964f4
-SHA1 (patch-ar) = d690a582dd3dfb16fe17938c77a01940df1e7c8f
-SHA1 (patch-as) = 614250b087b195c38979f6aa9c000d3d742f544e
+SHA1 (patch-aq) = 401bf595bfe3854e36b0260d24be95b712f9d6a2
+SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
+SHA1 (patch-as) = 244a3017e2780270b61ac50af000cd6fd1bb9cf5
 SHA1 (patch-at) = c8c818dcf45822c8510568bc738b819493f38b11
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
index 3c8399743e4..a9b24c50348 100644
--- a/x11/qt4-libs/patches/patch-aa
+++ b/x11/qt4-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-aa,v 1.8 2008/10/26 14:02:33 adam Exp $
 
---- qmake/generators/unix/unixmake2.cpp.orig	2008-04-28 15:11:14.000000000 +0200
+--- qmake/generators/unix/unixmake2.cpp.orig	2008-09-27 10:58:43.000000000 +0200
 +++ qmake/generators/unix/unixmake2.cpp
-@@ -234,6 +234,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -228,6 +228,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 @@ $NetBSD: patch-aa,v 1.7 2008/07/24 12:55:20 markd Exp $
          } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -984,8 +986,12 @@ void UnixMakefileGenerator::init2()
+@@ -978,8 +980,12 @@ void UnixMakefileGenerator::init2()
      } else if (project->isActiveConfig("staticlib")) {
          project->values("TARGET").first().prepend("lib");
          project->values("TARGET").first() += ".a";
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.7 2008/07/24 12:55:20 markd Exp $
      } else {
          project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
          if(project->isActiveConfig("compile_libtool"))
-@@ -1436,7 +1442,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1430,7 +1436,7 @@ UnixMakefileGenerator::writePkgConfigFil
              bundle = bundle.left(suffix);
          pkgConfiglibName = "-framework " + bundle + " ";
      } else {
diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab
index 71ac94e7bbf..8dec73f3164 100644
--- a/x11/qt4-libs/patches/patch-ab
+++ b/x11/qt4-libs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ab,v 1.7 2008/10/26 14:02:33 adam Exp $
 
---- src/gui/painting/painting.pri.orig	2008-04-28 15:11:18.000000000 +0200
+--- src/gui/painting/painting.pri.orig	2008-09-27 10:58:47.000000000 +0200
 +++ src/gui/painting/painting.pri
-@@ -197,11 +197,11 @@ mac {
+@@ -192,11 +192,11 @@ mac {
  
      win32-g++|!win32:!*-icc* {
          mmx {
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
              mmx_compiler.input = MMX_SOURCES
              mmx_compiler.variable_out = OBJECTS
              mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -209,22 +209,22 @@ mac {
+@@ -204,22 +204,22 @@ mac {
              QMAKE_EXTRA_COMPILERS += mmx_compiler
          }
          3dnow {
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
                  sse3dnow_compiler.input = SSE3DNOW_SOURCES
                  sse3dnow_compiler.variable_out = OBJECTS
                  sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
-@@ -233,11 +233,11 @@ mac {
+@@ -228,11 +228,11 @@ mac {
  	    }
          }
          sse {
@@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
              sse_compiler.input = SSE_SOURCES
              sse_compiler.variable_out = OBJECTS
              sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -245,11 +245,11 @@ mac {
+@@ -240,11 +240,11 @@ mac {
              QMAKE_EXTRA_COMPILERS += sse_compiler
          }
          sse2 {
@@ -71,7 +71,7 @@ $NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
              sse2_compiler.input = SSE2_SOURCES
              sse2_compiler.variable_out = OBJECTS
              sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -257,11 +257,11 @@ mac {
+@@ -252,11 +252,11 @@ mac {
              QMAKE_EXTRA_COMPILERS += sse2_compiler
          }
          iwmmxt {
diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad
index a8b57813291..e90dace3735 100644
--- a/x11/qt4-libs/patches/patch-ad
+++ b/x11/qt4-libs/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ad,v 1.8 2008/10/26 14:02:33 adam Exp $
 
---- src/corelib/global/qglobal.h.orig	2008-04-28 15:11:18.000000000 +0200
+--- src/corelib/global/qglobal.h.orig	2008-09-27 10:58:46.000000000 +0200
 +++ src/corelib/global/qglobal.h
-@@ -155,6 +155,7 @@ namespace QT_NAMESPACE {}
+@@ -149,6 +149,7 @@ namespace QT_NAMESPACE {}
       NETBSD   - NetBSD
       OPENBSD  - OpenBSD
       BSDI     - BSD/OS
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.7 2008/07/24 12:55:20 markd Exp $
       IRIX     - SGI Irix
       OSF      - HP Tru64 UNIX
       SCO      - SCO OpenServer 5
-@@ -216,6 +217,9 @@ namespace QT_NAMESPACE {}
+@@ -210,6 +211,9 @@ namespace QT_NAMESPACE {}
  #elif defined(__NetBSD__)
  #  define Q_OS_NETBSD
  #  define Q_OS_BSD4
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.7 2008/07/24 12:55:20 markd Exp $
  #elif defined(__OpenBSD__)
  #  define Q_OS_OPENBSD
  #  define Q_OS_BSD4
-@@ -258,8 +262,6 @@ namespace QT_NAMESPACE {}
+@@ -252,8 +256,6 @@ namespace QT_NAMESPACE {}
  #endif
  
  #if defined(Q_OS_DARWIN)
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.7 2008/07/24 12:55:20 markd Exp $
  #  if defined(Q_OS_DARWIN64)
  #     define Q_OS_MAC64
  #  elif defined(Q_OS_DARWIN32)
-@@ -705,8 +707,6 @@ namespace QT_NAMESPACE {}
+@@ -699,8 +701,6 @@ namespace QT_NAMESPACE {}
  #  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
  #elif defined(Q_OS_UNIX)
  #  if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae
index d7e7ce273cb..98098dbdce1 100644
--- a/x11/qt4-libs/patches/patch-ae
+++ b/x11/qt4-libs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ae,v 1.6 2008/10/26 14:02:33 adam Exp $
 
---- qmake/generators/unix/unixmake.cpp.orig	2008-04-28 15:11:14.000000000 +0200
+--- qmake/generators/unix/unixmake.cpp.orig	2008-09-27 10:58:43.000000000 +0200
 +++ qmake/generators/unix/unixmake.cpp
-@@ -320,27 +320,29 @@ UnixMakefileGenerator::init()
+@@ -317,27 +317,29 @@ UnixMakefileGenerator::init()
                  if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
                      libtool_flags += " --mode=link";
                      if(project->isActiveConfig("staticlib")) {
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.5 2008/07/24 12:55:20 markd Exp $
                  } else {
                      libtool_flags += " --mode=compile";
                  }
-@@ -668,7 +670,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -665,7 +667,6 @@ UnixMakefileGenerator::defaultInstall(co
      QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false);
      if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
          destdir += Option::dir_sep;
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.5 2008/07/24 12:55:20 markd Exp $
      if(targetdir.right(1) != Option::dir_sep)
          targetdir += Option::dir_sep;
  
-@@ -706,10 +707,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -703,10 +704,14 @@ UnixMakefileGenerator::defaultInstall(co
          QString src_targ = target;
          if(src_targ == "$(TARGET)")
              src_targ = "$(TARGETL)";
diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag
index 21465e8aff7..d4a37b86e0c 100644
--- a/x11/qt4-libs/patches/patch-ag
+++ b/x11/qt4-libs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ag,v 1.8 2008/10/26 14:02:33 adam Exp $
 
---- qmake/project.cpp.orig	2008-04-28 15:11:14.000000000 +0200
+--- qmake/project.cpp.orig	2008-09-27 10:58:44.000000000 +0200
 +++ qmake/project.cpp
-@@ -1617,6 +1617,9 @@ QMakeProject::isActiveConfig(const QStri
+@@ -1611,6 +1611,9 @@ QMakeProject::isActiveConfig(const QStri
      else if(x == "false")
          return false;
  
diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj
index ffeaef95a1b..ad9469844c3 100644
--- a/x11/qt4-libs/patches/patch-aj
+++ b/x11/qt4-libs/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-aj,v 1.6 2008/10/26 14:02:33 adam Exp $
 
---- mkspecs/netbsd-g++/qplatformdefs.h.orig	2008-04-28 15:11:14.000000000 +0200
+--- mkspecs/netbsd-g++/qplatformdefs.h.orig	2008-09-27 10:58:43.000000000 +0200
 +++ mkspecs/netbsd-g++/qplatformdefs.h
-@@ -67,6 +67,7 @@
+@@ -61,6 +61,7 @@
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/ipc.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.5 2008/07/24 12:55:20 markd Exp $
  #include <sys/time.h>
  #include <sys/shm.h>
  #include <sys/socket.h>
-@@ -128,10 +129,14 @@
+@@ -122,10 +123,14 @@
  #define QT_SNPRINTF		::snprintf
  #define QT_VSNPRINTF		::vsnprintf
  
diff --git a/x11/qt4-libs/patches/patch-ak b/x11/qt4-libs/patches/patch-ak
index 8f66b0389cf..c4f1ac1d225 100644
--- a/x11/qt4-libs/patches/patch-ak
+++ b/x11/qt4-libs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ak,v 1.4 2008/10/26 14:02:33 adam Exp $
 
---- src/gui/kernel/qcursor_x11.cpp.orig	2008-04-28 15:11:18.000000000 +0200
+--- src/gui/kernel/qcursor_x11.cpp.orig	2008-09-27 10:58:47.000000000 +0200
 +++ src/gui/kernel/qcursor_x11.cpp
-@@ -263,7 +263,7 @@ void QCursorData::update()
+@@ -229,7 +229,7 @@ void QCursorData::update()
          return;
      }
  
diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al
index 388dad53cc7..3b3f07f17b8 100644
--- a/x11/qt4-libs/patches/patch-al
+++ b/x11/qt4-libs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.4 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-al,v 1.5 2008/10/26 14:02:33 adam Exp $
 
---- src/corelib/io/qsettings.cpp.orig	2008-04-28 15:11:18.000000000 +0200
+--- src/corelib/io/qsettings.cpp.orig	2008-09-27 10:58:47.000000000 +0200
 +++ src/corelib/io/qsettings.cpp
-@@ -130,9 +130,16 @@ QT_END_INCLUDE_NAMESPACE
+@@ -124,9 +124,16 @@ QT_END_INCLUDE_NAMESPACE
  
  static bool isLikelyToBeNfs(int handle)
  {
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.4 2008/07/24 12:55:20 markd Exp $
      return qt_isEvilFsTypeName(buf.f_fstypename);
  }
  
-@@ -162,7 +169,7 @@ static bool isLikelyToBeNfs(int handle)
+@@ -156,7 +163,7 @@ static bool isLikelyToBeNfs(int handle)
  
  #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
        || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_QNX6) || defined(Q_OS_SCO) \
diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao
index c7ad8159942..8147be14ef6 100644
--- a/x11/qt4-libs/patches/patch-ao
+++ b/x11/qt4-libs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ao,v 1.5 2008/10/26 14:02:33 adam Exp $
 
---- src/corelib/codecs/qiconvcodec.cpp.orig	2008-04-28 15:11:18.000000000 +0200
+--- src/corelib/codecs/qiconvcodec.cpp.orig	2008-09-27 10:58:46.000000000 +0200
 +++ src/corelib/codecs/qiconvcodec.cpp
-@@ -50,9 +50,14 @@
+@@ -44,9 +44,14 @@
  #include <stdio.h>
  #include <dlfcn.h>
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ao,v 1.4 2008/07/24 12:55:20 markd Exp $
  #  include <langinfo.h>
  #endif
  
-@@ -69,6 +74,9 @@
+@@ -63,6 +68,9 @@
  #  else
  #    define UTF16 "UTF-16LE"
  #  endif
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index d574125034a..170bffe920d 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,11 +1,8 @@
-$NetBSD: patch-aq,v 1.2 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-aq,v 1.3 2008/10/26 14:02:33 adam Exp $
 
-Dont default QT_NO_DBUS on in qconfig.h to be consistent with qt4-qdbus
-package.
-
---- configure.orig	2008-04-29 01:11:12.000000000 +1200
+--- configure.orig	2008-09-27 10:58:41.000000000 +0200
 +++ configure
-@@ -5837,7 +5837,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+@@ -5856,7 +5856,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
  [ "$CFG_TABLET" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET"
  [ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
  [ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
diff --git a/x11/qt4-libs/patches/patch-ar b/x11/qt4-libs/patches/patch-ar
index 7a17cf7b8fb..9d250213ead 100644
--- a/x11/qt4-libs/patches/patch-ar
+++ b/x11/qt4-libs/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.2 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-ar,v 1.3 2008/10/26 14:02:33 adam Exp $
 
---- src/corelib/global/qglobal.h.orig	2008-05-21 19:56:16.000000000 +0200
+--- src/corelib/global/qglobal.h.orig	2008-10-26 08:15:12.000000000 +0100
 +++ src/corelib/global/qglobal.h
-@@ -173,7 +173,7 @@ namespace QT_NAMESPACE {}
+@@ -167,7 +167,7 @@ namespace QT_NAMESPACE {}
  */
  
  #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
diff --git a/x11/qt4-libs/patches/patch-as b/x11/qt4-libs/patches/patch-as
index 292d78689e0..501473dac30 100644
--- a/x11/qt4-libs/patches/patch-as
+++ b/x11/qt4-libs/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-as,v 1.2 2008/10/26 14:02:33 adam Exp $
 
---- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig	2008-04-29 01:11:20.000000000 +1200
+--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig	2008-09-27 10:58:48.000000000 +0200
 +++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h
-@@ -89,7 +89,7 @@ configure.
+@@ -87,7 +87,7 @@ configure.
  #define _CL_HAVE_FCNTL_H  1 
  #endif
  
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index e8beef08ce5..a3b82786c69 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/03/13 17:38:49 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/10/26 14:02:33 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-pgsql-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index ff5119dbaaa..5a691477304 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2008/10/08 09:35:49 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/10/26 14:02:33 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
@@ -21,7 +20,7 @@ UNLIMIT_RESOURCES=	datasize
 INSTALLATION_DIRS=	${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig \
 	${QTPREFIX}/plugins/designer ${QTPREFIX}/phrasebooks \
 	${QTPREFIX}/mkspecs
-INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR:Q}
+INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
 post-configure:
 	ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 6e9d994db64..e507ba233b3 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/07/24 12:55:21 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/10/26 14:02:33 adam Exp $
 lib/pkgconfig/QtAssistantClient.pc
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
@@ -15,10 +15,6 @@ qt4/bin/pixeltool
 qt4/bin/qmake
 qt4/bin/qt3to4
 qt4/bin/qtconfig
-qt4/include/QtAssistant/QAssistantClient
-qt4/include/QtAssistant/QtAssistant
-qt4/include/QtAssistant/qassistantclient.h
-qt4/include/QtAssistant/qassistantclient_global.h
 qt4/include/Qt/QtHelp
 qt4/include/Qt/qhelp_global.h
 qt4/include/Qt/qhelpcontentwidget.h
@@ -28,6 +24,10 @@ qt4/include/Qt/qhelpindexwidget.h
 qt4/include/Qt/qhelpsearchengine.h
 qt4/include/Qt/qhelpsearchquerywidget.h
 qt4/include/Qt/qhelpsearchresultwidget.h
+qt4/include/QtAssistant/QAssistantClient
+qt4/include/QtAssistant/QtAssistant
+qt4/include/QtAssistant/qassistantclient.h
+qt4/include/QtAssistant/qassistantclient_global.h
 qt4/include/QtDesigner/QAbstractExtensionFactory
 qt4/include/QtDesigner/QAbstractExtensionManager
 qt4/include/QtDesigner/QAbstractFormBuilder
@@ -112,6 +112,7 @@ qt4/include/QtHelp/QHelpContentModel
 qt4/include/QtHelp/QHelpContentWidget
 qt4/include/QtHelp/QHelpEngine
 qt4/include/QtHelp/QHelpEngineCore
+qt4/include/QtHelp/QHelpGlobal
 qt4/include/QtHelp/QHelpIndexModel
 qt4/include/QtHelp/QHelpIndexWidget
 qt4/include/QtHelp/QHelpSearchEngine
@@ -148,8 +149,8 @@ qt4/mkspecs/common/g++.conf
 qt4/mkspecs/common/linux.conf
 qt4/mkspecs/common/llvm.conf
 qt4/mkspecs/common/mac-g++.conf
-qt4/mkspecs/common/mac.conf
 qt4/mkspecs/common/mac-llvm.conf
+qt4/mkspecs/common/mac.conf
 qt4/mkspecs/common/qmake.conf
 qt4/mkspecs/common/unix.conf
 qt4/mkspecs/cygwin-g++/qmake.conf
@@ -256,6 +257,8 @@ qt4/mkspecs/hpuxi-acc-32/qmake.conf
 qt4/mkspecs/hpuxi-acc-32/qplatformdefs.h
 qt4/mkspecs/hpuxi-acc-64/qmake.conf
 qt4/mkspecs/hpuxi-acc-64/qplatformdefs.h
+qt4/mkspecs/hpuxi-g++-64/qmake.conf
+qt4/mkspecs/hpuxi-g++-64/qplatformdefs.h
 qt4/mkspecs/hurd-g++/qmake.conf
 qt4/mkspecs/hurd-g++/qplatformdefs.h
 qt4/mkspecs/interix-g++/qmake.conf
@@ -371,8 +374,6 @@ qt4/mkspecs/unixware-cc/qmake.conf
 qt4/mkspecs/unixware-cc/qplatformdefs.h
 qt4/mkspecs/unixware-g++/qmake.conf
 qt4/mkspecs/unixware-g++/qplatformdefs.h
-qt4/mkspecs/win32-borland/qmake.conf
-qt4/mkspecs/win32-borland/qplatformdefs.h
 qt4/mkspecs/win32-g++/qmake.conf
 qt4/mkspecs/win32-g++/qplatformdefs.h
 qt4/mkspecs/win32-msvc.net/qmake.conf
@@ -391,24 +392,42 @@ qt4/mkspecs/win32-msvc2008/qmake.conf
 qt4/mkspecs/win32-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
 qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf
+qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf
 qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf
+qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf
 qt4/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-mipsiv-msvc2008/qmake.conf
+qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf
 qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf
+qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf
 qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf
+qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
 qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
 qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
 qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf
+qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h
 qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf
 qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf
+qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h
 qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf
 qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf
+qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h
 qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf
 qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf
+qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 qt4/phrasebooks/danish.qph
 qt4/phrasebooks/dutch.qph
 qt4/phrasebooks/finnish.qph
@@ -424,15 +443,24 @@ qt4/phrasebooks/swedish.qph
 qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/plugins/designer
 @dirrm qt4/phrasebooks
+@dirrm qt4/mkspecs/wincewm60standard-msvc2008
 @dirrm qt4/mkspecs/wincewm60standard-msvc2005
+@dirrm qt4/mkspecs/wincewm60professional-msvc2008
 @dirrm qt4/mkspecs/wincewm60professional-msvc2005
+@dirrm qt4/mkspecs/wincewm50smart-msvc2008
 @dirrm qt4/mkspecs/wincewm50smart-msvc2005
+@dirrm qt4/mkspecs/wincewm50pocket-msvc2008
 @dirrm qt4/mkspecs/wincewm50pocket-msvc2005
 @dirrm qt4/mkspecs/wince60standard-armv4i-msvc2005
+@dirrm qt4/mkspecs/wince50standard-x86-msvc2008
 @dirrm qt4/mkspecs/wince50standard-x86-msvc2005
+@dirrm qt4/mkspecs/wince50standard-sh4-msvc2008
 @dirrm qt4/mkspecs/wince50standard-sh4-msvc2005
+@dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2008
 @dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2005
+@dirrm qt4/mkspecs/wince50standard-mipsii-msvc2008
 @dirrm qt4/mkspecs/wince50standard-mipsii-msvc2005
+@dirrm qt4/mkspecs/wince50standard-armv4i-msvc2008
 @dirrm qt4/mkspecs/wince50standard-armv4i-msvc2005
 @dirrm qt4/mkspecs/win32-msvc2008
 @dirrm qt4/mkspecs/win32-msvc2005
@@ -442,7 +470,6 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/win32-msvc.net
 @dirrm qt4/mkspecs/win32-msvc
 @dirrm qt4/mkspecs/win32-g++
-@dirrm qt4/mkspecs/win32-borland
 @dirrm qt4/mkspecs/unixware-g++
 @dirrm qt4/mkspecs/unixware-cc
 @dirrm qt4/mkspecs/tru64-g++
@@ -497,6 +524,7 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/irix-cc
 @dirrm qt4/mkspecs/interix-g++
 @dirrm qt4/mkspecs/hurd-g++
+@dirrm qt4/mkspecs/hpuxi-g++-64
 @dirrm qt4/mkspecs/hpuxi-acc-64
 @dirrm qt4/mkspecs/hpuxi-acc-32
 @dirrm qt4/mkspecs/hpux-g++-64
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index e257646350e..71e07d1add1 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.14 2008/07/24 12:55:20 markd Exp $
+# $NetBSD: Makefile.common,v 1.15 2008/10/26 14:02:33 adam Exp $
 # used by x11/qt4-libs/Makefile.common
 # used by x11/qt4-tools/Makefile
 
-QTVERSION=	4.4.0
+QTVERSION=	4.4.3
 
 MAINTAINER?=	adam@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt/
author	adam <adam>	2008-10-26 14:02:33 +0000
committer	adam <adam>	2008-10-26 14:02:33 +0000
commit	49a024c8ea43af8001c29f3c4c18b804af2ba80c (patch)
tree	e8779b7070f6855aa85112fd0d985ff221d02279
parent	1c3040c5ab1ad45e5cc5203eb023fd6527abe9ad (diff)
download	pkgsrc-49a024c8ea43af8001c29f3c4c18b804af2ba80c.tar.gz