diff options
author | recht <recht@pkgsrc.org> | 2004-04-16 14:30:44 +0000 |
---|---|---|
committer | recht <recht@pkgsrc.org> | 2004-04-16 14:30:44 +0000 |
commit | ec23ce840d72800992738c45627ae992cc1d7fad (patch) | |
tree | 2030a2fa354a78cb727cdc6a45a24ec4fc27fb95 /x11/qt3-libs/patches | |
parent | 309dbb72ad71eb66ce5c54a780e510dd5399b1c0 (diff) | |
download | pkgsrc-ec23ce840d72800992738c45627ae992cc1d7fad.tar.gz |
update to 3.3.1
changes (among many others):
- New QLocale Class
- The ActiveQt framework, first available in Qt 3.1, has been enhanced in
lots of ways in Qt 3.3.
- Semi-Transparent Windows
Other Improvements
- The network module now supports IPv6 in addition to IPv4.
- New 64-bit platforms are supported: Itanium on Linux (Intel compiler) and
Windows (MSVC and Intel).
- QCursor now provides the BusyCursor shape, which combines an hourglass with
an arrow.
- Qt's DOM classes are now reentrant when Qt is built with multithread support
enabled.
See http://www.trolltech.com/products/qt/whatsnew.html for more details.
Diffstat (limited to 'x11/qt3-libs/patches')
-rw-r--r-- | x11/qt3-libs/patches/patch-ac | 10 | ||||
-rw-r--r-- | x11/qt3-libs/patches/patch-ad | 13 | ||||
-rw-r--r-- | x11/qt3-libs/patches/patch-af | 96 | ||||
-rw-r--r-- | x11/qt3-libs/patches/patch-bc | 20 |
4 files changed, 111 insertions, 28 deletions
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac index 7f88f2277d2..8145d0fcf37 100644 --- a/x11/qt3-libs/patches/patch-ac +++ b/x11/qt3-libs/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $ +$NetBSD: patch-ac,v 1.5 2004/04/16 14:30:45 recht Exp $ ---- src/tools/qdir_unix.cpp.orig Mon Dec 9 22:40:32 2002 -+++ src/tools/qdir_unix.cpp +--- src/tools/qdir_unix.cpp.orig 2004-02-18 14:22:42.000000000 +0100 ++++ src/tools/qdir_unix.cpp 2004-04-15 01:49:24.000000000 +0200 @@ -36,6 +36,16 @@ **********************************************************************/ @@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $ #include "qdir.h" #ifndef QT_NO_DIR -@@ -86,10 +96,19 @@ +@@ -88,10 +98,19 @@ bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const { @@ -42,7 +42,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $ int status = ::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 ); #else -@@ -101,7 +120,24 @@ bool QDir::mkdir( const QString &dirName +@@ -103,7 +122,24 @@ bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const { diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad deleted file mode 100644 index 61bf8a8b021..00000000000 --- a/x11/qt3-libs/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2003/12/19 15:43:31 skrll Exp $ - ---- src/kernel/qscriptengine_x11.cpp.orig 2003-11-10 10:22:02.000000000 +0000 -+++ src/kernel/qscriptengine_x11.cpp -@@ -2671,7 +2671,7 @@ static void hangul_shape_syllable( const - } else if (syllableLength == 3) { - int LIndex = ch[0].unicode() - Hangul_LBase; - int VIndex = ch[1].unicode() - Hangul_VBase; -- int TIndex = ch[1].unicode() - Hangul_TBase; -+ int TIndex = ch[2].unicode() - Hangul_TBase; - if (LIndex >= 0 && LIndex < Hangul_LCount && - VIndex >= 0 && VIndex < Hangul_VCount && - TIndex >= 0 && TIndex < Hangul_TCount ) diff --git a/x11/qt3-libs/patches/patch-af b/x11/qt3-libs/patches/patch-af new file mode 100644 index 00000000000..821ca7d6df5 --- /dev/null +++ b/x11/qt3-libs/patches/patch-af @@ -0,0 +1,96 @@ +$NetBSD: patch-af,v 1.1 2004/04/16 14:30:45 recht Exp $ + +--- src/kernel/qclipboard_x11.cpp.orig 2004-02-18 14:22:48.000000000 +0100 ++++ src/kernel/qclipboard_x11.cpp 2004-04-15 01:54:07.000000000 +0200 +@@ -112,10 +112,6 @@ + + // event capture mechanism for qt_xclb_wait_for_event + static bool waiting_for_data = FALSE; +-static bool has_captured_event = FALSE; +-static Window capture_event_win = None; +-static int capture_event_type = -1; +-static XEvent captured_event; + + class QClipboardWatcher; // forward decl + static QClipboardWatcher *selection_watcher = 0; +@@ -432,69 +428,36 @@ + { return inSelectionMode_obsolete; } + + +-// event filter function... captures interesting events while +-// qt_xclb_wait_for_event is running the event loop +-static int qt_xclb_event_filter(XEvent *event) +-{ +- if (event->xany.type == capture_event_type && +- event->xany.window == capture_event_win) { +- VDEBUG( "QClipboard: event_filter(): caught event type %d", event->type ); +- has_captured_event = TRUE; +- captured_event = *event; +- return 1; +- } +- +- return 0; +-} +- + bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, + int timeout ) + { +- if ( waiting_for_data ) +- qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" ); +- +- waiting_for_data = TRUE; +- + QTime started = QTime::currentTime(); + QTime now = started; +- +- has_captured_event = FALSE; +- capture_event_win = win; +- capture_event_type = type; +- +- QX11EventFilter old_event_filter = qt_set_x11_event_filter(qt_xclb_event_filter); ++ bool flushed = FALSE; + + do { +- if ( XCheckTypedWindowEvent(dpy,win,type,event) ) { +- waiting_for_data = FALSE; +- qt_set_x11_event_filter(old_event_filter); ++ if ( XCheckTypedWindowEvent(dpy,win,type,event) ) + return TRUE; +- } + + now = QTime::currentTime(); + if ( started > now ) // crossed midnight + started = now; + +- // 0x08 == ExcludeTimers for X11 only +- qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | +- QEventLoop::ExcludeSocketNotifiers | +- QEventLoop::WaitForMore | 0x08 ); +- +- if ( has_captured_event ) { +- waiting_for_data = FALSE; +- *event = captured_event; +- qt_set_x11_event_filter(old_event_filter); +- return TRUE; ++ if(!flushed) { ++ XFlush( dpy ); ++ flushed = TRUE; + } +- } while ( started.msecsTo(now) < timeout ); + +- waiting_for_data = FALSE; +- qt_set_x11_event_filter(old_event_filter); ++ // sleep 50ms, so we don't use up CPU cycles all the time. ++ struct timeval usleep_tv; ++ usleep_tv.tv_sec = 0; ++ usleep_tv.tv_usec = 50000; ++ select(0, 0, 0, 0, &usleep_tv); ++ } while ( started.msecsTo(now) < timeout ); + + return FALSE; + } + +- + static inline int maxSelectionIncr( Display *dpy ) + { return XMaxRequestSize(dpy) > 65536 ? 65536*4 : XMaxRequestSize(dpy)*4 - 100; } + diff --git a/x11/qt3-libs/patches/patch-bc b/x11/qt3-libs/patches/patch-bc index dec24b6d81f..844889897c5 100644 --- a/x11/qt3-libs/patches/patch-bc +++ b/x11/qt3-libs/patches/patch-bc @@ -1,13 +1,13 @@ -$NetBSD: patch-bc,v 1.1 2003/07/22 17:17:20 drochner Exp $ +$NetBSD: patch-bc,v 1.2 2004/04/16 14:30:45 recht Exp $ ---- tools/assistant/lib/lib.pro.orig 2003-07-16 12:27:26.000000000 +0200 -+++ tools/assistant/lib/lib.pro 2003-07-16 12:27:47.000000000 +0200 -@@ -5,7 +5,7 @@ - SOURCES = qassistantclient.cpp - HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h +--- tools/assistant/lib/lib.pro.orig 2003-10-31 15:36:28.000000000 +0100 ++++ tools/assistant/lib/lib.pro 2004-04-15 01:53:19.000000000 +0200 +@@ -3,7 +3,7 @@ + VERSION = 1.0 --CONFIG += staticlib -+#CONFIG += staticlib - CONFIG -= dll + CONFIG += qt warn_on release +-CONFIG += staticlib ++#CONFIG += staticlib + CONFIG -= dll - DEFINES += QT_INTERNAL_NETWORK + SOURCES = qassistantclient.cpp |