pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Changes 4.3.2:
details: https://anonhg.NetBSD.org/pkgsrc/rev/e378be6fbd75
branches: trunk
changeset: 534175:e378be6fbd75
user: adam <adam%pkgsrc.org@localhost>
date: Sat Oct 13 12:02:14 2007 +0000
description:
Changes 4.3.2:
* General Improvements
* Fixed incorrect behavior of the widget editing mode that
could occur when a form was resized.
* Fixed a crash that could occur when several commands were
redone in one go.
* Enabled MSVC and Borland project generators for the Qt Open Source
edition.
* Ensured that the QMAKE_CC and QMAKE_CXX variables are not defined in
the Xcode project generator to allow distributed (distcc) builds to
work again.
* more...
diffstat:
x11/qt4-libs/Makefile | 4 ++--
x11/qt4-libs/buildlink3.mk | 7 ++++---
x11/qt4-libs/distinfo | 26 +++++++++++++-------------
x11/qt4-libs/patches/patch-aa | 10 +++++-----
x11/qt4-libs/patches/patch-ad | 12 ++++++------
x11/qt4-libs/patches/patch-ae | 10 +++++-----
x11/qt4-libs/patches/patch-af | 10 +++++-----
x11/qt4-libs/patches/patch-ag | 6 +++---
x11/qt4-libs/patches/patch-aj | 8 ++++----
x11/qt4-libs/patches/patch-ak | 8 ++++----
x11/qt4-libs/patches/patch-al | 8 ++++----
x11/qt4-libs/patches/patch-an | 6 +++---
x11/qt4-tools/PLIST | 16 +++++++++++++---
x11/qt4/Makefile.common | 4 ++--
14 files changed, 73 insertions(+), 62 deletions(-)
diffs (truncated from 369 to 300 lines):
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/Makefile Sat Oct 13 12:02:14 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/10/04 20:43:52 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/10/13 12:02:14 adam Exp $
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 1
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
@@ -59,6 +58,7 @@
SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
.endif
+.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/buildlink3.mk
--- a/x11/qt4-libs/buildlink3.mk Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/buildlink3.mk Sat Oct 13 12:02:14 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/01/15 19:16:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/10/13 12:02:14 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT4_LIBS_BUILDLINK3_MK:= ${QT4_LIBS_BUILDLINK3_MK}+
@@ -27,11 +27,12 @@
.include "../../mk/bsd.fast.prefs.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/distinfo Sat Oct 13 12:02:14 2007 +0000
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.13 2007/09/03 09:35:15 drochner Exp $
+$NetBSD: distinfo,v 1.14 2007/10/13 12:02:14 adam Exp $
-SHA1 (qt-x11-opensource-src-4.3.1.tar.gz) = ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2
-RMD160 (qt-x11-opensource-src-4.3.1.tar.gz) = 134c1f1a9e685a9519ff88a3afc59e7b8329a270
-Size (qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 bytes
-SHA1 (patch-aa) = edfc05780c1be3588fd35a0261b3a1ca45274bc8
+SHA1 (qt-x11-opensource-src-4.3.2.tar.gz) = 265fb56ded2e7ff101ebd722bd2bc1638f96057d
+RMD160 (qt-x11-opensource-src-4.3.2.tar.gz) = b73a3d7a1edd11987544291cce80b56f5a499969
+Size (qt-x11-opensource-src-4.3.2.tar.gz) = 43462686 bytes
+SHA1 (patch-aa) = 671cf6bdcabc0919a0e0c80a2b82734a85b58757
SHA1 (patch-ab) = c2a9c3b51a1afa3080aed5ef8fb91032c4dc53c1
SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = 3567be61b6df31a65c286a5451753d8cbed9efd3
-SHA1 (patch-ae) = 468e3ae41e738d51d253c839e55e329ad7937006
-SHA1 (patch-af) = 247f9509a34eeb53201a551c8e3558451308353e
-SHA1 (patch-ag) = df4716c73748cf19bf511c5d395a8beab9d7c70a
+SHA1 (patch-ad) = fa55c0803316acf11856fdfd11b360a169fb27de
+SHA1 (patch-ae) = 497966ec97e941f7d9140a6993bed44c3037ff74
+SHA1 (patch-af) = 416f8154074b561e57b87e45ef2f67d3b1caf711
+SHA1 (patch-ag) = 7b2186277bbdccf55468c469cc7505574b7f18ad
SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = 7e8528c6ab1bad239142464b49ee073939a868b0
-SHA1 (patch-ak) = 16eef0675a63da937637c8fc654664f1cb155d18
-SHA1 (patch-al) = a46ad5c1236d8a63900faaca62b13827b9c1c08e
-SHA1 (patch-an) = 1e0ee434c7db17c2c7d14055ede44d1417318774
+SHA1 (patch-aj) = ed19733b78d40a98be3c2b11bb3c5ced7b022ff1
+SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1
+SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605
+SHA1 (patch-an) = 338d0cf6cdf38689c9f3770222802206dd8035a3
SHA1 (patch-ao) = dd0c6e9fdb0c204f494d5ca4d49be2f0a20a1c81
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-aa Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-aa,v 1.6 2007/10/13 12:02:14 adam Exp $
---- qmake/generators/unix/unixmake2.cpp.orig 2007-05-25 15:24:38.000000000 +0200
+--- qmake/generators/unix/unixmake2.cpp.orig 2007-10-01 15:06:33.000000000 +0200
+++ qmake/generators/unix/unixmake2.cpp
-@@ -212,6 +212,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -227,6 +227,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;
-@@ -962,8 +964,12 @@ void UnixMakefileGenerator::init2()
+@@ -977,8 +979,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"))
-@@ -1398,7 +1404,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -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?
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ad Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-ad,v 1.6 2007/10/13 12:02:14 adam Exp $
---- src/corelib/global/qglobal.h.orig 2007-05-25 15:24:09.000000000 +0200
+--- src/corelib/global/qglobal.h.orig 2007-10-01 15:06:02.000000000 +0200
+++ src/corelib/global/qglobal.h
-@@ -59,6 +59,7 @@
+@@ -74,6 +74,7 @@
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
@@ -10,7 +10,7 @@
IRIX - SGI Irix
OSF - HP Tru64 UNIX
SCO - SCO OpenServer 5
-@@ -116,6 +117,9 @@
+@@ -131,6 +132,9 @@
#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
-@@ -158,8 +162,6 @@
+@@ -173,8 +177,6 @@
#endif
#if defined(Q_OS_DARWIN)
@@ -29,7 +29,7 @@
# if defined(Q_OS_DARWIN64)
# define Q_OS_MAC64
# elif defined(Q_OS_DARWIN32)
-@@ -569,8 +571,6 @@
+@@ -584,8 +586,6 @@
# 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 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-ae
--- a/x11/qt4-libs/patches/patch-ae Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ae Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-ae,v 1.4 2007/10/13 12:02:14 adam Exp $
---- qmake/generators/unix/unixmake.cpp.orig 2007-05-25 15:24:38.000000000 +0200
+--- qmake/generators/unix/unixmake.cpp.orig 2007-10-01 15:06:33.000000000 +0200
+++ qmake/generators/unix/unixmake.cpp
-@@ -295,27 +295,29 @@ UnixMakefileGenerator::init()
+@@ -310,27 +310,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";
}
-@@ -643,7 +645,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -658,7 +660,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;
-@@ -681,10 +682,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -696,10 +697,14 @@ UnixMakefileGenerator::defaultInstall(co
QString src_targ = target;
if(src_targ == "$(TARGET)")
src_targ = "$(TARGETL)";
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-af
--- a/x11/qt4-libs/patches/patch-af Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-af Sat Oct 13 12:02:14 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-af,v 1.4 2007/10/13 12:02:14 adam Exp $
---- qmake/Makefile.unix.orig 2007-05-25 15:24:08.000000000 +0200
+--- qmake/Makefile.unix.orig 2007-10-01 15:06:01.000000000 +0200
+++ qmake/Makefile.unix
@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
QTOBJS = @QMAKE_QTOBJS@
@@ -11,16 +11,16 @@
#qmake code
OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \
-@@ -79,7 +79,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+@@ -80,7 +80,7 @@ DEPEND_SRC=project.cpp property.cpp meta
$(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
- $(QTSRCS) $(COMMERCIAL_DEPEND_SRC)
+ $(QTSRCS)
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I$(SOURCE_PATH)/src/corelib/arch/generic -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \
-I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
-@@ -87,7 +87,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -88,7 +88,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
-DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-ag
--- a/x11/qt4-libs/patches/patch-ag Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ag Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-ag,v 1.6 2007/10/13 12:02:14 adam Exp $
---- qmake/project.cpp.orig 2007-05-25 15:24:07.000000000 +0200
+--- qmake/project.cpp.orig 2007-10-01 15:06:01.000000000 +0200
+++ qmake/project.cpp
-@@ -1586,6 +1586,9 @@ QMakeProject::isActiveConfig(const QStri
+@@ -1601,6 +1601,9 @@ QMakeProject::isActiveConfig(const QStri
else if(x == "false")
return false;
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-aj
--- a/x11/qt4-libs/patches/patch-aj Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-aj Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-aj,v 1.3 2007/10/13 12:02:14 adam Exp $
---- mkspecs/netbsd-g++/qplatformdefs.h.orig 2006-11-27 17:26:42.000000000 +0000
+--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2007-10-01 15:05:54.000000000 +0200
+++ mkspecs/netbsd-g++/qplatformdefs.h
-@@ -47,6 +47,7 @@
+@@ -62,6 +62,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>
-@@ -107,10 +108,14 @@
+@@ -123,10 +124,14 @@
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-ak
--- a/x11/qt4-libs/patches/patch-ak Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ak Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ak,v 1.2 2007/10/13 12:02:14 adam Exp $
---- ./src/gui/kernel/qcursor_x11.cpp.orig 2006-11-27 17:26:13.000000000 +0000
-+++ ./src/gui/kernel/qcursor_x11.cpp
-@@ -239,7 +239,7 @@ void QCursorData::update()
+--- src/gui/kernel/qcursor_x11.cpp.orig 2007-10-01 15:06:12.000000000 +0200
++++ src/gui/kernel/qcursor_x11.cpp
+@@ -254,7 +254,7 @@ void QCursorData::update()
return;
}
diff -r 3ec00ee6e2b8 -r e378be6fbd75 x11/qt4-libs/patches/patch-al
--- a/x11/qt4-libs/patches/patch-al Sat Oct 13 11:57:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-al Sat Oct 13 12:02:14 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2007/07/28 07:37:52 adam Exp $
+$NetBSD: patch-al,v 1.3 2007/10/13 12:02:15 adam Exp $
---- src/corelib/io/qsettings.cpp.orig 2007-05-25 15:24:10.000000000 +0200
+--- src/corelib/io/qsettings.cpp.orig 2007-10-01 15:06:03.000000000 +0200
+++ src/corelib/io/qsettings.cpp
-@@ -105,9 +105,16 @@ inline bool qt_isEvilFsTypeName(const ch
+@@ -120,9 +120,16 @@ inline bool qt_isEvilFsTypeName(const ch
static bool isLikelyToBeNfs(int handle)
{
@@ -19,7 +19,7 @@
return qt_isEvilFsTypeName(buf.f_fstypename);
}
-@@ -135,7 +142,7 @@ static bool isLikelyToBeNfs(int handle)
+@@ -150,7 +157,7 @@ static bool isLikelyToBeNfs(int handle)
#elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
Home |
Main Index |
Thread Index |
Old Index