pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Changes 4.5.3:
details: https://anonhg.NetBSD.org/pkgsrc/rev/de9584830cac
branches: trunk
changeset: 400064:de9584830cac
user: adam <adam%pkgsrc.org@localhost>
date: Sun Oct 11 09:14:52 2009 +0000
description:
Changes 4.5.3:
* This is a bug-fix release.
diffstat:
x11/qt4-docs/Makefile | 3 +--
x11/qt4-libs/Makefile | 3 +--
x11/qt4-libs/Makefile.common | 4 ++--
x11/qt4-libs/distinfo | 37 +++++++++++++++++--------------------
x11/qt4-libs/patches/patch-aa | 8 ++++----
x11/qt4-libs/patches/patch-ab | 24 ++++++++++++------------
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-an | 10 +++++-----
x11/qt4-libs/patches/patch-ap | 6 +++---
x11/qt4-libs/patches/patch-aq | 14 +++++++-------
x11/qt4-libs/patches/patch-ar | 6 +++---
x11/qt4-libs/patches/patch-as | 8 ++++----
x11/qt4-libs/patches/patch-ba | 22 ----------------------
x11/qt4-libs/patches/patch-bb | 17 -----------------
x11/qt4-libs/patches/patch-bc | 17 -----------------
x11/qt4-mysql/Makefile | 3 +--
x11/qt4-pgsql/Makefile | 3 +--
x11/qt4-qdbus/Makefile | 3 +--
x11/qt4-qdbus/PLIST | 21 +--------------------
x11/qt4-sqlite3/Makefile | 3 +--
x11/qt4-tiff/Makefile | 3 +--
x11/qt4-tools/Makefile | 4 +---
x11/qt4-tools/PLIST | 14 +-------------
x11/qt4/Makefile.common | 4 ++--
29 files changed, 94 insertions(+), 193 deletions(-)
diffs (truncated from 751 to 300 lines):
diff -r 57e2f7260344 -r de9584830cac x11/qt4-docs/Makefile
--- a/x11/qt4-docs/Makefile Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-docs/Makefile Sun Oct 11 09:14:52 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:40 sno Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/11 09:14:52 adam Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-docs-${QTVERSION}
-PKGREVISION= 1
COMMENT= Documentation for the QT C++ X GUI toolkit
NO_CONFIGURE= yes
diff -r 57e2f7260344 -r de9584830cac x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/Makefile Sun Oct 11 09:14:52 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2009/10/01 13:30:42 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2009/10/11 09:14:52 adam 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 57e2f7260344 -r de9584830cac x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/Makefile.common Sun Oct 11 09:14:52 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2009/07/22 09:41:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2009/10/11 09:14:52 adam Exp $
# used by x11/qt4-libs/Makefile
# used by x11/qt4-docs/Makefile
@@ -6,7 +6,7 @@
CATEGORIES= x11
MASTER_SITES= http://get.qtsoftware.com/qt/source/ \
ftp://ftp.qtsoftware.com/qt/source/
-EXTRACT_SUFX= .tar.bz2
+#EXTRACT_SUFX= .tar.bz2
.include "../../x11/qt4/Makefile.common"
diff -r 57e2f7260344 -r de9584830cac x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/distinfo Sun Oct 11 09:14:52 2009 +0000
@@ -1,30 +1,27 @@
-$NetBSD: distinfo,v 1.34 2009/10/01 13:30:42 drochner Exp $
+$NetBSD: distinfo,v 1.35 2009/10/11 09:14:52 adam Exp $
-SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b
-RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7
-Size (qt-x11-opensource-src-4.5.2.tar.bz2) = 116015284 bytes
-SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c
-SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43
+SHA1 (qt-x11-opensource-src-4.5.3.tar.gz) = 78620ffd03c83c4d86f5039ccf7b09e5c709ed25
+RMD160 (qt-x11-opensource-src-4.5.3.tar.gz) = 93d765ecf89ed15668a4eedc7d77c2a2e41424a2
+Size (qt-x11-opensource-src-4.5.3.tar.gz) = 125384668 bytes
+SHA1 (patch-aa) = 5d0c638f1985f4cfcc1fa6824822dc9ab9bc96eb
+SHA1 (patch-ab) = caac46e91dd061f28093384b0ab56b5fd78cad0d
SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
-SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5
-SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9
+SHA1 (patch-ad) = 98cb6c33102e9e38621b0169fb9e03e72443884b
+SHA1 (patch-ae) = 37e68cb981b79f0ebe4afe58de3a09083d536532
SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d
-SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e
+SHA1 (patch-ag) = 7f91004562f417477a10fdb54372b01812942648
SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203
-SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a
-SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
+SHA1 (patch-aj) = cea33ca34c5f46c3c12e4d00a991103aca70a1ed
+SHA1 (patch-ak) = 8a77ab0d047c017eb70b588c78ec4230d1f90755
+SHA1 (patch-al) = 2f3cef08de80d70dba6b44ad946acb56916afcf5
SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
-SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1
+SHA1 (patch-an) = 75812ead7851ba81bf56f85ab3feeea8377f64c7
SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9
-SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
-SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34
-SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
-SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
+SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
+SHA1 (patch-aq) = 3425c5599749eac7a8dd8142292808029a7419fe
+SHA1 (patch-ar) = 1cdbbadf309f5f7b29a113d4253ea6ab419f77dd
+SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed
SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
-SHA1 (patch-ba) = 2538ab3200e47e072a9c1868d5d09f966435f43d
-SHA1 (patch-bb) = 00b1c40fa1c1874cc61dcbb5f80eedcc8863dbc9
-SHA1 (patch-bc) = 6376bdd6789567725fbb183518f06c55bb57864d
diff -r 57e2f7260344 -r de9584830cac x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/patches/patch-aa Sun Oct 11 09:14:52 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2009/06/13 11:55:51 hasso Exp $
+$NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $
---- qmake/generators/unix/unixmake2.cpp.orig 2009-02-25 22:09:16.000000000 +0100
+--- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200
+++ qmake/generators/unix/unixmake2.cpp
@@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isEmpty("QMAKE_BUNDLE")) {
@@ -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;
-@@ -992,8 +994,12 @@ void UnixMakefileGenerator::init2()
+@@ -993,8 +995,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"))
-@@ -1444,7 +1450,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1445,7 +1451,7 @@ UnixMakefileGenerator::writePkgConfigFil
bundle = bundle.left(suffix);
pkgConfiglibName = "-framework " + bundle + " ";
} else {
diff -r 57e2f7260344 -r de9584830cac x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/patches/patch-ab Sun Oct 11 09:14:52 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $
+$NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $
---- src/gui/painting/painting.pri.orig 2009-02-25 22:09:22.000000000 +0100
+--- src/gui/painting/painting.pri.orig 2009-09-29 13:01:37.000000000 +0200
+++ src/gui/painting/painting.pri
-@@ -230,7 +230,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -231,7 +231,7 @@ contains(QMAKE_MAC_XARCH, no) {
win32-g++|!win32:!*-icc* {
mmx {
@@ -11,7 +11,7 @@
mac {
mmx_compiler.commands += -Xarch_i386 -mmmx
-@@ -241,7 +241,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -242,7 +242,7 @@ contains(QMAKE_MAC_XARCH, no) {
mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx_compiler.dependency_type = TYPE_C
@@ -20,7 +20,7 @@
mmx_compiler.input = MMX_SOURCES
mmx_compiler.variable_out = OBJECTS
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -249,7 +249,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -250,7 +250,7 @@ contains(QMAKE_MAC_XARCH, no) {
QMAKE_EXTRA_COMPILERS += mmx_compiler
}
3dnow {
@@ -29,7 +29,7 @@
mac {
mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
-@@ -260,14 +260,14 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -261,14 +261,14 @@ contains(QMAKE_MAC_XARCH, no) {
mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx3dnow_compiler.dependency_type = TYPE_C
@@ -46,7 +46,7 @@
mac {
sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
-@@ -278,7 +278,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -279,7 +279,7 @@ contains(QMAKE_MAC_XARCH, no) {
sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse3dnow_compiler.dependency_type = TYPE_C
@@ -55,7 +55,7 @@
sse3dnow_compiler.input = SSE3DNOW_SOURCES
sse3dnow_compiler.variable_out = OBJECTS
sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
-@@ -287,7 +287,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -288,7 +288,7 @@ contains(QMAKE_MAC_XARCH, no) {
}
}
sse {
@@ -64,7 +64,7 @@
mac {
sse_compiler.commands += -Xarch_i386 -msse
-@@ -298,7 +298,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -299,7 +299,7 @@ contains(QMAKE_MAC_XARCH, no) {
sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse_compiler.dependency_type = TYPE_C
@@ -73,7 +73,7 @@
sse_compiler.input = SSE_SOURCES
sse_compiler.variable_out = OBJECTS
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -306,7 +306,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -307,7 +307,7 @@ contains(QMAKE_MAC_XARCH, no) {
QMAKE_EXTRA_COMPILERS += sse_compiler
}
sse2 {
@@ -82,7 +82,7 @@
mac {
sse2_compiler.commands += -Xarch_i386 -msse2
-@@ -317,7 +317,7 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -318,7 +318,7 @@ contains(QMAKE_MAC_XARCH, no) {
sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse2_compiler.dependency_type = TYPE_C
@@ -91,7 +91,7 @@
sse2_compiler.input = SSE2_SOURCES
sse2_compiler.variable_out = OBJECTS
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -325,11 +325,11 @@ contains(QMAKE_MAC_XARCH, no) {
+@@ -326,11 +326,11 @@ contains(QMAKE_MAC_XARCH, no) {
QMAKE_EXTRA_COMPILERS += sse2_compiler
}
iwmmxt {
diff -r 57e2f7260344 -r de9584830cac x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/patches/patch-ad Sun Oct 11 09:14:52 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2008/10/26 14:02:33 adam Exp $
+$NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $
---- src/corelib/global/qglobal.h.orig 2008-09-27 10:58:46.000000000 +0200
+--- src/corelib/global/qglobal.h.orig 2009-09-29 13:01:37.000000000 +0200
+++ src/corelib/global/qglobal.h
-@@ -149,6 +149,7 @@ namespace QT_NAMESPACE {}
+@@ -158,6 +158,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
-@@ -210,6 +211,9 @@ namespace QT_NAMESPACE {}
+@@ -219,6 +220,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
-@@ -252,8 +256,6 @@ namespace QT_NAMESPACE {}
+@@ -261,8 +265,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)
-@@ -699,8 +701,6 @@ namespace QT_NAMESPACE {}
+@@ -756,8 +758,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 57e2f7260344 -r de9584830cac x11/qt4-libs/patches/patch-ae
--- a/x11/qt4-libs/patches/patch-ae Sun Oct 11 09:14:14 2009 +0000
+++ b/x11/qt4-libs/patches/patch-ae Sun Oct 11 09:14:52 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2008/10/26 14:02:33 adam Exp $
+$NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $
---- qmake/generators/unix/unixmake.cpp.orig 2008-09-27 10:58:43.000000000 +0200
+--- qmake/generators/unix/unixmake.cpp.orig 2009-09-29 13:01:33.000000000 +0200
+++ qmake/generators/unix/unixmake.cpp
-@@ -317,27 +317,29 @@ UnixMakefileGenerator::init()
+@@ -324,27 +324,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";
}
-@@ -665,7 +667,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -676,7 +678,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;
-@@ -703,10 +704,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -714,10 +715,14 @@ UnixMakefileGenerator::defaultInstall(co
QString src_targ = target;
Home |
Main Index |
Thread Index |
Old Index