update to 4.2.3

This commit is contained in:
espie 2007-03-17 17:58:16 +00:00
parent 23c3a506da
commit f744994db1
16 changed files with 81 additions and 69 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2007/03/17 11:51:58 steven Exp $
# $OpenBSD: Makefile,v 1.33 2007/03/17 17:58:16 espie Exp $
COMMENT-main= "C++ X11 GUI toolkit"
COMMENT-examples= "examples for qt4"
@ -11,27 +11,27 @@ COMMENT-sqlite= "sqlite plugin for qt4"
PKGNAME= qt4-${VERSION}
PKGNAME-mysql= qt4-mysql-${VERSION}
PKGNAME-postgresql= qt4-postgresql-${VERSION}
PKGNAME-examples= qt4-examples-${VERSION}p0
PKGNAME-examples= qt4-examples-${VERSION}
PKGNAME-sqlite2= qt4-sqlite2-${VERSION}
PKGNAME-sqlite= qt4-sqlite-${VERSION}
PKGNAME-main= qt4-${VERSION}p4
PKGNAME-main= qt4-${VERSION}
FULLPKGNAME-html= qt4-html-${VERSION}
SHARED_LIBS= Qt3Support 6.1 \
QtCore 6.1 \
SHARED_LIBS= Qt3Support 6.2 \
QtCore 6.2 \
QtDesigner 6.1 \
QtDesignerComponents 6.1 \
QtGui 6.2 \
QtNetwork 6.1 \
QtOpenGL 6.1 \
QtSql 6.1 \
QtGui 6.3 \
QtNetwork 6.2 \
QtOpenGL 6.2 \
QtSql 6.2 \
QtXml 6.1 \
QtSvg 6.1 \
QtSvg 6.2 \
QtTest 6.1 \
QtAssistantClient 2.1 \
QtDBus 0.1
VERSION= 4.2.2
VERSION= 4.2.3
DISTNAME= qt-x11-opensource-src-${VERSION}
@ -123,7 +123,7 @@ PROGRAMS+= qtdemo pixeltool
.endif
LIB_DEPENDS= glib-2.0::devel/glib2
LIB_DEPENDS= glib-2.0,gthread-2.0::devel/glib2
WANTLIB= iconv intl
commonWANTLIB= ICE Xrender c GLU SM freetype pthread Xrandr Xinerama \

View File

