pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Update to 4.5.1. Most of work done by Matthias Dro...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c761d07a834c
branches: trunk
changeset: 394605:c761d07a834c
user: hasso <hasso%pkgsrc.org@localhost>
date: Sat Jun 13 11:55:50 2009 +0000
description:
Update to 4.5.1. Most of work done by Matthias Drochner. Upstream changelog
is too massive, see http://doc.qtsoftware.com/4.5/qt4-5-intro.html as
starting point.
diffstat:
x11/qt4-libs/Makefile | 3 +-
x11/qt4-libs/Makefile.common | 5 +-
x11/qt4-libs/distinfo | 24 ++++++------
x11/qt4-libs/files/license-acceptance | 1 +
x11/qt4-libs/patches/patch-aa | 12 +++---
x11/qt4-libs/patches/patch-ab | 52 ++++++++++++++++++++---------
x11/qt4-libs/patches/patch-af | 8 ++--
x11/qt4-libs/patches/patch-ao | 50 ++++++++++-----------------
x11/qt4-libs/patches/patch-aq | 62 +++++++++++++++++++++++++++++++---
x11/qt4-libs/patches/patch-as | 10 ++--
x11/qt4-libs/patches/patch-at | 25 --------------
x11/qt4-libs/patches/patch-au | 42 -----------------------
x11/qt4-libs/patches/patch-av | 22 ++++++++++++
x11/qt4-libs/patches/patch-ax | 14 +++++++
x11/qt4-mysql/Makefile | 3 +-
x11/qt4-qdbus/PLIST | 10 +++++-
x11/qt4-tools/PLIST | 49 ++++++++++++++++++++++++++-
x11/qt4/Makefile.common | 4 +-
18 files changed, 238 insertions(+), 158 deletions(-)
diffs (truncated from 830 to 300 lines):
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/Makefile Sat Jun 13 11:55:50 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2009/02/11 07:46:15 markd Exp $
+# $NetBSD: Makefile,v 1.28 2009/06/13 11:55:51 hasso Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 3
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/Makefile.common Sat Jun 13 11:55:50 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2008/12/16 13:46:59 jmcneill Exp $
+# $NetBSD: Makefile.common,v 1.13 2009/06/13 11:55:51 hasso 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/
+MASTER_SITES= ftp://ftp.qtsoftware.com/qt/source/
EXTRACT_SUFX= .tar.bz2
.include "../../x11/qt4/Makefile.common"
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/distinfo Sat Jun 13 11:55:50 2009 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.28 2009/02/28 11:38:01 schwarz Exp $
+$NetBSD: distinfo,v 1.29 2009/06/13 11:55:51 hasso Exp $
-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 (qt-x11-opensource-src-4.5.1.tar.bz2) = 50ba9b6d2eb7056e47dc53775be509c4ff6ec015
+RMD160 (qt-x11-opensource-src-4.5.1.tar.bz2) = 702d7c6bb9787cd5602dcb8afce52bdfcfd52179
+Size (qt-x11-opensource-src-4.5.1.tar.bz2) = 114667436 bytes
+SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c
+SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43
SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5
SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9
-SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4
+SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d
SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e
SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
@@ -17,10 +17,10 @@
SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1
-SHA1 (patch-ao) = e74125f5230db3e1b339c76c06a54470dd0631db
+SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9
SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
-SHA1 (patch-aq) = 401bf595bfe3854e36b0260d24be95b712f9d6a2
+SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34
SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
-SHA1 (patch-as) = 244a3017e2780270b61ac50af000cd6fd1bb9cf5
-SHA1 (patch-at) = c8c818dcf45822c8510568bc738b819493f38b11
-SHA1 (patch-au) = 811c582bb0ad252b8b5ae91685109a7410dd662d
+SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
+SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
+SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/files/license-acceptance
--- a/x11/qt4-libs/files/license-acceptance Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/files/license-acceptance Sat Jun 13 11:55:50 2009 +0000
@@ -1,1 +1,2 @@
+o
yes
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/patches/patch-aa Sat Jun 13 11:55:50 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2008/10/26 14:02:33 adam Exp $
+$NetBSD: patch-aa,v 1.9 2009/06/13 11:55:51 hasso Exp $
---- qmake/generators/unix/unixmake2.cpp.orig 2008-09-27 10:58:43.000000000 +0200
+--- qmake/generators/unix/unixmake2.cpp.orig 2009-02-25 22:09:16.000000000 +0100
+++ qmake/generators/unix/unixmake2.cpp
-@@ -228,6 +228,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -232,6 +232,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;
-@@ -978,8 +980,12 @@ void UnixMakefileGenerator::init2()
+@@ -992,8 +994,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"))
-@@ -1430,7 +1436,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1444,7 +1450,7 @@ UnixMakefileGenerator::writePkgConfigFil
bundle = bundle.left(suffix);
pkgConfiglibName = "-framework " + bundle + " ";
} else {
@@ -33,4 +33,4 @@
+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
}
- t << pkgConfiglibDir << " " << pkgConfiglibName << " ";
+ t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/patches/patch-ab Sat Jun 13 11:55:50 2009 +0000
@@ -1,14 +1,18 @@
-$NetBSD: patch-ab,v 1.7 2008/10/26 14:02:33 adam Exp $
+$NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $
---- src/gui/painting/painting.pri.orig 2008-09-27 10:58:47.000000000 +0200
+--- src/gui/painting/painting.pri.orig 2009-02-25 22:09:22.000000000 +0100
+++ src/gui/painting/painting.pri
-@@ -192,11 +192,11 @@ mac {
+@@ -230,7 +230,7 @@ contains(QMAKE_MAC_XARCH, no) {
win32-g++|!win32:!*-icc* {
mmx {
-- mmx_compiler.commands = $$QMAKE_CXX -c -Winline
-+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
- mmx_compiler.commands += -mmmx
+- mmx_compiler.commands = $$QMAKE_CXX -c -Winline
++ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
+
+ mac {
+ mmx_compiler.commands += -Xarch_i386 -mmmx
+@@ -241,7 +241,7 @@ contains(QMAKE_MAC_XARCH, no) {
+
mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx_compiler.dependency_type = TYPE_C
- mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -16,13 +20,17 @@
mmx_compiler.input = MMX_SOURCES
mmx_compiler.variable_out = OBJECTS
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -204,22 +204,22 @@ mac {
+@@ -249,7 +249,7 @@ contains(QMAKE_MAC_XARCH, no) {
QMAKE_EXTRA_COMPILERS += mmx_compiler
}
3dnow {
- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
- mmx3dnow_compiler.commands += -m3dnow -mmmx
+
+ mac {
+ mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
+@@ -260,14 +260,14 @@ contains(QMAKE_MAC_XARCH, no) {
+
mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx3dnow_compiler.dependency_type = TYPE_C
- mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -32,10 +40,14 @@
mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
- sse {
+ sse {
- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
- sse3dnow_compiler.commands += -m3dnow -msse
+
+ mac {
+ sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
+@@ -278,7 +278,7 @@ contains(QMAKE_MAC_XARCH, no) {
+
sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse3dnow_compiler.dependency_type = TYPE_C
- sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -43,13 +55,17 @@
sse3dnow_compiler.input = SSE3DNOW_SOURCES
sse3dnow_compiler.variable_out = OBJECTS
sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
-@@ -228,11 +228,11 @@ mac {
- }
+@@ -287,7 +287,7 @@ contains(QMAKE_MAC_XARCH, no) {
+ }
}
sse {
- sse_compiler.commands = $$QMAKE_CXX -c -Winline
+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
- sse_compiler.commands += -msse
+
+ mac {
+ sse_compiler.commands += -Xarch_i386 -msse
+@@ -298,7 +298,7 @@ contains(QMAKE_MAC_XARCH, no) {
+
sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse_compiler.dependency_type = TYPE_C
- sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -57,13 +73,17 @@
sse_compiler.input = SSE_SOURCES
sse_compiler.variable_out = OBJECTS
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -240,11 +240,11 @@ mac {
+@@ -306,7 +306,7 @@ contains(QMAKE_MAC_XARCH, no) {
QMAKE_EXTRA_COMPILERS += sse_compiler
}
sse2 {
- sse2_compiler.commands = $$QMAKE_CXX -c -Winline
+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
- sse2_compiler.commands += -msse2
+
+ mac {
+ sse2_compiler.commands += -Xarch_i386 -msse2
+@@ -317,7 +317,7 @@ contains(QMAKE_MAC_XARCH, no) {
+
sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse2_compiler.dependency_type = TYPE_C
- sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -71,7 +91,7 @@
sse2_compiler.input = SSE2_SOURCES
sse2_compiler.variable_out = OBJECTS
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -252,11 +252,11 @@ mac {
+@@ -325,11 +325,11 @@ contains(QMAKE_MAC_XARCH, no) {
QMAKE_EXTRA_COMPILERS += sse2_compiler
}
iwmmxt {
diff -r 8533615da832 -r c761d07a834c x11/qt4-libs/patches/patch-af
--- a/x11/qt4-libs/patches/patch-af Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/patches/patch-af Sat Jun 13 11:55:50 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.5 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-af,v 1.6 2009/06/13 11:55:51 hasso Exp $
---- qmake/Makefile.unix.orig 2008-04-28 15:11:14.000000000 +0200
+--- qmake/Makefile.unix.orig 2009-02-25 22:09:16.000000000 +0100
+++ qmake/Makefile.unix
@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
QTOBJS = @QMAKE_QTOBJS@
@@ -18,9 +18,9 @@
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-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$(BUILD_PATH)/src/corelib/global \
-I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
-@@ -96,7 +96,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -97,7 +97,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 8533615da832 -r c761d07a834c x11/qt4-libs/patches/patch-ao
--- a/x11/qt4-libs/patches/patch-ao Sat Jun 13 08:15:42 2009 +0000
+++ b/x11/qt4-libs/patches/patch-ao Sat Jun 13 11:55:50 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.5 2008/10/26 14:02:33 adam Exp $
+$NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $
---- src/corelib/codecs/qiconvcodec.cpp.orig 2008-09-27 10:58:46.000000000 +0200
+--- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100
+++ src/corelib/codecs/qiconvcodec.cpp
-@@ -44,9 +44,14 @@
+@@ -50,9 +50,14 @@
#include <stdio.h>
#include <dlfcn.h>
@@ -18,7 +18,7 @@
# include <langinfo.h>
#endif
-@@ -63,6 +68,9 @@
+@@ -69,6 +74,9 @@
# else
# define UTF16 "UTF-16LE"
# endif
@@ -28,43 +28,31 @@
#else
# define UTF16 "UTF-16"
#endif
-@@ -146,7 +154,7 @@ QString QIconvCodec::convertToUnicode(co
- QByteArray ba;
- size_t outBytesLeft = len * 2 + 2;
- ba.resize(outBytesLeft);
+@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co
+ IconvState *state = *pstate;
+ size_t inBytesLeft = len;
+ // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
-#ifdef GNU_LIBICONV
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
// GNU doesn't disagree with POSIX :/
const char *inBytes = chars;
#else
-@@ -206,7 +214,7 @@ QByteArray QIconvCodec::convertFromUnico
- ba.resize(outBytesLeft);
Home |
Main Index |
Thread Index |
Old Index