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.0:
details: https://anonhg.NetBSD.org/pkgsrc/rev/00381d2bb619
branches: trunk
changeset: 531312:00381d2bb619
user: adam <adam%pkgsrc.org@localhost>
date: Sat Jul 28 07:37:51 2007 +0000
description:
Changes 4.3.0:
- Configuration/Compilation
* Fixed OpenBSD and NetBSD build issues.
- Legal
* Added information about the OpenSSL exception to the GPL.
- Documentation and Examples
* Added information about the TS file format used in Linguist.
* Moved platform and compiler support information from
www.trolltech.com into the documentation.
* Added an Accessibility overview document.
* Added new example to show usage of QCompleter with custom tree models.
- Translations
- Added support for the CP949 Korean Codec.
- [138140] The whole Qt source compiles with the QT_NO_CAST_FROM_ASCII
and QT_NO_CAST_TO_ASCII defines and therefore is more robust when
using codecs.
- Added support for HP-UX 11i (Itanium) with the aCC compiler
- Changed dialogs to respond much better to the LanguageChange event.
(i.e. run time translation now works much better.)
- Signals and slots
* [61295] Added Qt::BlockingQueuedConnection connection type, which
waits for all slots to be called before continuing.
* [128646] Ignore optional keywords specified in SIGNAL() and SLOT()
signatures (struct, class, and enum).
* Optimize emitting signals that do not have anything connected to them.
- [121629] Added support for the MinGW/MSYS platform.
- [102293] Added search path functionality (QDir::addSearchPath)
- Almost all widgets are now styleable using Qt Style Sheets.
diffstat:
x11/qt4-libs/Makefile | 5 +-
x11/qt4-libs/distinfo | 25 +++++------
x11/qt4-libs/patches/patch-aa | 12 ++--
x11/qt4-libs/patches/patch-ab | 86 +++++++++++++++++++++++++++++++++------
x11/qt4-libs/patches/patch-ad | 34 ++++++---------
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 | 21 +---------
x11/qt4-libs/patches/patch-al | 71 +++++++++++++-------------------
x11/qt4-libs/patches/patch-am | 93 -------------------------------------------
x11/qt4-pgsql/Makefile | 4 +-
x11/qt4-tools/Makefile | 7 +-
x11/qt4-tools/PLIST | 34 +++++++++++++-
x11/qt4/Makefile.common | 4 +-
15 files changed, 189 insertions(+), 235 deletions(-)
diffs (truncated from 746 to 300 lines):
diff -r 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/Makefile Sat Jul 28 07:37:51 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/04/06 12:48:37 markd Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/28 07:37:51 adam Exp $
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 1
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
@@ -32,7 +31,7 @@
.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
${QTPREFIX}/lib/
- ${INSTALL_DATA} ${WRKSRC}/lib/${lib}.pc ${PREFIX}/lib/pkgconfig/
+ ${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/${lib}.pc ${PREFIX}/lib/pkgconfig/
.endfor
${INSTALL_LIB_DIR} ${QTPREFIX}/plugins
${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/accessible
diff -r 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/distinfo Sat Jul 28 07:37:51 2007 +0000
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.9 2007/04/06 12:48:42 markd Exp $
+$NetBSD: distinfo,v 1.10 2007/07/28 07:37:51 adam Exp $
-SHA1 (qt-x11-opensource-src-4.2.3.tar.gz) = b988aab4fa1dcce8532c36bb63947a556076e8c8
-RMD160 (qt-x11-opensource-src-4.2.3.tar.gz) = 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25
-Size (qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 bytes
-SHA1 (patch-aa) = 2ac5ba5b0a419f1a6fe63989b9734d042ccf1562
-SHA1 (patch-ab) = 726bc5f30d5eb54ec19f76be35422e3697fb1b8c
+SHA1 (qt-x11-opensource-src-4.3.0.tar.gz) = e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4
+RMD160 (qt-x11-opensource-src-4.3.0.tar.gz) = 2106dd8dda7a5b16305ba701e33c17e9349fddc3
+Size (qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 bytes
+SHA1 (patch-aa) = edfc05780c1be3588fd35a0261b3a1ca45274bc8
+SHA1 (patch-ab) = 1666aa0273b5f4cdecb5a5fd76343d33d1987d9f
SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = 6b835687f74358999ddc89feb46c98cc36fef47b
-SHA1 (patch-ae) = 5b0d7ede053f1a792418406547280cd3352d7c47
-SHA1 (patch-af) = d3a6680553d7cd41cb9436776ee81737e3f2eb07
-SHA1 (patch-ag) = cfdc8678689089a7894d4acfee9e6a868d384b6f
+SHA1 (patch-ad) = 3567be61b6df31a65c286a5451753d8cbed9efd3
+SHA1 (patch-ae) = 468e3ae41e738d51d253c839e55e329ad7937006
+SHA1 (patch-af) = 247f9509a34eeb53201a551c8e3558451308353e
+SHA1 (patch-ag) = df4716c73748cf19bf511c5d395a8beab9d7c70a
SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = cb57c340a125587f5e26f63274c090512079a41c
+SHA1 (patch-aj) = 7e8528c6ab1bad239142464b49ee073939a868b0
SHA1 (patch-ak) = 16eef0675a63da937637c8fc654664f1cb155d18
-SHA1 (patch-al) = c59c6830bde43208a81cb7ba52a58c134dd40eec
-SHA1 (patch-am) = 81612b64cd5c6d57125e22be79334aabf08bda4d
+SHA1 (patch-al) = a46ad5c1236d8a63900faaca62b13827b9c1c08e
diff -r 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/patches/patch-aa Sat Jul 28 07:37:51 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-aa,v 1.5 2007/07/28 07:37:51 adam Exp $
---- qmake/generators/unix/unixmake2.cpp.orig 2006-11-27 17:26:28.000000000 +0000
+--- qmake/generators/unix/unixmake2.cpp.orig 2007-05-25 15:24:38.000000000 +0200
+++ qmake/generators/unix/unixmake2.cpp
-@@ -205,6 +205,8 @@ UnixMakefileGenerator::writeMakeParts(QT
- if(!project->isEmpty("QMAKE_BUNDLE_NAME")) {
+@@ -212,6 +212,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+ if(!project->isEmpty("QMAKE_BUNDLE")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
+ } else if(project->isActiveConfig("compile_libtool")) {
@@ -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;
-@@ -946,8 +948,12 @@ void UnixMakefileGenerator::init2()
+@@ -962,8 +964,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"))
-@@ -1372,7 +1378,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1398,7 +1404,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 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ab Sat Jul 28 07:37:51 2007 +0000
@@ -1,16 +1,76 @@
-$NetBSD: patch-ab,v 1.3 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ab,v 1.4 2007/07/28 07:37:51 adam Exp $
---- src/gui/painting/painting.pri.orig 2007-02-21 10:58:43.000000000 +0100
+--- src/gui/painting/painting.pri.orig 2007-05-25 15:24:11.000000000 +0200
+++ src/gui/painting/painting.pri
-@@ -137,9 +137,9 @@ x11|embedded {
- mac {
+@@ -177,11 +177,11 @@ mac {
- } else:sse|win32-g++ {
-- sse_compiler.commands = $$QMAKE_CXX -c -msse $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -msse $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.o
- sse_compiler.dependency_type = TYPE_C
-- sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
- sse_compiler.input = SSE_SOURCES
- sse_compiler.variable_out = OBJECTS
- sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
+ win32-g++|!win32:!*-icc* {
+ mmx {
+- mmx_compiler.commands = $$QMAKE_CXX -c
++ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+ mmx_compiler.commands += -mmmx
+ 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)}
++ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ mmx_compiler.input = MMX_SOURCES
+ mmx_compiler.variable_out = OBJECTS
+ mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
+@@ -194,13 +194,13 @@ mac {
+ }
+ }
+ 3dnow {
+- 3dnow_compiler.commands = $$QMAKE_CXX -c
++ 3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+ 3dnow_compiler.commands += -m3dnow
+ mmx: 3dnow_compiler.commands += -mmmx
+ sse: 3dnow_compiler.commands += -msse
+ 3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ 3dnow_compiler.dependency_type = TYPE_C
+- 3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++ 3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ 3dnow_compiler.input = 3DNOW_SOURCES
+ 3dnow_compiler.variable_out = OBJECTS
+ 3dnow_compiler.name = compiling[3dnow] ${QMAKE_FILE_IN}
+@@ -208,11 +208,11 @@ mac {
+ QMAKE_EXTRA_COMPILERS += 3dnow_compiler
+ }
+ sse {
+- sse_compiler.commands = $$QMAKE_CXX -c
++ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+ sse_compiler.commands += -msse
+ 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)}
++ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ sse_compiler.input = SSE_SOURCES
+ sse_compiler.variable_out = OBJECTS
+ sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
+@@ -220,11 +220,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 += -msse2
+ 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)}
++ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ sse2_compiler.input = SSE2_SOURCES
+ sse2_compiler.variable_out = OBJECTS
+ sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
+@@ -232,11 +232,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 += -mcpu=iwmmxt
+ iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ iwmmxt_compiler.dependency_type = TYPE_C
+- iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ iwmmxt_compiler.input = IWMMXT_SOURCES
+ iwmmxt_compiler.variable_out = OBJECTS
+ iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}
diff -r 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ad Sat Jul 28 07:37:51 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ad,v 1.5 2007/07/28 07:37:51 adam Exp $
---- src/corelib/global/qglobal.h.orig 2006-11-27 17:26:05.000000000 +0000
+--- src/corelib/global/qglobal.h.orig 2007-05-25 15:24:09.000000000 +0200
+++ src/corelib/global/qglobal.h
-@@ -55,6 +55,7 @@
+@@ -59,6 +59,7 @@
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
@@ -10,7 +10,7 @@
IRIX - SGI Irix
OSF - HP Tru64 UNIX
SCO - SCO OpenServer 5
-@@ -107,6 +108,9 @@
+@@ -116,6 +117,9 @@
#elif defined(__NetBSD__)
# define Q_OS_NETBSD
# define Q_OS_BSD4
@@ -20,27 +20,21 @@
#elif defined(__OpenBSD__)
# define Q_OS_OPENBSD
# define Q_OS_BSD4
-@@ -146,11 +150,6 @@
- # define Q_OS_WIN
+@@ -158,8 +162,6 @@
#endif
--#if defined(Q_OS_DARWIN)
+ #if defined(Q_OS_DARWIN)
-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
-# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
--#endif
--
- #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
- # undef Q_OS_UNIX
- #elif !defined(Q_OS_UNIX)
-@@ -542,10 +541,7 @@
- # define Q_WS_PM
+ # if defined(Q_OS_DARWIN64)
+ # define Q_OS_MAC64
+ # elif defined(Q_OS_DARWIN32)
+@@ -569,8 +571,6 @@
# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
--# if defined(Q_OS_DARWIN) && !defined(__USE_WS_X11__)
+ # if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
-# define Q_WS_MAC
-# define Q_WS_MACX
--# elif !defined(Q_WS_QWS)
-+# if !defined(Q_WS_QWS)
- # define Q_WS_X11
- # endif
- #endif
+ # if defined(Q_OS_MAC64)
+ # define Q_WS_MAC64
+ # elif defined(Q_OS_MAC32)
diff -r 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/patches/patch-ae
--- a/x11/qt4-libs/patches/patch-ae Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ae Sat Jul 28 07:37:51 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-ae,v 1.3 2007/07/28 07:37:51 adam Exp $
---- qmake/generators/unix/unixmake.cpp.orig 2007-02-21 10:59:01.000000000 +0100
+--- qmake/generators/unix/unixmake.cpp.orig 2007-05-25 15:24:38.000000000 +0200
+++ qmake/generators/unix/unixmake.cpp
-@@ -280,27 +280,29 @@ UnixMakefileGenerator::init()
+@@ -295,27 +295,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";
}
-@@ -611,7 +613,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -643,7 +645,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;
-@@ -656,10 +657,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -681,10 +682,14 @@ UnixMakefileGenerator::defaultInstall(co
QString src_targ = target;
if(src_targ == "$(TARGET)")
src_targ = "$(TARGETL)";
diff -r 9a34f8349953 -r 00381d2bb619 x11/qt4-libs/patches/patch-af
--- a/x11/qt4-libs/patches/patch-af Sat Jul 28 07:26:26 2007 +0000
+++ b/x11/qt4-libs/patches/patch-af Sat Jul 28 07:37:51 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2007/03/18 17:34:41 adam Exp $
+$NetBSD: patch-af,v 1.3 2007/07/28 07:37:51 adam Exp $
---- qmake/Makefile.unix.orig 2006-11-27 17:26:04.000000000 +0000
+--- qmake/Makefile.unix.orig 2007-05-25 15:24:08.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 \
-@@ -45,7 +45,7 @@ DEPEND_SRC=project.cpp property.cpp meta
- $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/3rdparty/md5/md5.cpp \
+@@ -79,7 +79,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+ $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
Home |
Main Index |
Thread Index |
Old Index