@ -1,5 +1,5 @@
MD5 (qt-x11-opensource-src-4.2.2.tar.gz) = 19f6374fe7924e33775cb87ee02669cb
RMD160 (qt-x11-opensource-src-4.2.2.tar.gz) = 90d5f527e5f867cd8169f99634fe9e908339fc29
SHA1 (qt-x11-opensource-src-4.2.2.tar.gz) = 8bee428d975f855ed02517763010002ca99715cc
SHA256 (qt-x11-opensource-src-4.2.2.tar.gz) = e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
SIZE (qt-x11-opensource-src-4.2.2.tar.gz) = 37636491
MD5 (qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
RMD160 (qt-x11-opensource-src-4.2.3.tar.gz) = 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25
SHA1 (qt-x11-opensource-src-4.2.3.tar.gz) = b988aab4fa1dcce8532c36bb63947a556076e8c8
SHA256 (qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
SIZE (qt-x11-opensource-src-4.2.3.tar.gz) = 37635710

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2006/10/08 21:43:50 espie Exp $
--- configure.orig Fri Sep 29 16:45:28 2006
+++ configure Sat Oct 7 13:10:23 2006
@@ -1401,7 +1401,7 @@ while [ "$#" -gt 0 ]; do
$OpenBSD: patch-configure,v 1.8 2007/03/17 17:58:17 espie Exp $
--- configure.orig Wed Feb 21 10:59:17 2007
+++ configure Sat Mar 17 10:47:27 2007
@@ -1402,7 +1402,7 @@ while [ "$#" -gt 0 ]; do
v|verbose)
if [ "$VAL" = "yes" ]; then
if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.3 2006/10/08 21:43:50 espie Exp $
--- mkspecs/openbsd-g++/qmake.conf.orig Fri Sep 29 16:45:28 2006
+++ mkspecs/openbsd-g++/qmake.conf Sat Oct 7 17:41:40 2006
$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.4 2007/03/17 17:58:17 espie Exp $
--- mkspecs/openbsd-g++/qmake.conf.orig Wed Feb 21 10:59:18 2007
+++ mkspecs/openbsd-g++/qmake.conf Sat Mar 17 10:47:27 2007
@@ -7,12 +7,13 @@ TEMPLATE = app
CONFIG += qt warn_on release link_prl
QT += core gui
@ -16,7 +16,7 @@ $OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.3 2006/10/08 21:43:50 espie E
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
@@ -35,8 +36,8 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLA
@@ -35,8 +36,8 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.3 2006/10/08 21:43:50 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Fri Sep 29 16:45:13 2006
+++ qmake/generators/unix/unixmake2.cpp Sat Oct 7 13:10:23 2006
@@ -206,10 +206,8 @@ UnixMakefileGenerator::writeMakeParts(QT
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig Wed Feb 21 10:59:01 2007
+++ qmake/generators/unix/unixmake2.cpp Sat Mar 17 10:47:27 2007
@@ -206,10 +206,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
@ -14,7 +14,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.3 2006/10/08 21:43:50 es
} else {
t << "TARGETD = " << escapeFilePath(var("TARGET_x")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
@@ -518,31 +516,22 @@ UnixMakefileGenerator::writeMakeParts(QT
@@ -518,31 +516,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << endl << endl;
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
t << "\n\t"
@ -49,7 +49,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.3 2006/10/08 21:43:50 es
if(!project->isEmpty("QMAKE_POST_LINK"))
t << "\n\t" << var("QMAKE_POST_LINK");
t << endl << endl;
@@ -857,8 +846,7 @@ UnixMakefileGenerator::writeMakeParts(QT
@@ -857,8 +846,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
if(!project->isActiveConfig("staticlib") && project->values("QMAKE_APP_FLAG").isEmpty() &&
!project->isActiveConfig("plugin") && !project->isActiveConfig("compile_libtool"))

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.4 2006/12/06 08:32:44 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig Mon Nov 27 18:26:28 2006
+++ qmake/generators/unix/unixmake.cpp Wed Dec 6 01:16:13 2006
@@ -634,7 +634,7 @@ UnixMakefileGenerator::defaultInstall(co
$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.5 2007/03/17 17:58:17 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig Wed Feb 21 10:59:01 2007
+++ qmake/generators/unix/unixmake.cpp Sat Mar 17 10:47:27 2007
@@ -634,7 +634,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
if(project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
if(!project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin")) {
if(project->isEmpty("QMAKE_HPUX_SHLIB")) {

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_corelib_io_qfsfileengine_cpp,v 1.1 2007/02/25 17:31:04 espie Exp $
--- src/corelib/io/qfsfileengine.cpp.orig Sun Feb 25 18:04:25 2007
+++ src/corelib/io/qfsfileengine.cpp Sun Feb 25 18:04:45 2007
@@ -484,7 +484,7 @@ qint64 QFSFileEngine::read(char *data, q
$OpenBSD: patch-src_corelib_io_qfsfileengine_cpp,v 1.2 2007/03/17 17:58:17 espie Exp $
--- src/corelib/io/qfsfileengine.cpp.orig Wed Feb 21 10:58:42 2007
+++ src/corelib/io/qfsfileengine.cpp Sat Mar 17 10:47:27 2007
@@ -481,7 +481,7 @@ qint64 QFSFileEngine::read(char *data, qint64 len)
int readByte = 0;
do {
readByte = fgetc(d->fh);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.3 2006/12/06 08:32:44 espie Exp $
--- src/corelib/io/qfsfileengine_unix.cpp.orig Mon Nov 27 18:26:06 2006
+++ src/corelib/io/qfsfileengine_unix.cpp Wed Dec 6 01:16:13 2006
@@ -580,13 +580,13 @@ uint QFSFileEngine::ownerId(FileOwner ow
$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
--- src/corelib/io/qfsfileengine_unix.cpp.orig Wed Feb 21 10:58:42 2007
+++ src/corelib/io/qfsfileengine_unix.cpp Sat Mar 17 10:47:27 2007
@@ -580,13 +580,13 @@ uint QFSFileEngine::ownerId(FileOwner own) const
QString QFSFileEngine::owner(FileOwner own) const
{
@ -17,7 +17,7 @@ $OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.3 2006/12/06 08:32:44
struct passwd entry;
getpwuid_r(ownerId(own), &entry, buf.data(), buf.size(), &pw);
#else
@@ -596,7 +596,7 @@ QString QFSFileEngine::owner(FileOwner o
@@ -596,7 +596,7 @@ QString QFSFileEngine::owner(FileOwner own) const
return QFile::decodeName(QByteArray(pw->pw_name));
} else if(own == OwnerGroup) {
struct group *gr = 0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_gui_kernel_qapplication_x11_cpp,v 1.7 2006/12/06 08:32:44 espie Exp $
--- src/gui/kernel/qapplication_x11.cpp.orig Mon Nov 27 18:26:13 2006
+++ src/gui/kernel/qapplication_x11.cpp Wed Dec 6 01:16:14 2006
@@ -4712,7 +4712,7 @@ static void sm_performSaveYourself(QSess
$OpenBSD: patch-src_gui_kernel_qapplication_x11_cpp,v 1.8 2007/03/17 17:58:17 espie Exp $
--- src/gui/kernel/qapplication_x11.cpp.orig Wed Feb 21 10:58:48 2007
+++ src/gui/kernel/qapplication_x11.cpp Sat Mar 17 10:47:27 2007
@@ -4715,7 +4715,7 @@ static void sm_performSaveYourself(QSessionManagerPriv
sm_setProperty(QString::fromLatin1(SmProgram), argument0);
// tell the session manager about our user as well.
struct passwd *entryPtr = 0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_plugins_sqldrivers_sqldrivers_pro,v 1.1 2006/05/15 21:09:39 espie Exp $
--- src/plugins/sqldrivers/sqldrivers.pro.orig Mon Mar 20 14:04:36 2006
+++ src/plugins/sqldrivers/sqldrivers.pro Mon May 15 19:41:11 2006
@@ -7,4 +7,5 @@ contains(sql-plugins, tds) : SUBDIRS +=
$OpenBSD: patch-src_plugins_sqldrivers_sqldrivers_pro,v 1.2 2007/03/17 17:58:17 espie Exp $
--- src/plugins/sqldrivers/sqldrivers.pro.orig Wed Feb 21 10:58:49 2007
+++ src/plugins/sqldrivers/sqldrivers.pro Sat Mar 17 10:47:27 2007
@@ -7,4 +7,5 @@ contains(sql-plugins, tds) : SUBDIRS += tds
contains(sql-plugins, oci) : SUBDIRS += oci
contains(sql-plugins, db2) : SUBDIRS += db2
contains(sql-plugins, sqlite) : SUBDIRS += sqlite

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_plugins_sqldrivers_sqlite_sqlite_pro,v 1.2 2006/10/08 21:43:50 espie Exp $
--- src/plugins/sqldrivers/sqlite/sqlite.pro.orig Mon Aug 28 15:10:00 2006
+++ src/plugins/sqldrivers/sqlite/sqlite.pro Mon Aug 28 15:11:15 2006
@@ -4,53 +4,7 @@ HEADERS = ../../../sql/drivers/sqlite/q
$OpenBSD: patch-src_plugins_sqldrivers_sqlite_sqlite_pro,v 1.3 2007/03/17 17:58:17 espie Exp $
--- src/plugins/sqldrivers/sqlite/sqlite.pro.orig Wed Feb 21 10:59:04 2007
+++ src/plugins/sqldrivers/sqlite/sqlite.pro Sat Mar 17 10:47:27 2007
@@ -4,53 +4,7 @@ HEADERS = ../../../sql/drivers/sqlite/qsql_sqlite.h
SOURCES = smain.cpp \
../../../sql/drivers/sqlite/qsql_sqlite.cpp

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_qt3support_dialogs_q3filedialog_cpp,v 1.3 2006/10/08 21:43:50 espie Exp $
--- src/qt3support/dialogs/q3filedialog.cpp.orig Fri Sep 29 16:45:04 2006
+++ src/qt3support/dialogs/q3filedialog.cpp Sat Oct 7 13:10:23 2006
@@ -3113,6 +3113,9 @@ void Q3FileDialog::setDir(const QString
$OpenBSD: patch-src_qt3support_dialogs_q3filedialog_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
--- src/qt3support/dialogs/q3filedialog.cpp.orig Wed Feb 21 10:58:50 2007
+++ src/qt3support/dialogs/q3filedialog.cpp Sat Mar 17 10:47:28 2007
@@ -3113,6 +3113,9 @@ void Q3FileDialog::setDir(const QString & pathstr)
# define _POSIX_LOGIN_NAME_MAX 9
# endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_assistant_lib_qassistantclient_cpp,v 1.3 2006/10/08 21:43:50 espie Exp $
--- tools/assistant/lib/qassistantclient.cpp.orig Fri Sep 29 16:45:05 2006
+++ tools/assistant/lib/qassistantclient.cpp Sat Oct 7 13:10:23 2006
@@ -172,11 +172,11 @@ QAssistantClient::QAssistantClient( cons
$OpenBSD: patch-tools_assistant_lib_qassistantclient_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
--- tools/assistant/lib/qassistantclient.cpp.orig Wed Feb 21 10:58:51 2007
+++ tools/assistant/lib/qassistantclient.cpp Sat Mar 17 10:47:28 2007
@@ -172,11 +172,11 @@ QAssistantClient::QAssistantClient( const QString &pat
: QObject( parent ), host ( "localhost" )
{
if ( path.isEmpty() )

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-examples,v 1.9 2007/03/17 11:51:58 steven Exp $
@conflict qt4-<4.2.1
@comment $OpenBSD: PLIST-examples,v 1.10 2007/03/17 17:58:17 espie Exp $
@conflict qt4-<=4.2.2
%%SHARED%%
bin/pixeltool
bin/qtdemo

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-html,v 1.8 2006/12/06 08:32:44 espie Exp $
@comment $OpenBSD: PLIST-html,v 1.9 2007/03/17 17:58:17 espie Exp $
share/doc/qt4/
share/doc/qt4/html/
share/doc/qt4/html/3rdparty.html
@ -57,6 +57,7 @@ share/doc/qt4/html/assistant-simpletextviewer-mainwindow-cpp.html
share/doc/qt4/html/assistant-simpletextviewer-mainwindow-h.html
share/doc/qt4/html/assistant-simpletextviewer.html
share/doc/qt4/html/assistant.dcf
share/doc/qt4/html/atomic-operations.html
share/doc/qt4/html/basic.html
share/doc/qt4/html/bughowto.html
share/doc/qt4/html/buildsystem.html
@ -366,6 +367,7 @@ share/doc/qt4/html/images/
share/doc/qt4/html/images/2dpainting-example.png
share/doc/qt4/html/images/abstract-connections.png
share/doc/qt4/html/images/affine-demo.png
share/doc/qt4/html/images/alphachannelimage.png
share/doc/qt4/html/images/alphafill.png
share/doc/qt4/html/images/analogclock-example.png
share/doc/qt4/html/images/analogclock-viewport.png
@ -453,6 +455,7 @@ share/doc/qt4/html/images/cleanlooks-lcdnumber.png
share/doc/qt4/html/images/cleanlooks-lineedit.png
share/doc/qt4/html/images/cleanlooks-listview.png
share/doc/qt4/html/images/cleanlooks-progressbar.png
share/doc/qt4/html/images/cleanlooks-pushbutton-menu.png
share/doc/qt4/html/images/cleanlooks-pushbutton.png
share/doc/qt4/html/images/cleanlooks-radiobutton.png
share/doc/qt4/html/images/cleanlooks-slider.png
@ -609,6 +612,7 @@ share/doc/qt4/html/images/graphicsview-rectitem.png
share/doc/qt4/html/images/graphicsview-shapes.png
share/doc/qt4/html/images/graphicsview-text.png
share/doc/qt4/html/images/graphicsview-view.png
share/doc/qt4/html/images/graphicsview-zorder.png
share/doc/qt4/html/images/gridlayout.png
share/doc/qt4/html/images/groupbox-example.png
share/doc/qt4/html/images/hellogl-example.png
@ -710,10 +714,10 @@ share/doc/qt4/html/images/macintosh-timeedit.png
share/doc/qt4/html/images/macintosh-toolbox.png
share/doc/qt4/html/images/macintosh-toolbutton.png
share/doc/qt4/html/images/macintosh-treeview.png
share/doc/qt4/html/images/mainwindow-contextmenu.png
share/doc/qt4/html/images/mainwindow-demo.png
share/doc/qt4/html/images/mainwindow-docks-example.png
share/doc/qt4/html/images/mainwindow-docks.png
share/doc/qt4/html/images/mainwindowlayout.png
share/doc/qt4/html/images/mandelbrot.png
share/doc/qt4/html/images/mandelbrot_scroll1.png
share/doc/qt4/html/images/mandelbrot_scroll2.png
@ -810,6 +814,7 @@ share/doc/qt4/html/images/plastique-printdialog-properties.png
share/doc/qt4/html/images/plastique-printdialog.png
share/doc/qt4/html/images/plastique-progressbar.png
share/doc/qt4/html/images/plastique-progressdialog.png
share/doc/qt4/html/images/plastique-pushbutton-menu.png
share/doc/qt4/html/images/plastique-pushbutton.png
share/doc/qt4/html/images/plastique-radiobutton.png
share/doc/qt4/html/images/plastique-sizegrip.png
@ -1073,6 +1078,7 @@ share/doc/qt4/html/images/svg-image.png
share/doc/qt4/html/images/svgviewer-example.png
share/doc/qt4/html/images/syntaxhighlighter-example.png
share/doc/qt4/html/images/system-tray.png
share/doc/qt4/html/images/systemtray-editor.png
share/doc/qt4/html/images/systemtray-example.png
share/doc/qt4/html/images/t1.png
share/doc/qt4/html/images/t10.png
@ -2301,8 +2307,12 @@ share/doc/qt4/html/qgraphicsscene-members.html
share/doc/qt4/html/qgraphicsscene.html
share/doc/qt4/html/qgraphicsscenecontextmenuevent-members.html
share/doc/qt4/html/qgraphicsscenecontextmenuevent.html
share/doc/qt4/html/qgraphicsscenedragdropevent-members.html
share/doc/qt4/html/qgraphicsscenedragdropevent.html
share/doc/qt4/html/qgraphicssceneevent-members.html
share/doc/qt4/html/qgraphicssceneevent.html
share/doc/qt4/html/qgraphicsscenehelpevent-members.html
share/doc/qt4/html/qgraphicsscenehelpevent.html
share/doc/qt4/html/qgraphicsscenehoverevent-members.html
share/doc/qt4/html/qgraphicsscenehoverevent.html
share/doc/qt4/html/qgraphicsscenemouseevent-members.html
@ -3317,6 +3327,7 @@ share/doc/qt4/html/qxmlsimplereader-members.html
share/doc/qt4/html/qxmlsimplereader.html
share/doc/qt4/html/rcc.html
share/doc/qt4/html/resources.html
share/doc/qt4/html/richtext-advanced-processing.html
share/doc/qt4/html/richtext-calendar-main-cpp.html
share/doc/qt4/html/richtext-calendar-mainwindow-cpp.html
share/doc/qt4/html/richtext-calendar-mainwindow-h.html

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2007/03/17 11:51:58 steven Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2007/03/17 17:58:17 espie Exp $
@pkgpath x11/qt4
%%SHARED%%
bin/assistant4
@ -2202,6 +2202,7 @@ lib/qt4/translations/qt_fr.qm
lib/qt4/translations/qt_iw.qm
lib/qt4/translations/qt_ru.qm
lib/qt4/translations/qt_sk.qm
lib/qt4/translations/qt_sv.qm
lib/qt4/translations/qt_zh_CN.qm
share/doc/qt4/OPENSOURCE-NOTICE.TXT
share/doc/qt4/README