diff options
| author | des <des@FreeBSD.org> | 2001-03-14 09:29:17 +0800 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2001-03-14 09:29:17 +0800 |
| commit | 8b8b81221bb048a53b7afc90132e0d2cc1cae3c9 (patch) | |
| tree | 153b259b68dd95b411cd5341d6914e285953072c /x11-toolkits | |
| parent | 72917d8b76a291e390c6d14b69fa96c7c28bce3c (diff) | |
| download | freebsd-ports-graphics-8b8b81221bb048a53b7afc90132e0d2cc1cae3c9.tar.gz freebsd-ports-graphics-8b8b81221bb048a53b7afc90132e0d2cc1cae3c9.tar.zst freebsd-ports-graphics-8b8b81221bb048a53b7afc90132e0d2cc1cae3c9.zip | |
Ladies and gentlemen, I give you QT 2.3.0!
Diffstat (limited to 'x11-toolkits')
55 files changed, 210 insertions, 765 deletions
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 7d1e5e4ea96..66cd3c4c58b 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= qt -PORTVERSION?= 2.2.4 +PORTVERSION?= 2.3.0 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ DISTNAME= qt-x11-${PORTVERSION} diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo index 88b10c614ba..e539763ce44 100644 --- a/x11-toolkits/qt23/distinfo +++ b/x11-toolkits/qt23/distinfo @@ -1 +1 @@ -MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d +MD5 (qt-x11-2.3.0.tar.gz) = f4993d952b9380a5009735aa1b7b9c03 diff --git a/x11-toolkits/qt23/files/manpages b/x11-toolkits/qt23/files/manpages index bb488b74226..59e93d35ef6 100644 --- a/x11-toolkits/qt23/files/manpages +++ b/x11-toolkits/qt23/files/manpages @@ -148,6 +148,7 @@ qintcache.3qt \ qintcacheiterator.3qt \ qintdict.3qt \ qintdictiterator.3qt \ +qinterlacestyle.3qt \ qintvalidator.3qt \ qiodevice.3qt \ qiodevicesource.3qt \ @@ -223,6 +224,7 @@ qrect.3qt \ qregexp.3qt \ qregion.3qt \ qresizeevent.3qt \ +qscreencursor.3qt \ qscrollbar.3qt \ qscrollview.3qt \ qsemaphore.3qt \ @@ -286,10 +288,10 @@ qtoolbutton.3qt \ qtooltip.3qt \ qtooltipgroup.3qt \ qtranslator.3qt \ +qtranslatormessage.3qt \ qtsciicodec.3qt \ quridrag.3qt \ qurl.3qt \ -qtranslatormessage.3qt \ qurloperator.3qt \ qvalidator.3qt \ qvaluelist.3qt \ @@ -302,9 +304,9 @@ qvboxlayout.3qt \ qvbuttongroup.3qt \ qvector.3qt \ qvgroupbox.3qt \ +qwaitcondition.3qt \ qwhatsthis.3qt \ qwheelevent.3qt \ -qwaitcondition.3qt \ qwidget.3qt \ qwidgetitem.3qt \ qwidgetstack.3qt \ @@ -312,6 +314,10 @@ qwindowsstyle.3qt \ qwizard.3qt \ qwmatrix.3qt \ qworkspace.3qt \ +qwsdecoration.3qt \ +qwskeyboardhandler.3qt \ +qwsmousehandler.3qt \ +qwsserver.3qt \ qxmlattributes.3qt \ qxmlcontenthandler.3qt \ qxmldeclhandler.3qt \ @@ -328,4 +334,4 @@ qxmlreader.3qt \ qxmlsimplereader.3qt \ qxtapplication.3qt \ qxtwidget.3qt \ -qscreencursor.3qt + diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa index 67443ca0c1d..69509938645 100644 --- a/x11-toolkits/qt23/files/patch-aa +++ b/x11-toolkits/qt23/files/patch-aa @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt23/files/patch-af b/x11-toolkits/qt23/files/patch-af index 0e02a1aefef..552e44010c1 100644 --- a/x11-toolkits/qt23/files/patch-af +++ b/x11-toolkits/qt23/files/patch-af @@ -1,6 +1,6 @@ --- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 +++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,14 +18,14 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -76,8 +76,8 @@ +@@ -77,8 +77,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) # Compiling library source diff --git a/x11-toolkits/qt23/files/patch-al b/x11-toolkits/qt23/files/patch-al deleted file mode 100644 index 3be06c07aa4..00000000000 --- a/x11-toolkits/qt23/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/kernel/qfont.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.cpp.new Sat Feb 3 16:15:05 2001 -@@ -202,6 +202,8 @@ - <li> \c QFont::CP1251, Microsoft Cyrillic encoding - <li> \c QFont::PT154, Paratype Asian Cyrillic encoding - <li> \c QFont::AnyCharSet - whatever is handiest. -+ <li> \c QFont::CP_1251, Microsoft Cyrillic encoding -+ <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding - <li> \c QFont::Set_Ja, Japanese - <li> \c QFont::Set_Ko, Korean - <li> \c QFont::Set_Th_TH -@@ -1023,6 +1025,12 @@ - case QFont::KOI8U: - result = "koi8-u"; - break; -+ case QFont::CP_1251: -+ result = "cp1251"; -+ break; -+ case QFont::PT_154: -+ result = "pt154"; -+ break; - case QFont::Set_Ja: - result = "Set_Ja"; - break; diff --git a/x11-toolkits/qt23/files/patch-am b/x11-toolkits/qt23/files/patch-am deleted file mode 100644 index 0df46e135e4..00000000000 --- a/x11-toolkits/qt23/files/patch-am +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kernel/qfont.h Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.h.new Sat Feb 3 16:06:47 2001 -@@ -70,6 +70,9 @@ - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, -+ KOI8U, -+ CP_1251, -+ PT_154, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, -@@ -87,7 +90,6 @@ - Set_Big5, - - TSCII, -- KOI8U, - CP1251, - PT154, - /* The following are font-specific encodings that diff --git a/x11-toolkits/qt23/files/patch-an b/x11-toolkits/qt23/files/patch-an deleted file mode 100644 index b3a5f30703b..00000000000 --- a/x11-toolkits/qt23/files/patch-an +++ /dev/null @@ -1,44 +0,0 @@ ---- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 -@@ -324,6 +324,9 @@ - { "ISO 8859-14", QFont::ISO_8859_14 }, - { "ISO 8859-15", QFont::ISO_8859_15 }, - { "KOI8-R", QFont::KOI8R }, -+ { "KOI8-U", QFont::KOI8U }, -+ { "CP 1251", QFont::CP_1251 }, -+ { "PT 154", QFont::PT_154 }, - { "eucJP", QFont::Set_Ja }, - { "SJIS", QFont::Set_Ja }, - { "JIS7", QFont::Set_Ja }, -@@ -522,6 +525,12 @@ - } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && - strcmp( tokens[CharsetEncoding], "u" ) == 0) { - fd->charSet = QFont::KOI8U; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) { -+ fd->charSet = QFont::CP_1251; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) { -+ fd->charSet = QFont::PT_154; - } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && - qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { - fd->charSet = QFont::TSCII; -@@ -1435,6 +1444,18 @@ - score |= CharSetScore; - else - exactMatch = FALSE; -+ } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; -+ } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; - } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && - charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { - int i = 0; diff --git a/x11-toolkits/qt23/files/patch-ao b/x11-toolkits/qt23/files/patch-ao deleted file mode 100644 index f26c1d1e80d..00000000000 --- a/x11-toolkits/qt23/files/patch-ao +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qfontdatabase.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfontdatabase.cpp.new Sat Feb 3 16:30:20 2001 -@@ -1343,6 +1343,14 @@ - return QFont::KOI8R; - if ( name == "koi8-u" ) - return QFont::KOI8U; -+ if ( name == "microsoft-cp1251" ) -+ return QFont::CP_1251; -+ if ( name == "windows-1251" ) -+ return QFont::CP_1251; -+ if ( name == "paratype-cp154" ) -+ return QFont::PT_154; -+ if ( name == "paratype-154" ) -+ return QFont::PT_154; - if ( name == "tis620-0" ) - return QFont::TIS620; - if ( name == "tscii-0" ) -@@ -1598,13 +1606,13 @@ - sample += QChar(0x0436); - sample += QChar(0x2560); - break; -- case QFont::CP1251: -+ case QFont::CP_1251: - sample += QChar(0x0414); - sample += QChar(0x0490); - sample += QChar(0x040E); - sample += QChar(0x20AC); - break; -- case QFont::PT154: -+ case QFont::PT_154: - sample += QChar(0x0496); - sample += QChar(0x04E8); - sample += QChar(0x04D8); diff --git a/x11-toolkits/qt23/files/patch-ap b/x11-toolkits/qt23/files/patch-ap deleted file mode 100644 index 593ac76bdbb..00000000000 --- a/x11-toolkits/qt23/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp ---- src/kernel/qpsprinter.cpp Wed Oct 4 13:48:49 2000 -+++ src/kernel/qpsprinter.cpp Mon Oct 9 11:53:48 2000 -@@ -1734,2 +1734,4 @@ - { QFont::KOI8R, 2084 }, -+ { QFont::KOI8U, 2088 }, -+ { QFont::CP_1251, 2251 }, - { QFont::ISO_8859_1, 4 }, -@@ -1747,2 +1749,3 @@ - { QFont::ISO_8859_15, 111 }, -+ { QFont::PT_154, 0 }, - // makeFixedStrings() below assumes that this is last diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist index 9543422204e..d5546993e41 100644 --- a/x11-toolkits/qt23/pkg-plist +++ b/x11-toolkits/qt23/pkg-plist @@ -112,6 +112,7 @@ include/qt2/qinputdialog.h include/qt2/qintcach.h include/qt2/qintcache.h include/qt2/qintdict.h +include/qt2/qinterlacestyle.h include/qt2/qiodev.h include/qt2/qiodevice.h include/qt2/qjiscodec.h @@ -322,6 +323,7 @@ share/doc/qt2/html/casestudy-qws.html share/doc/qt2/html/changes21.html share/doc/qt2/html/changes211.html share/doc/qt2/html/changes22.html +share/doc/qt2/html/changes23.html share/doc/qt2/html/charinput-qws.html share/doc/qt2/html/checklists-main-cpp.html share/doc/qt2/html/classes.html @@ -581,6 +583,7 @@ share/doc/qt2/html/qconststring-members.html share/doc/qt2/html/qconststring.html share/doc/qt2/html/qcopchannel-members.html share/doc/qt2/html/qcopchannel.html +share/doc/qt2/html/qcopchannel_qws-h.html share/doc/qt2/html/qcstring-h.html share/doc/qt2/html/qcstring-members.html share/doc/qt2/html/qcstring.html @@ -853,6 +856,9 @@ share/doc/qt2/html/qintdict-members.html share/doc/qt2/html/qintdict.html share/doc/qt2/html/qintdictiterator-members.html share/doc/qt2/html/qintdictiterator.html +share/doc/qt2/html/qinterlacestyle-h.html +share/doc/qt2/html/qinterlacestyle-members.html +share/doc/qt2/html/qinterlacestyle.html share/doc/qt2/html/qintvalidator-members.html share/doc/qt2/html/qintvalidator.html share/doc/qt2/html/qiodevice-h.html @@ -866,6 +872,7 @@ share/doc/qt2/html/qjiscodec.html share/doc/qt2/html/qjpunicode-h.html share/doc/qt2/html/qjpunicodeconv-members.html share/doc/qt2/html/qjpunicodeconv.html +share/doc/qt2/html/qkeyboard_qws-h.html share/doc/qt2/html/qkeyevent-members.html share/doc/qt2/html/qkeyevent.html share/doc/qt2/html/qlabel-h.html @@ -1370,6 +1377,7 @@ share/doc/qt2/html/qwindowdefs-h.html share/doc/qt2/html/qwindowsstyle-h.html share/doc/qt2/html/qwindowsstyle-members.html share/doc/qt2/html/qwindowsstyle.html +share/doc/qt2/html/qwindowsystem_qws-h.html share/doc/qt2/html/qwizard-h.html share/doc/qt2/html/qwizard-members.html share/doc/qt2/html/qwizard.html @@ -1379,8 +1387,16 @@ share/doc/qt2/html/qwmatrix.html share/doc/qt2/html/qworkspace-h.html share/doc/qt2/html/qworkspace-members.html share/doc/qt2/html/qworkspace.html -share/doc/qt2/html/qwsdisplay_qws-h.html -share/doc/qt2/html/qwsmanager_qws-h.html +share/doc/qt2/html/qwsdecoration-members.html +share/doc/qt2/html/qwsdecoration.html +share/doc/qt2/html/qwsdecoration_qws-h.html +share/doc/qt2/html/qwskeyboardhandler-members.html +share/doc/qt2/html/qwskeyboardhandler.html +share/doc/qt2/html/qwsmouse_qws-h.html +share/doc/qt2/html/qwsmousehandler-members.html +share/doc/qt2/html/qwsmousehandler.html +share/doc/qt2/html/qwsserver-members.html +share/doc/qt2/html/qwsserver.html share/doc/qt2/html/qxml-h.html share/doc/qt2/html/qxmlattributes-members.html share/doc/qt2/html/qxmlattributes.html @@ -1552,6 +1568,6 @@ share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html share/doc/qt2/html/xml.html share/doc/qt2/html/xt.html share/doc/qt2/html/y2k.html -@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true -@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true +@dirrm share/doc/qt2/html +@dirrm share/doc/qt2 @dirrm include/qt2 diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile index 7d1e5e4ea96..66cd3c4c58b 100644 --- a/x11-toolkits/qt30/Makefile +++ b/x11-toolkits/qt30/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= qt -PORTVERSION?= 2.2.4 +PORTVERSION?= 2.3.0 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ DISTNAME= qt-x11-${PORTVERSION} diff --git a/x11-toolkits/qt30/distinfo b/x11-toolkits/qt30/distinfo index 88b10c614ba..e539763ce44 100644 --- a/x11-toolkits/qt30/distinfo +++ b/x11-toolkits/qt30/distinfo @@ -1 +1 @@ -MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d +MD5 (qt-x11-2.3.0.tar.gz) = f4993d952b9380a5009735aa1b7b9c03 diff --git a/x11-toolkits/qt30/files/manpages b/x11-toolkits/qt30/files/manpages index bb488b74226..59e93d35ef6 100644 --- a/x11-toolkits/qt30/files/manpages +++ b/x11-toolkits/qt30/files/manpages @@ -148,6 +148,7 @@ qintcache.3qt \ qintcacheiterator.3qt \ qintdict.3qt \ qintdictiterator.3qt \ +qinterlacestyle.3qt \ qintvalidator.3qt \ qiodevice.3qt \ qiodevicesource.3qt \ @@ -223,6 +224,7 @@ qrect.3qt \ qregexp.3qt \ qregion.3qt \ qresizeevent.3qt \ +qscreencursor.3qt \ qscrollbar.3qt \ qscrollview.3qt \ qsemaphore.3qt \ @@ -286,10 +288,10 @@ qtoolbutton.3qt \ qtooltip.3qt \ qtooltipgroup.3qt \ qtranslator.3qt \ +qtranslatormessage.3qt \ qtsciicodec.3qt \ quridrag.3qt \ qurl.3qt \ -qtranslatormessage.3qt \ qurloperator.3qt \ qvalidator.3qt \ qvaluelist.3qt \ @@ -302,9 +304,9 @@ qvboxlayout.3qt \ qvbuttongroup.3qt \ qvector.3qt \ qvgroupbox.3qt \ +qwaitcondition.3qt \ qwhatsthis.3qt \ qwheelevent.3qt \ -qwaitcondition.3qt \ qwidget.3qt \ qwidgetitem.3qt \ qwidgetstack.3qt \ @@ -312,6 +314,10 @@ qwindowsstyle.3qt \ qwizard.3qt \ qwmatrix.3qt \ qworkspace.3qt \ +qwsdecoration.3qt \ +qwskeyboardhandler.3qt \ +qwsmousehandler.3qt \ +qwsserver.3qt \ qxmlattributes.3qt \ qxmlcontenthandler.3qt \ qxmldeclhandler.3qt \ @@ -328,4 +334,4 @@ qxmlreader.3qt \ qxmlsimplereader.3qt \ qxtapplication.3qt \ qxtwidget.3qt \ -qscreencursor.3qt + diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa index 67443ca0c1d..69509938645 100644 --- a/x11-toolkits/qt30/files/patch-aa +++ b/x11-toolkits/qt30/files/patch-aa @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt30/files/patch-af b/x11-toolkits/qt30/files/patch-af index 0e02a1aefef..552e44010c1 100644 --- a/x11-toolkits/qt30/files/patch-af +++ b/x11-toolkits/qt30/files/patch-af @@ -1,6 +1,6 @@ --- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 +++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,14 +18,14 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -76,8 +76,8 @@ +@@ -77,8 +77,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) # Compiling library source diff --git a/x11-toolkits/qt30/files/patch-al b/x11-toolkits/qt30/files/patch-al deleted file mode 100644 index 3be06c07aa4..00000000000 --- a/x11-toolkits/qt30/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/kernel/qfont.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.cpp.new Sat Feb 3 16:15:05 2001 -@@ -202,6 +202,8 @@ - <li> \c QFont::CP1251, Microsoft Cyrillic encoding - <li> \c QFont::PT154, Paratype Asian Cyrillic encoding - <li> \c QFont::AnyCharSet - whatever is handiest. -+ <li> \c QFont::CP_1251, Microsoft Cyrillic encoding -+ <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding - <li> \c QFont::Set_Ja, Japanese - <li> \c QFont::Set_Ko, Korean - <li> \c QFont::Set_Th_TH -@@ -1023,6 +1025,12 @@ - case QFont::KOI8U: - result = "koi8-u"; - break; -+ case QFont::CP_1251: -+ result = "cp1251"; -+ break; -+ case QFont::PT_154: -+ result = "pt154"; -+ break; - case QFont::Set_Ja: - result = "Set_Ja"; - break; diff --git a/x11-toolkits/qt30/files/patch-am b/x11-toolkits/qt30/files/patch-am deleted file mode 100644 index 0df46e135e4..00000000000 --- a/x11-toolkits/qt30/files/patch-am +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kernel/qfont.h Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.h.new Sat Feb 3 16:06:47 2001 -@@ -70,6 +70,9 @@ - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, -+ KOI8U, -+ CP_1251, -+ PT_154, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, -@@ -87,7 +90,6 @@ - Set_Big5, - - TSCII, -- KOI8U, - CP1251, - PT154, - /* The following are font-specific encodings that diff --git a/x11-toolkits/qt30/files/patch-an b/x11-toolkits/qt30/files/patch-an deleted file mode 100644 index b3a5f30703b..00000000000 --- a/x11-toolkits/qt30/files/patch-an +++ /dev/null @@ -1,44 +0,0 @@ ---- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 -@@ -324,6 +324,9 @@ - { "ISO 8859-14", QFont::ISO_8859_14 }, - { "ISO 8859-15", QFont::ISO_8859_15 }, - { "KOI8-R", QFont::KOI8R }, -+ { "KOI8-U", QFont::KOI8U }, -+ { "CP 1251", QFont::CP_1251 }, -+ { "PT 154", QFont::PT_154 }, - { "eucJP", QFont::Set_Ja }, - { "SJIS", QFont::Set_Ja }, - { "JIS7", QFont::Set_Ja }, -@@ -522,6 +525,12 @@ - } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && - strcmp( tokens[CharsetEncoding], "u" ) == 0) { - fd->charSet = QFont::KOI8U; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) { -+ fd->charSet = QFont::CP_1251; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) { -+ fd->charSet = QFont::PT_154; - } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && - qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { - fd->charSet = QFont::TSCII; -@@ -1435,6 +1444,18 @@ - score |= CharSetScore; - else - exactMatch = FALSE; -+ } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; -+ } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; - } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && - charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { - int i = 0; diff --git a/x11-toolkits/qt30/files/patch-ao b/x11-toolkits/qt30/files/patch-ao deleted file mode 100644 index f26c1d1e80d..00000000000 --- a/x11-toolkits/qt30/files/patch-ao +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qfontdatabase.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfontdatabase.cpp.new Sat Feb 3 16:30:20 2001 -@@ -1343,6 +1343,14 @@ - return QFont::KOI8R; - if ( name == "koi8-u" ) - return QFont::KOI8U; -+ if ( name == "microsoft-cp1251" ) -+ return QFont::CP_1251; -+ if ( name == "windows-1251" ) -+ return QFont::CP_1251; -+ if ( name == "paratype-cp154" ) -+ return QFont::PT_154; -+ if ( name == "paratype-154" ) -+ return QFont::PT_154; - if ( name == "tis620-0" ) - return QFont::TIS620; - if ( name == "tscii-0" ) -@@ -1598,13 +1606,13 @@ - sample += QChar(0x0436); - sample += QChar(0x2560); - break; -- case QFont::CP1251: -+ case QFont::CP_1251: - sample += QChar(0x0414); - sample += QChar(0x0490); - sample += QChar(0x040E); - sample += QChar(0x20AC); - break; -- case QFont::PT154: -+ case QFont::PT_154: - sample += QChar(0x0496); - sample += QChar(0x04E8); - sample += QChar(0x04D8); diff --git a/x11-toolkits/qt30/files/patch-ap b/x11-toolkits/qt30/files/patch-ap deleted file mode 100644 index 593ac76bdbb..00000000000 --- a/x11-toolkits/qt30/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp ---- src/kernel/qpsprinter.cpp Wed Oct 4 13:48:49 2000 -+++ src/kernel/qpsprinter.cpp Mon Oct 9 11:53:48 2000 -@@ -1734,2 +1734,4 @@ - { QFont::KOI8R, 2084 }, -+ { QFont::KOI8U, 2088 }, -+ { QFont::CP_1251, 2251 }, - { QFont::ISO_8859_1, 4 }, -@@ -1747,2 +1749,3 @@ - { QFont::ISO_8859_15, 111 }, -+ { QFont::PT_154, 0 }, - // makeFixedStrings() below assumes that this is last diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist index 9543422204e..d5546993e41 100644 --- a/x11-toolkits/qt30/pkg-plist +++ b/x11-toolkits/qt30/pkg-plist @@ -112,6 +112,7 @@ include/qt2/qinputdialog.h include/qt2/qintcach.h include/qt2/qintcache.h include/qt2/qintdict.h +include/qt2/qinterlacestyle.h include/qt2/qiodev.h include/qt2/qiodevice.h include/qt2/qjiscodec.h @@ -322,6 +323,7 @@ share/doc/qt2/html/casestudy-qws.html share/doc/qt2/html/changes21.html share/doc/qt2/html/changes211.html share/doc/qt2/html/changes22.html +share/doc/qt2/html/changes23.html share/doc/qt2/html/charinput-qws.html share/doc/qt2/html/checklists-main-cpp.html share/doc/qt2/html/classes.html @@ -581,6 +583,7 @@ share/doc/qt2/html/qconststring-members.html share/doc/qt2/html/qconststring.html share/doc/qt2/html/qcopchannel-members.html share/doc/qt2/html/qcopchannel.html +share/doc/qt2/html/qcopchannel_qws-h.html share/doc/qt2/html/qcstring-h.html share/doc/qt2/html/qcstring-members.html share/doc/qt2/html/qcstring.html @@ -853,6 +856,9 @@ share/doc/qt2/html/qintdict-members.html share/doc/qt2/html/qintdict.html share/doc/qt2/html/qintdictiterator-members.html share/doc/qt2/html/qintdictiterator.html +share/doc/qt2/html/qinterlacestyle-h.html +share/doc/qt2/html/qinterlacestyle-members.html +share/doc/qt2/html/qinterlacestyle.html share/doc/qt2/html/qintvalidator-members.html share/doc/qt2/html/qintvalidator.html share/doc/qt2/html/qiodevice-h.html @@ -866,6 +872,7 @@ share/doc/qt2/html/qjiscodec.html share/doc/qt2/html/qjpunicode-h.html share/doc/qt2/html/qjpunicodeconv-members.html share/doc/qt2/html/qjpunicodeconv.html +share/doc/qt2/html/qkeyboard_qws-h.html share/doc/qt2/html/qkeyevent-members.html share/doc/qt2/html/qkeyevent.html share/doc/qt2/html/qlabel-h.html @@ -1370,6 +1377,7 @@ share/doc/qt2/html/qwindowdefs-h.html share/doc/qt2/html/qwindowsstyle-h.html share/doc/qt2/html/qwindowsstyle-members.html share/doc/qt2/html/qwindowsstyle.html +share/doc/qt2/html/qwindowsystem_qws-h.html share/doc/qt2/html/qwizard-h.html share/doc/qt2/html/qwizard-members.html share/doc/qt2/html/qwizard.html @@ -1379,8 +1387,16 @@ share/doc/qt2/html/qwmatrix.html share/doc/qt2/html/qworkspace-h.html share/doc/qt2/html/qworkspace-members.html share/doc/qt2/html/qworkspace.html -share/doc/qt2/html/qwsdisplay_qws-h.html -share/doc/qt2/html/qwsmanager_qws-h.html +share/doc/qt2/html/qwsdecoration-members.html +share/doc/qt2/html/qwsdecoration.html +share/doc/qt2/html/qwsdecoration_qws-h.html +share/doc/qt2/html/qwskeyboardhandler-members.html +share/doc/qt2/html/qwskeyboardhandler.html +share/doc/qt2/html/qwsmouse_qws-h.html +share/doc/qt2/html/qwsmousehandler-members.html +share/doc/qt2/html/qwsmousehandler.html +share/doc/qt2/html/qwsserver-members.html +share/doc/qt2/html/qwsserver.html share/doc/qt2/html/qxml-h.html share/doc/qt2/html/qxmlattributes-members.html share/doc/qt2/html/qxmlattributes.html @@ -1552,6 +1568,6 @@ share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html share/doc/qt2/html/xml.html share/doc/qt2/html/xt.html share/doc/qt2/html/y2k.html -@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true -@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true +@dirrm share/doc/qt2/html +@dirrm share/doc/qt2 @dirrm include/qt2 diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index 7d1e5e4ea96..66cd3c4c58b 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= qt -PORTVERSION?= 2.2.4 +PORTVERSION?= 2.3.0 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ DISTNAME= qt-x11-${PORTVERSION} diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo index 88b10c614ba..e539763ce44 100644 --- a/x11-toolkits/qt31/distinfo +++ b/x11-toolkits/qt31/distinfo @@ -1 +1 @@ -MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d +MD5 (qt-x11-2.3.0.tar.gz) = f4993d952b9380a5009735aa1b7b9c03 diff --git a/x11-toolkits/qt31/files/manpages b/x11-toolkits/qt31/files/manpages index bb488b74226..59e93d35ef6 100644 --- a/x11-toolkits/qt31/files/manpages +++ b/x11-toolkits/qt31/files/manpages @@ -148,6 +148,7 @@ qintcache.3qt \ qintcacheiterator.3qt \ qintdict.3qt \ qintdictiterator.3qt \ +qinterlacestyle.3qt \ qintvalidator.3qt \ qiodevice.3qt \ qiodevicesource.3qt \ @@ -223,6 +224,7 @@ qrect.3qt \ qregexp.3qt \ qregion.3qt \ qresizeevent.3qt \ +qscreencursor.3qt \ qscrollbar.3qt \ qscrollview.3qt \ qsemaphore.3qt \ @@ -286,10 +288,10 @@ qtoolbutton.3qt \ qtooltip.3qt \ qtooltipgroup.3qt \ qtranslator.3qt \ +qtranslatormessage.3qt \ qtsciicodec.3qt \ quridrag.3qt \ qurl.3qt \ -qtranslatormessage.3qt \ qurloperator.3qt \ qvalidator.3qt \ qvaluelist.3qt \ @@ -302,9 +304,9 @@ qvboxlayout.3qt \ qvbuttongroup.3qt \ qvector.3qt \ qvgroupbox.3qt \ +qwaitcondition.3qt \ qwhatsthis.3qt \ qwheelevent.3qt \ -qwaitcondition.3qt \ qwidget.3qt \ qwidgetitem.3qt \ qwidgetstack.3qt \ @@ -312,6 +314,10 @@ qwindowsstyle.3qt \ qwizard.3qt \ qwmatrix.3qt \ qworkspace.3qt \ +qwsdecoration.3qt \ +qwskeyboardhandler.3qt \ +qwsmousehandler.3qt \ +qwsserver.3qt \ qxmlattributes.3qt \ qxmlcontenthandler.3qt \ qxmldeclhandler.3qt \ @@ -328,4 +334,4 @@ qxmlreader.3qt \ qxmlsimplereader.3qt \ qxtapplication.3qt \ qxtwidget.3qt \ -qscreencursor.3qt + diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa index 67443ca0c1d..69509938645 100644 --- a/x11-toolkits/qt31/files/patch-aa +++ b/x11-toolkits/qt31/files/patch-aa @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt31/files/patch-af b/x11-toolkits/qt31/files/patch-af index 0e02a1aefef..552e44010c1 100644 --- a/x11-toolkits/qt31/files/patch-af +++ b/x11-toolkits/qt31/files/patch-af @@ -1,6 +1,6 @@ --- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 +++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,14 +18,14 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -76,8 +76,8 @@ +@@ -77,8 +77,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) # Compiling library source diff --git a/x11-toolkits/qt31/files/patch-al b/x11-toolkits/qt31/files/patch-al deleted file mode 100644 index 3be06c07aa4..00000000000 --- a/x11-toolkits/qt31/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/kernel/qfont.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.cpp.new Sat Feb 3 16:15:05 2001 -@@ -202,6 +202,8 @@ - <li> \c QFont::CP1251, Microsoft Cyrillic encoding - <li> \c QFont::PT154, Paratype Asian Cyrillic encoding - <li> \c QFont::AnyCharSet - whatever is handiest. -+ <li> \c QFont::CP_1251, Microsoft Cyrillic encoding -+ <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding - <li> \c QFont::Set_Ja, Japanese - <li> \c QFont::Set_Ko, Korean - <li> \c QFont::Set_Th_TH -@@ -1023,6 +1025,12 @@ - case QFont::KOI8U: - result = "koi8-u"; - break; -+ case QFont::CP_1251: -+ result = "cp1251"; -+ break; -+ case QFont::PT_154: -+ result = "pt154"; -+ break; - case QFont::Set_Ja: - result = "Set_Ja"; - break; diff --git a/x11-toolkits/qt31/files/patch-am b/x11-toolkits/qt31/files/patch-am deleted file mode 100644 index 0df46e135e4..00000000000 --- a/x11-toolkits/qt31/files/patch-am +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kernel/qfont.h Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.h.new Sat Feb 3 16:06:47 2001 -@@ -70,6 +70,9 @@ - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, -+ KOI8U, -+ CP_1251, -+ PT_154, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, -@@ -87,7 +90,6 @@ - Set_Big5, - - TSCII, -- KOI8U, - CP1251, - PT154, - /* The following are font-specific encodings that diff --git a/x11-toolkits/qt31/files/patch-an b/x11-toolkits/qt31/files/patch-an deleted file mode 100644 index b3a5f30703b..00000000000 --- a/x11-toolkits/qt31/files/patch-an +++ /dev/null @@ -1,44 +0,0 @@ ---- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 -@@ -324,6 +324,9 @@ - { "ISO 8859-14", QFont::ISO_8859_14 }, - { "ISO 8859-15", QFont::ISO_8859_15 }, - { "KOI8-R", QFont::KOI8R }, -+ { "KOI8-U", QFont::KOI8U }, -+ { "CP 1251", QFont::CP_1251 }, -+ { "PT 154", QFont::PT_154 }, - { "eucJP", QFont::Set_Ja }, - { "SJIS", QFont::Set_Ja }, - { "JIS7", QFont::Set_Ja }, -@@ -522,6 +525,12 @@ - } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && - strcmp( tokens[CharsetEncoding], "u" ) == 0) { - fd->charSet = QFont::KOI8U; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) { -+ fd->charSet = QFont::CP_1251; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) { -+ fd->charSet = QFont::PT_154; - } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && - qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { - fd->charSet = QFont::TSCII; -@@ -1435,6 +1444,18 @@ - score |= CharSetScore; - else - exactMatch = FALSE; -+ } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; -+ } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; - } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && - charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { - int i = 0; diff --git a/x11-toolkits/qt31/files/patch-ao b/x11-toolkits/qt31/files/patch-ao deleted file mode 100644 index f26c1d1e80d..00000000000 --- a/x11-toolkits/qt31/files/patch-ao +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qfontdatabase.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfontdatabase.cpp.new Sat Feb 3 16:30:20 2001 -@@ -1343,6 +1343,14 @@ - return QFont::KOI8R; - if ( name == "koi8-u" ) - return QFont::KOI8U; -+ if ( name == "microsoft-cp1251" ) -+ return QFont::CP_1251; -+ if ( name == "windows-1251" ) -+ return QFont::CP_1251; -+ if ( name == "paratype-cp154" ) -+ return QFont::PT_154; -+ if ( name == "paratype-154" ) -+ return QFont::PT_154; - if ( name == "tis620-0" ) - return QFont::TIS620; - if ( name == "tscii-0" ) -@@ -1598,13 +1606,13 @@ - sample += QChar(0x0436); - sample += QChar(0x2560); - break; -- case QFont::CP1251: -+ case QFont::CP_1251: - sample += QChar(0x0414); - sample += QChar(0x0490); - sample += QChar(0x040E); - sample += QChar(0x20AC); - break; -- case QFont::PT154: -+ case QFont::PT_154: - sample += QChar(0x0496); - sample += QChar(0x04E8); - sample += QChar(0x04D8); diff --git a/x11-toolkits/qt31/files/patch-ap b/x11-toolkits/qt31/files/patch-ap deleted file mode 100644 index 593ac76bdbb..00000000000 --- a/x11-toolkits/qt31/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp ---- src/kernel/qpsprinter.cpp Wed Oct 4 13:48:49 2000 -+++ src/kernel/qpsprinter.cpp Mon Oct 9 11:53:48 2000 -@@ -1734,2 +1734,4 @@ - { QFont::KOI8R, 2084 }, -+ { QFont::KOI8U, 2088 }, -+ { QFont::CP_1251, 2251 }, - { QFont::ISO_8859_1, 4 }, -@@ -1747,2 +1749,3 @@ - { QFont::ISO_8859_15, 111 }, -+ { QFont::PT_154, 0 }, - // makeFixedStrings() below assumes that this is last diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist index 9543422204e..d5546993e41 100644 --- a/x11-toolkits/qt31/pkg-plist +++ b/x11-toolkits/qt31/pkg-plist @@ -112,6 +112,7 @@ include/qt2/qinputdialog.h include/qt2/qintcach.h include/qt2/qintcache.h include/qt2/qintdict.h +include/qt2/qinterlacestyle.h include/qt2/qiodev.h include/qt2/qiodevice.h include/qt2/qjiscodec.h @@ -322,6 +323,7 @@ share/doc/qt2/html/casestudy-qws.html share/doc/qt2/html/changes21.html share/doc/qt2/html/changes211.html share/doc/qt2/html/changes22.html +share/doc/qt2/html/changes23.html share/doc/qt2/html/charinput-qws.html share/doc/qt2/html/checklists-main-cpp.html share/doc/qt2/html/classes.html @@ -581,6 +583,7 @@ share/doc/qt2/html/qconststring-members.html share/doc/qt2/html/qconststring.html share/doc/qt2/html/qcopchannel-members.html share/doc/qt2/html/qcopchannel.html +share/doc/qt2/html/qcopchannel_qws-h.html share/doc/qt2/html/qcstring-h.html share/doc/qt2/html/qcstring-members.html share/doc/qt2/html/qcstring.html @@ -853,6 +856,9 @@ share/doc/qt2/html/qintdict-members.html share/doc/qt2/html/qintdict.html share/doc/qt2/html/qintdictiterator-members.html share/doc/qt2/html/qintdictiterator.html +share/doc/qt2/html/qinterlacestyle-h.html +share/doc/qt2/html/qinterlacestyle-members.html +share/doc/qt2/html/qinterlacestyle.html share/doc/qt2/html/qintvalidator-members.html share/doc/qt2/html/qintvalidator.html share/doc/qt2/html/qiodevice-h.html @@ -866,6 +872,7 @@ share/doc/qt2/html/qjiscodec.html share/doc/qt2/html/qjpunicode-h.html share/doc/qt2/html/qjpunicodeconv-members.html share/doc/qt2/html/qjpunicodeconv.html +share/doc/qt2/html/qkeyboard_qws-h.html share/doc/qt2/html/qkeyevent-members.html share/doc/qt2/html/qkeyevent.html share/doc/qt2/html/qlabel-h.html @@ -1370,6 +1377,7 @@ share/doc/qt2/html/qwindowdefs-h.html share/doc/qt2/html/qwindowsstyle-h.html share/doc/qt2/html/qwindowsstyle-members.html share/doc/qt2/html/qwindowsstyle.html +share/doc/qt2/html/qwindowsystem_qws-h.html share/doc/qt2/html/qwizard-h.html share/doc/qt2/html/qwizard-members.html share/doc/qt2/html/qwizard.html @@ -1379,8 +1387,16 @@ share/doc/qt2/html/qwmatrix.html share/doc/qt2/html/qworkspace-h.html share/doc/qt2/html/qworkspace-members.html share/doc/qt2/html/qworkspace.html -share/doc/qt2/html/qwsdisplay_qws-h.html -share/doc/qt2/html/qwsmanager_qws-h.html +share/doc/qt2/html/qwsdecoration-members.html +share/doc/qt2/html/qwsdecoration.html +share/doc/qt2/html/qwsdecoration_qws-h.html +share/doc/qt2/html/qwskeyboardhandler-members.html +share/doc/qt2/html/qwskeyboardhandler.html +share/doc/qt2/html/qwsmouse_qws-h.html +share/doc/qt2/html/qwsmousehandler-members.html +share/doc/qt2/html/qwsmousehandler.html +share/doc/qt2/html/qwsserver-members.html +share/doc/qt2/html/qwsserver.html share/doc/qt2/html/qxml-h.html share/doc/qt2/html/qxmlattributes-members.html share/doc/qt2/html/qxmlattributes.html @@ -1552,6 +1568,6 @@ share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html share/doc/qt2/html/xml.html share/doc/qt2/html/xt.html share/doc/qt2/html/y2k.html -@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true -@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true +@dirrm share/doc/qt2/html +@dirrm share/doc/qt2 @dirrm include/qt2 diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index 7d1e5e4ea96..66cd3c4c58b 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= qt -PORTVERSION?= 2.2.4 +PORTVERSION?= 2.3.0 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ DISTNAME= qt-x11-${PORTVERSION} diff --git a/x11-toolkits/qt32/distinfo b/x11-toolkits/qt32/distinfo index 88b10c614ba..e539763ce44 100644 --- a/x11-toolkits/qt32/distinfo +++ b/x11-toolkits/qt32/distinfo @@ -1 +1 @@ -MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d +MD5 (qt-x11-2.3.0.tar.gz) = f4993d952b9380a5009735aa1b7b9c03 diff --git a/x11-toolkits/qt32/files/manpages b/x11-toolkits/qt32/files/manpages index bb488b74226..59e93d35ef6 100644 --- a/x11-toolkits/qt32/files/manpages +++ b/x11-toolkits/qt32/files/manpages @@ -148,6 +148,7 @@ qintcache.3qt \ qintcacheiterator.3qt \ qintdict.3qt \ qintdictiterator.3qt \ +qinterlacestyle.3qt \ qintvalidator.3qt \ qiodevice.3qt \ qiodevicesource.3qt \ @@ -223,6 +224,7 @@ qrect.3qt \ qregexp.3qt \ qregion.3qt \ qresizeevent.3qt \ +qscreencursor.3qt \ qscrollbar.3qt \ qscrollview.3qt \ qsemaphore.3qt \ @@ -286,10 +288,10 @@ qtoolbutton.3qt \ qtooltip.3qt \ qtooltipgroup.3qt \ qtranslator.3qt \ +qtranslatormessage.3qt \ qtsciicodec.3qt \ quridrag.3qt \ qurl.3qt \ -qtranslatormessage.3qt \ qurloperator.3qt \ qvalidator.3qt \ qvaluelist.3qt \ @@ -302,9 +304,9 @@ qvboxlayout.3qt \ qvbuttongroup.3qt \ qvector.3qt \ qvgroupbox.3qt \ +qwaitcondition.3qt \ qwhatsthis.3qt \ qwheelevent.3qt \ -qwaitcondition.3qt \ qwidget.3qt \ qwidgetitem.3qt \ qwidgetstack.3qt \ @@ -312,6 +314,10 @@ qwindowsstyle.3qt \ qwizard.3qt \ qwmatrix.3qt \ qworkspace.3qt \ +qwsdecoration.3qt \ +qwskeyboardhandler.3qt \ +qwsmousehandler.3qt \ +qwsserver.3qt \ qxmlattributes.3qt \ qxmlcontenthandler.3qt \ qxmldeclhandler.3qt \ @@ -328,4 +334,4 @@ qxmlreader.3qt \ qxmlsimplereader.3qt \ qxtapplication.3qt \ qxtwidget.3qt \ -qscreencursor.3qt + diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa index 67443ca0c1d..69509938645 100644 --- a/x11-toolkits/qt32/files/patch-aa +++ b/x11-toolkits/qt32/files/patch-aa @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt32/files/patch-af b/x11-toolkits/qt32/files/patch-af index 0e02a1aefef..552e44010c1 100644 --- a/x11-toolkits/qt32/files/patch-af +++ b/x11-toolkits/qt32/files/patch-af @@ -1,6 +1,6 @@ --- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 +++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,14 +18,14 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -76,8 +76,8 @@ +@@ -77,8 +77,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) # Compiling library source diff --git a/x11-toolkits/qt32/files/patch-al b/x11-toolkits/qt32/files/patch-al deleted file mode 100644 index 3be06c07aa4..00000000000 --- a/x11-toolkits/qt32/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/kernel/qfont.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.cpp.new Sat Feb 3 16:15:05 2001 -@@ -202,6 +202,8 @@ - <li> \c QFont::CP1251, Microsoft Cyrillic encoding - <li> \c QFont::PT154, Paratype Asian Cyrillic encoding - <li> \c QFont::AnyCharSet - whatever is handiest. -+ <li> \c QFont::CP_1251, Microsoft Cyrillic encoding -+ <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding - <li> \c QFont::Set_Ja, Japanese - <li> \c QFont::Set_Ko, Korean - <li> \c QFont::Set_Th_TH -@@ -1023,6 +1025,12 @@ - case QFont::KOI8U: - result = "koi8-u"; - break; -+ case QFont::CP_1251: -+ result = "cp1251"; -+ break; -+ case QFont::PT_154: -+ result = "pt154"; -+ break; - case QFont::Set_Ja: - result = "Set_Ja"; - break; diff --git a/x11-toolkits/qt32/files/patch-am b/x11-toolkits/qt32/files/patch-am deleted file mode 100644 index 0df46e135e4..00000000000 --- a/x11-toolkits/qt32/files/patch-am +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kernel/qfont.h Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.h.new Sat Feb 3 16:06:47 2001 -@@ -70,6 +70,9 @@ - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, -+ KOI8U, -+ CP_1251, -+ PT_154, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, -@@ -87,7 +90,6 @@ - Set_Big5, - - TSCII, -- KOI8U, - CP1251, - PT154, - /* The following are font-specific encodings that diff --git a/x11-toolkits/qt32/files/patch-an b/x11-toolkits/qt32/files/patch-an deleted file mode 100644 index b3a5f30703b..00000000000 --- a/x11-toolkits/qt32/files/patch-an +++ /dev/null @@ -1,44 +0,0 @@ ---- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 -@@ -324,6 +324,9 @@ - { "ISO 8859-14", QFont::ISO_8859_14 }, - { "ISO 8859-15", QFont::ISO_8859_15 }, - { "KOI8-R", QFont::KOI8R }, -+ { "KOI8-U", QFont::KOI8U }, -+ { "CP 1251", QFont::CP_1251 }, -+ { "PT 154", QFont::PT_154 }, - { "eucJP", QFont::Set_Ja }, - { "SJIS", QFont::Set_Ja }, - { "JIS7", QFont::Set_Ja }, -@@ -522,6 +525,12 @@ - } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && - strcmp( tokens[CharsetEncoding], "u" ) == 0) { - fd->charSet = QFont::KOI8U; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) { -+ fd->charSet = QFont::CP_1251; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) { -+ fd->charSet = QFont::PT_154; - } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && - qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { - fd->charSet = QFont::TSCII; -@@ -1435,6 +1444,18 @@ - score |= CharSetScore; - else - exactMatch = FALSE; -+ } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; -+ } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; - } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && - charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { - int i = 0; diff --git a/x11-toolkits/qt32/files/patch-ao b/x11-toolkits/qt32/files/patch-ao deleted file mode 100644 index f26c1d1e80d..00000000000 --- a/x11-toolkits/qt32/files/patch-ao +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qfontdatabase.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfontdatabase.cpp.new Sat Feb 3 16:30:20 2001 -@@ -1343,6 +1343,14 @@ - return QFont::KOI8R; - if ( name == "koi8-u" ) - return QFont::KOI8U; -+ if ( name == "microsoft-cp1251" ) -+ return QFont::CP_1251; -+ if ( name == "windows-1251" ) -+ return QFont::CP_1251; -+ if ( name == "paratype-cp154" ) -+ return QFont::PT_154; -+ if ( name == "paratype-154" ) -+ return QFont::PT_154; - if ( name == "tis620-0" ) - return QFont::TIS620; - if ( name == "tscii-0" ) -@@ -1598,13 +1606,13 @@ - sample += QChar(0x0436); - sample += QChar(0x2560); - break; -- case QFont::CP1251: -+ case QFont::CP_1251: - sample += QChar(0x0414); - sample += QChar(0x0490); - sample += QChar(0x040E); - sample += QChar(0x20AC); - break; -- case QFont::PT154: -+ case QFont::PT_154: - sample += QChar(0x0496); - sample += QChar(0x04E8); - sample += QChar(0x04D8); diff --git a/x11-toolkits/qt32/files/patch-ap b/x11-toolkits/qt32/files/patch-ap deleted file mode 100644 index 593ac76bdbb..00000000000 --- a/x11-toolkits/qt32/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp ---- src/kernel/qpsprinter.cpp Wed Oct 4 13:48:49 2000 -+++ src/kernel/qpsprinter.cpp Mon Oct 9 11:53:48 2000 -@@ -1734,2 +1734,4 @@ - { QFont::KOI8R, 2084 }, -+ { QFont::KOI8U, 2088 }, -+ { QFont::CP_1251, 2251 }, - { QFont::ISO_8859_1, 4 }, -@@ -1747,2 +1749,3 @@ - { QFont::ISO_8859_15, 111 }, -+ { QFont::PT_154, 0 }, - // makeFixedStrings() below assumes that this is last diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist index 9543422204e..d5546993e41 100644 --- a/x11-toolkits/qt32/pkg-plist +++ b/x11-toolkits/qt32/pkg-plist @@ -112,6 +112,7 @@ include/qt2/qinputdialog.h include/qt2/qintcach.h include/qt2/qintcache.h include/qt2/qintdict.h +include/qt2/qinterlacestyle.h include/qt2/qiodev.h include/qt2/qiodevice.h include/qt2/qjiscodec.h @@ -322,6 +323,7 @@ share/doc/qt2/html/casestudy-qws.html share/doc/qt2/html/changes21.html share/doc/qt2/html/changes211.html share/doc/qt2/html/changes22.html +share/doc/qt2/html/changes23.html share/doc/qt2/html/charinput-qws.html share/doc/qt2/html/checklists-main-cpp.html share/doc/qt2/html/classes.html @@ -581,6 +583,7 @@ share/doc/qt2/html/qconststring-members.html share/doc/qt2/html/qconststring.html share/doc/qt2/html/qcopchannel-members.html share/doc/qt2/html/qcopchannel.html +share/doc/qt2/html/qcopchannel_qws-h.html share/doc/qt2/html/qcstring-h.html share/doc/qt2/html/qcstring-members.html share/doc/qt2/html/qcstring.html @@ -853,6 +856,9 @@ share/doc/qt2/html/qintdict-members.html share/doc/qt2/html/qintdict.html share/doc/qt2/html/qintdictiterator-members.html share/doc/qt2/html/qintdictiterator.html +share/doc/qt2/html/qinterlacestyle-h.html +share/doc/qt2/html/qinterlacestyle-members.html +share/doc/qt2/html/qinterlacestyle.html share/doc/qt2/html/qintvalidator-members.html share/doc/qt2/html/qintvalidator.html share/doc/qt2/html/qiodevice-h.html @@ -866,6 +872,7 @@ share/doc/qt2/html/qjiscodec.html share/doc/qt2/html/qjpunicode-h.html share/doc/qt2/html/qjpunicodeconv-members.html share/doc/qt2/html/qjpunicodeconv.html +share/doc/qt2/html/qkeyboard_qws-h.html share/doc/qt2/html/qkeyevent-members.html share/doc/qt2/html/qkeyevent.html share/doc/qt2/html/qlabel-h.html @@ -1370,6 +1377,7 @@ share/doc/qt2/html/qwindowdefs-h.html share/doc/qt2/html/qwindowsstyle-h.html share/doc/qt2/html/qwindowsstyle-members.html share/doc/qt2/html/qwindowsstyle.html +share/doc/qt2/html/qwindowsystem_qws-h.html share/doc/qt2/html/qwizard-h.html share/doc/qt2/html/qwizard-members.html share/doc/qt2/html/qwizard.html @@ -1379,8 +1387,16 @@ share/doc/qt2/html/qwmatrix.html share/doc/qt2/html/qworkspace-h.html share/doc/qt2/html/qworkspace-members.html share/doc/qt2/html/qworkspace.html -share/doc/qt2/html/qwsdisplay_qws-h.html -share/doc/qt2/html/qwsmanager_qws-h.html +share/doc/qt2/html/qwsdecoration-members.html +share/doc/qt2/html/qwsdecoration.html +share/doc/qt2/html/qwsdecoration_qws-h.html +share/doc/qt2/html/qwskeyboardhandler-members.html +share/doc/qt2/html/qwskeyboardhandler.html +share/doc/qt2/html/qwsmouse_qws-h.html +share/doc/qt2/html/qwsmousehandler-members.html +share/doc/qt2/html/qwsmousehandler.html +share/doc/qt2/html/qwsserver-members.html +share/doc/qt2/html/qwsserver.html share/doc/qt2/html/qxml-h.html share/doc/qt2/html/qxmlattributes-members.html share/doc/qt2/html/qxmlattributes.html @@ -1552,6 +1568,6 @@ share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html share/doc/qt2/html/xml.html share/doc/qt2/html/xt.html share/doc/qt2/html/y2k.html -@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true -@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true +@dirrm share/doc/qt2/html +@dirrm share/doc/qt2 @dirrm include/qt2 diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 7d1e5e4ea96..66cd3c4c58b 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= qt -PORTVERSION?= 2.2.4 +PORTVERSION?= 2.3.0 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ DISTNAME= qt-x11-${PORTVERSION} diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo index 88b10c614ba..e539763ce44 100644 --- a/x11-toolkits/qt33/distinfo +++ b/x11-toolkits/qt33/distinfo @@ -1 +1 @@ -MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d +MD5 (qt-x11-2.3.0.tar.gz) = f4993d952b9380a5009735aa1b7b9c03 diff --git a/x11-toolkits/qt33/files/manpages b/x11-toolkits/qt33/files/manpages index bb488b74226..59e93d35ef6 100644 --- a/x11-toolkits/qt33/files/manpages +++ b/x11-toolkits/qt33/files/manpages @@ -148,6 +148,7 @@ qintcache.3qt \ qintcacheiterator.3qt \ qintdict.3qt \ qintdictiterator.3qt \ +qinterlacestyle.3qt \ qintvalidator.3qt \ qiodevice.3qt \ qiodevicesource.3qt \ @@ -223,6 +224,7 @@ qrect.3qt \ qregexp.3qt \ qregion.3qt \ qresizeevent.3qt \ +qscreencursor.3qt \ qscrollbar.3qt \ qscrollview.3qt \ qsemaphore.3qt \ @@ -286,10 +288,10 @@ qtoolbutton.3qt \ qtooltip.3qt \ qtooltipgroup.3qt \ qtranslator.3qt \ +qtranslatormessage.3qt \ qtsciicodec.3qt \ quridrag.3qt \ qurl.3qt \ -qtranslatormessage.3qt \ qurloperator.3qt \ qvalidator.3qt \ qvaluelist.3qt \ @@ -302,9 +304,9 @@ qvboxlayout.3qt \ qvbuttongroup.3qt \ qvector.3qt \ qvgroupbox.3qt \ +qwaitcondition.3qt \ qwhatsthis.3qt \ qwheelevent.3qt \ -qwaitcondition.3qt \ qwidget.3qt \ qwidgetitem.3qt \ qwidgetstack.3qt \ @@ -312,6 +314,10 @@ qwindowsstyle.3qt \ qwizard.3qt \ qwmatrix.3qt \ qworkspace.3qt \ +qwsdecoration.3qt \ +qwskeyboardhandler.3qt \ +qwsmousehandler.3qt \ +qwsserver.3qt \ qxmlattributes.3qt \ qxmlcontenthandler.3qt \ qxmldeclhandler.3qt \ @@ -328,4 +334,4 @@ qxmlreader.3qt \ qxmlsimplereader.3qt \ qxtapplication.3qt \ qxtwidget.3qt \ -qscreencursor.3qt + diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa index 67443ca0c1d..69509938645 100644 --- a/x11-toolkits/qt33/files/patch-aa +++ b/x11-toolkits/qt33/files/patch-aa @@ -51,10 +51,10 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt33/files/patch-af b/x11-toolkits/qt33/files/patch-af index 0e02a1aefef..552e44010c1 100644 --- a/x11-toolkits/qt33/files/patch-af +++ b/x11-toolkits/qt33/files/patch-af @@ -1,6 +1,6 @@ --- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 +++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,14 +18,14 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -76,8 +76,8 @@ +@@ -77,8 +77,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source --SYSCONF_CXXFLAGS = -pipe -O2 --SYSCONF_CFLAGS = -pipe -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 +-SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) # Compiling library source diff --git a/x11-toolkits/qt33/files/patch-al b/x11-toolkits/qt33/files/patch-al deleted file mode 100644 index 3be06c07aa4..00000000000 --- a/x11-toolkits/qt33/files/patch-al +++ /dev/null @@ -1,24 +0,0 @@ ---- src/kernel/qfont.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.cpp.new Sat Feb 3 16:15:05 2001 -@@ -202,6 +202,8 @@ - <li> \c QFont::CP1251, Microsoft Cyrillic encoding - <li> \c QFont::PT154, Paratype Asian Cyrillic encoding - <li> \c QFont::AnyCharSet - whatever is handiest. -+ <li> \c QFont::CP_1251, Microsoft Cyrillic encoding -+ <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding - <li> \c QFont::Set_Ja, Japanese - <li> \c QFont::Set_Ko, Korean - <li> \c QFont::Set_Th_TH -@@ -1023,6 +1025,12 @@ - case QFont::KOI8U: - result = "koi8-u"; - break; -+ case QFont::CP_1251: -+ result = "cp1251"; -+ break; -+ case QFont::PT_154: -+ result = "pt154"; -+ break; - case QFont::Set_Ja: - result = "Set_Ja"; - break; diff --git a/x11-toolkits/qt33/files/patch-am b/x11-toolkits/qt33/files/patch-am deleted file mode 100644 index 0df46e135e4..00000000000 --- a/x11-toolkits/qt33/files/patch-am +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kernel/qfont.h Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont.h.new Sat Feb 3 16:06:47 2001 -@@ -70,6 +70,9 @@ - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, -+ KOI8U, -+ CP_1251, -+ PT_154, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, -@@ -87,7 +90,6 @@ - Set_Big5, - - TSCII, -- KOI8U, - CP1251, - PT154, - /* The following are font-specific encodings that diff --git a/x11-toolkits/qt33/files/patch-an b/x11-toolkits/qt33/files/patch-an deleted file mode 100644 index b3a5f30703b..00000000000 --- a/x11-toolkits/qt33/files/patch-an +++ /dev/null @@ -1,44 +0,0 @@ ---- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 -@@ -324,6 +324,9 @@ - { "ISO 8859-14", QFont::ISO_8859_14 }, - { "ISO 8859-15", QFont::ISO_8859_15 }, - { "KOI8-R", QFont::KOI8R }, -+ { "KOI8-U", QFont::KOI8U }, -+ { "CP 1251", QFont::CP_1251 }, -+ { "PT 154", QFont::PT_154 }, - { "eucJP", QFont::Set_Ja }, - { "SJIS", QFont::Set_Ja }, - { "JIS7", QFont::Set_Ja }, -@@ -522,6 +525,12 @@ - } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && - strcmp( tokens[CharsetEncoding], "u" ) == 0) { - fd->charSet = QFont::KOI8U; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) { -+ fd->charSet = QFont::CP_1251; -+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) { -+ fd->charSet = QFont::PT_154; - } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && - qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { - fd->charSet = QFont::TSCII; -@@ -1435,6 +1444,18 @@ - score |= CharSetScore; - else - exactMatch = FALSE; -+ } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; -+ } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; - } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && - charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { - int i = 0; diff --git a/x11-toolkits/qt33/files/patch-ao b/x11-toolkits/qt33/files/patch-ao deleted file mode 100644 index f26c1d1e80d..00000000000 --- a/x11-toolkits/qt33/files/patch-ao +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qfontdatabase.cpp Wed Jan 31 21:26:40 2001 -+++ src/kernel/qfontdatabase.cpp.new Sat Feb 3 16:30:20 2001 -@@ -1343,6 +1343,14 @@ - return QFont::KOI8R; - if ( name == "koi8-u" ) - return QFont::KOI8U; -+ if ( name == "microsoft-cp1251" ) -+ return QFont::CP_1251; -+ if ( name == "windows-1251" ) -+ return QFont::CP_1251; -+ if ( name == "paratype-cp154" ) -+ return QFont::PT_154; -+ if ( name == "paratype-154" ) -+ return QFont::PT_154; - if ( name == "tis620-0" ) - return QFont::TIS620; - if ( name == "tscii-0" ) -@@ -1598,13 +1606,13 @@ - sample += QChar(0x0436); - sample += QChar(0x2560); - break; -- case QFont::CP1251: -+ case QFont::CP_1251: - sample += QChar(0x0414); - sample += QChar(0x0490); - sample += QChar(0x040E); - sample += QChar(0x20AC); - break; -- case QFont::PT154: -+ case QFont::PT_154: - sample += QChar(0x0496); - sample += QChar(0x04E8); - sample += QChar(0x04D8); diff --git a/x11-toolkits/qt33/files/patch-ap b/x11-toolkits/qt33/files/patch-ap deleted file mode 100644 index 593ac76bdbb..00000000000 --- a/x11-toolkits/qt33/files/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp ---- src/kernel/qpsprinter.cpp Wed Oct 4 13:48:49 2000 -+++ src/kernel/qpsprinter.cpp Mon Oct 9 11:53:48 2000 -@@ -1734,2 +1734,4 @@ - { QFont::KOI8R, 2084 }, -+ { QFont::KOI8U, 2088 }, -+ { QFont::CP_1251, 2251 }, - { QFont::ISO_8859_1, 4 }, -@@ -1747,2 +1749,3 @@ - { QFont::ISO_8859_15, 111 }, -+ { QFont::PT_154, 0 }, - // makeFixedStrings() below assumes that this is last diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist index 9543422204e..d5546993e41 100644 --- a/x11-toolkits/qt33/pkg-plist +++ b/x11-toolkits/qt33/pkg-plist @@ -112,6 +112,7 @@ include/qt2/qinputdialog.h include/qt2/qintcach.h include/qt2/qintcache.h include/qt2/qintdict.h +include/qt2/qinterlacestyle.h include/qt2/qiodev.h include/qt2/qiodevice.h include/qt2/qjiscodec.h @@ -322,6 +323,7 @@ share/doc/qt2/html/casestudy-qws.html share/doc/qt2/html/changes21.html share/doc/qt2/html/changes211.html share/doc/qt2/html/changes22.html +share/doc/qt2/html/changes23.html share/doc/qt2/html/charinput-qws.html share/doc/qt2/html/checklists-main-cpp.html share/doc/qt2/html/classes.html @@ -581,6 +583,7 @@ share/doc/qt2/html/qconststring-members.html share/doc/qt2/html/qconststring.html share/doc/qt2/html/qcopchannel-members.html share/doc/qt2/html/qcopchannel.html +share/doc/qt2/html/qcopchannel_qws-h.html share/doc/qt2/html/qcstring-h.html share/doc/qt2/html/qcstring-members.html share/doc/qt2/html/qcstring.html @@ -853,6 +856,9 @@ share/doc/qt2/html/qintdict-members.html share/doc/qt2/html/qintdict.html share/doc/qt2/html/qintdictiterator-members.html share/doc/qt2/html/qintdictiterator.html +share/doc/qt2/html/qinterlacestyle-h.html +share/doc/qt2/html/qinterlacestyle-members.html +share/doc/qt2/html/qinterlacestyle.html share/doc/qt2/html/qintvalidator-members.html share/doc/qt2/html/qintvalidator.html share/doc/qt2/html/qiodevice-h.html @@ -866,6 +872,7 @@ share/doc/qt2/html/qjiscodec.html share/doc/qt2/html/qjpunicode-h.html share/doc/qt2/html/qjpunicodeconv-members.html share/doc/qt2/html/qjpunicodeconv.html +share/doc/qt2/html/qkeyboard_qws-h.html share/doc/qt2/html/qkeyevent-members.html share/doc/qt2/html/qkeyevent.html share/doc/qt2/html/qlabel-h.html @@ -1370,6 +1377,7 @@ share/doc/qt2/html/qwindowdefs-h.html share/doc/qt2/html/qwindowsstyle-h.html share/doc/qt2/html/qwindowsstyle-members.html share/doc/qt2/html/qwindowsstyle.html +share/doc/qt2/html/qwindowsystem_qws-h.html share/doc/qt2/html/qwizard-h.html share/doc/qt2/html/qwizard-members.html share/doc/qt2/html/qwizard.html @@ -1379,8 +1387,16 @@ share/doc/qt2/html/qwmatrix.html share/doc/qt2/html/qworkspace-h.html share/doc/qt2/html/qworkspace-members.html share/doc/qt2/html/qworkspace.html -share/doc/qt2/html/qwsdisplay_qws-h.html -share/doc/qt2/html/qwsmanager_qws-h.html +share/doc/qt2/html/qwsdecoration-members.html +share/doc/qt2/html/qwsdecoration.html +share/doc/qt2/html/qwsdecoration_qws-h.html +share/doc/qt2/html/qwskeyboardhandler-members.html +share/doc/qt2/html/qwskeyboardhandler.html +share/doc/qt2/html/qwsmouse_qws-h.html +share/doc/qt2/html/qwsmousehandler-members.html +share/doc/qt2/html/qwsmousehandler.html +share/doc/qt2/html/qwsserver-members.html +share/doc/qt2/html/qwsserver.html share/doc/qt2/html/qxml-h.html share/doc/qt2/html/qxmlattributes-members.html share/doc/qt2/html/qxmlattributes.html @@ -1552,6 +1568,6 @@ share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html share/doc/qt2/html/xml.html share/doc/qt2/html/xt.html share/doc/qt2/html/y2k.html -@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true -@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true +@dirrm share/doc/qt2/html +@dirrm share/doc/qt2 @dirrm include/qt2 |