pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Changes 4.4.3:
details: https://anonhg.NetBSD.org/pkgsrc/rev/9010c1399475
branches: trunk
changeset: 549029:9010c1399475
user: adam <adam%pkgsrc.org@localhost>
date: Sun Oct 26 14:02:33 2008 +0000
description:
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.
diffstat:
x11/qt4-libs/Makefile.common | 6 ++--
x11/qt4-libs/distinfo | 32 ++++++++++++++--------------
x11/qt4-libs/patches/patch-aa | 10 ++++----
x11/qt4-libs/patches/patch-ab | 14 ++++++------
x11/qt4-libs/patches/patch-ad | 12 +++++-----
x11/qt4-libs/patches/patch-ae | 10 ++++----
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 | 8 +++---
x11/qt4-libs/patches/patch-ao | 8 +++---
x11/qt4-libs/patches/patch-aq | 9 ++-----
x11/qt4-libs/patches/patch-ar | 6 ++--
x11/qt4-libs/patches/patch-as | 6 ++--
x11/qt4-pgsql/Makefile | 3 +-
x11/qt4-tools/Makefile | 5 +--
x11/qt4-tools/PLIST | 46 ++++++++++++++++++++++++++++++++++--------
x11/qt4/Makefile.common | 4 +-
18 files changed, 111 insertions(+), 88 deletions(-)
diffs (truncated from 579 to 300 lines):
diff -r 4686c702252f -r 9010c1399475 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/Makefile.common Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/distinfo Sun Oct 26 14:02:33 2008 +0000
@@ -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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-aa Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
} 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 @@
} 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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ab Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
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 @@
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 @@
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 @@
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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ad Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
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 @@
#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 @@
# 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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-ae
--- a/x11/qt4-libs/patches/patch-ae Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ae Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
} 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 @@
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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-ag
--- a/x11/qt4-libs/patches/patch-ag Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ag Sun Oct 26 14:02:33 2008 +0000
@@ -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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-aj
--- a/x11/qt4-libs/patches/patch-aj Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-aj Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
#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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-ak
--- a/x11/qt4-libs/patches/patch-ak Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-ak Sun Oct 26 14:02:33 2008 +0000
@@ -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 -r 4686c702252f -r 9010c1399475 x11/qt4-libs/patches/patch-al
--- a/x11/qt4-libs/patches/patch-al Sun Oct 26 13:44:40 2008 +0000
+++ b/x11/qt4-libs/patches/patch-al Sun Oct 26 14:02:33 2008 +0000
@@ -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 @@
return qt_isEvilFsTypeName(buf.f_fstypename);
}
-@@ -162,7 +169,7 @@ static bool isLikelyToBeNfs(int handle)
+@@ -156,7 +163,7 @@ static bool isLikelyToBeNfs(int handle)
Home |
Main Index |
Thread Index |
Old Index