summaryrefslogtreecommitdiff
path: root/x11-toolkits/qt33/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/qt33/files')
-rw-r--r--x11-toolkits/qt33/files/patch-config.tests-x11-xfreetype.test11
-rw-r--r--x11-toolkits/qt33/files/patch-qanimationwriter.cpp10
-rw-r--r--x11-toolkits/qt33/files/patch-qfiledialog.cpp11
-rw-r--r--x11-toolkits/qt33/files/patch-qlock.cpp10
-rw-r--r--x11-toolkits/qt33/files/patch-qmake7
-rw-r--r--x11-toolkits/qt33/files/qapplication.cpp.diff74
-rw-r--r--x11-toolkits/qt33/files/qapplication_p.h.diff16
-rw-r--r--x11-toolkits/qt33/files/qapplication_x11.cpp.diff48
-rw-r--r--x11-toolkits/qt33/files/qeffects.cpp.diff23
-rw-r--r--x11-toolkits/qt33/files/qwidget_x11.cpp.diff15
10 files changed, 218 insertions, 7 deletions
diff --git a/x11-toolkits/qt33/files/patch-config.tests-x11-xfreetype.test b/x11-toolkits/qt33/files/patch-config.tests-x11-xfreetype.test
new file mode 100644
index 000000000000..d7c0f030e280
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-config.tests-x11-xfreetype.test
@@ -0,0 +1,11 @@
+--- config.tests/x11/xfreetype.test.orig Wed Nov 13 04:52:27 2002
++++ config.tests/x11/xfreetype.test Sun Dec 29 07:11:17 2002
+@@ -37,7 +37,7 @@
+ LIBDIRS="$IN_LIBDIRS $XDIRS /usr/shlib /usr/lib /lib"
+ F=
+ for LIBDIR in $LIBDIRS; do
+- LIBS="Xft2 Xft"
++ LIBS="Xft Xft2"
+ for LIB in $LIBS; do
+ FOUND_LIB=`ls ${LIBDIR}/lib${LIB}.* 2>/dev/null`
+ if [ ! -z "$FOUND_LIB" ]; then
diff --git a/x11-toolkits/qt33/files/patch-qanimationwriter.cpp b/x11-toolkits/qt33/files/patch-qanimationwriter.cpp
new file mode 100644
index 000000000000..9e7db8a94a02
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-qanimationwriter.cpp
@@ -0,0 +1,10 @@
+--- tools/qvfb/qanimationwriter.cpp.orig Wed Nov 27 02:45:38 2002
++++ tools/qvfb/qanimationwriter.cpp Wed Nov 27 02:45:56 2002
+@@ -25,6 +25,7 @@
+
+ #include <png.h>
+ #include <netinet/in.h> // for htonl
++#include <limits.h>
+
+ class QAnimationWriterData {
+ public:
diff --git a/x11-toolkits/qt33/files/patch-qfiledialog.cpp b/x11-toolkits/qt33/files/patch-qfiledialog.cpp
new file mode 100644
index 000000000000..79ae98e8f03b
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-qfiledialog.cpp
@@ -0,0 +1,11 @@
+--- src/dialogs/qfiledialog.cpp Thu Nov 7 14:07:21 2002
++++ /cvs/qt-copy/src/dialogs/qfiledialog.cpp Thu Nov 21 13:06:09 2002
+@@ -3170,7 +3170,7 @@
+ user = dr.mid( 1, i-1 ).local8Bit();
+ dr = dr.mid( i, dr.length() );
+ struct passwd *pw;
+-#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
++#if 0
+ struct passwd mt_pw;
+ char buffer[2048];
+ if ( ::getpwnam_r( user, &mt_pw, buffer, 2048, &pw ) == 0 && pw == &mt_pw )
diff --git a/x11-toolkits/qt33/files/patch-qlock.cpp b/x11-toolkits/qt33/files/patch-qlock.cpp
new file mode 100644
index 000000000000..ee610b2d46b2
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-qlock.cpp
@@ -0,0 +1,10 @@
+--- src/kernel/qlock.cpp.orig Mon Dec 9 04:40:45 2002
++++ src/kernel/qlock.cpp Sun Dec 29 05:31:54 2002
+@@ -41,6 +41,7 @@
+ #include <sys/file.h>
+ #else
+ #include <sys/types.h>
++#include <sys/ipc.h>
+ #include <sys/sem.h>
+ #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
+ || defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI)
diff --git a/x11-toolkits/qt33/files/patch-qmake b/x11-toolkits/qt33/files/patch-qmake
deleted file mode 100644
index 0a5359d9de4e..000000000000
--- a/x11-toolkits/qt33/files/patch-qmake
+++ /dev/null
@@ -1,7 +0,0 @@
---- qmake/GNUmakefile.in Fri Apr 12 06:20:21 2002
-+++ qmake/GNUmakefile.in Fri Jul 19 12:44:25 2002
-@@ -13,3 +13,3 @@
-
--CFLAGS=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-+CFLAGS+=@QMAKE_CFLAGS@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
- -I@OUT_QTDIR@/include -I@REL_QTDIR@/include -I@OUT_QTDIR@/src/tools \
diff --git a/x11-toolkits/qt33/files/qapplication.cpp.diff b/x11-toolkits/qt33/files/qapplication.cpp.diff
new file mode 100644
index 000000000000..b84fd01f8f74
--- /dev/null
+++ b/x11-toolkits/qt33/files/qapplication.cpp.diff
@@ -0,0 +1,74 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication.cpp,v
+retrieving revision 1.61
+retrieving revision 1.62
+diff -u -p -r1.61 -r1.62
+--- qt-copy/src/kernel/qapplication.cpp 2002/11/13 16:46:34 1.61
++++ qt-copy/src/kernel/qapplication.cpp 2002/11/14 08:57:34 1.62
+@@ -3257,6 +3257,66 @@ Q_EXPORT void qt_dispatchEnterLeave( QWi
+ }
+
+
++#ifdef Q_WS_MACX
++extern QWidget *qt_tryModalHelperMac( QWidget * top ); //qapplication_mac.cpp
++#endif
++
++
++/*!\internal
++
++ Called from qapplication_<platform>.cpp, returns TRUE
++ if the widget should accept the event.
++ */
++bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ) {
++ QWidget *modal=0, *top=QApplication::activeModalWidget();
++ if ( rettop ) *rettop = top;
++
++ if ( qApp->activePopupWidget() )
++ return TRUE;
++
++#ifdef Q_WS_MACX
++ top = qt_tryModalHelperMac( top );
++ if ( rettop ) *rettop = top;
++#endif
++
++ QWidget* groupLeader = widget;
++ widget = widget->topLevelWidget();
++
++ if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
++ modal = widget;
++ if ( !top || modal == top ) // don't block event
++ return TRUE;
++
++ QWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
++ while ( p ) {
++ if ( p == top )
++ return TRUE;
++ p = p->parentWidget();
++ }
++
++ while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
++ groupLeader = groupLeader->parentWidget();
++
++ if ( groupLeader ) {
++ // Does groupLeader have a child in qt_modal_stack?
++ bool unrelated = TRUE;
++ modal = qt_modal_stack->first();
++ while (modal && unrelated) {
++ QWidget* p = modal->parentWidget();
++ while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
++ p = p->parentWidget();
++ }
++ modal = qt_modal_stack->next();
++ if ( p == groupLeader ) unrelated = FALSE;
++ }
++
++ if ( unrelated )
++ return TRUE; // don't block event
++ }
++ return FALSE;
++}
++
++
+ /*!
+ Returns the desktop widget (also called the root window).
+
diff --git a/x11-toolkits/qt33/files/qapplication_p.h.diff b/x11-toolkits/qt33/files/qapplication_p.h.diff
new file mode 100644
index 000000000000..8b9268c696b8
--- /dev/null
+++ b/x11-toolkits/qt33/files/qapplication_p.h.diff
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_p.h,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -p -r1.21 -r1.22
+--- qt-copy/src/kernel/qapplication_p.h 2002/11/13 16:46:34 1.21
++++ qt-copy/src/kernel/qapplication_p.h 2002/11/14 08:57:34 1.22
+@@ -83,7 +83,6 @@ extern int qt_ncols_option;
+
+
+ extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
+-
+-
++extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
+
+ #endif
diff --git a/x11-toolkits/qt33/files/qapplication_x11.cpp.diff b/x11-toolkits/qt33/files/qapplication_x11.cpp.diff
new file mode 100644
index 000000000000..877de05c5950
--- /dev/null
+++ b/x11-toolkits/qt33/files/qapplication_x11.cpp.diff
@@ -0,0 +1,48 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qapplication_x11.cpp,v
+retrieving revision 1.81
+retrieving revision 1.82
+diff -u -p -r1.81 -r1.82
+--- qt-copy/src/kernel/qapplication_x11.cpp 2002/11/13 16:46:34 1.81
++++ qt-copy/src/kernel/qapplication_x11.cpp 2002/11/14 08:57:34 1.82
+@@ -3691,39 +3691,9 @@ void qt_leave_modal( QWidget *widget )
+
+ bool qt_try_modal( QWidget *widget, XEvent *event )
+ {
+- if ( qApp->activePopupWidget() )
++ if ( qt_tryModalHelper( widget ) )
+ return TRUE;
+
+- QWidget *modal=0, *top=QApplication::activeModalWidget();
+-
+- QWidget* groupLeader = widget;
+- widget = widget->topLevelWidget();
+-
+- if ( widget->testWFlags(Qt::WShowModal) ) // widget is modal
+- modal = widget;
+- if ( !top || modal == top ) // don't block event
+- return TRUE;
+-
+- while ( groupLeader && !groupLeader->testWFlags( Qt::WGroupLeader ) )
+- groupLeader = groupLeader->parentWidget();
+-
+- if ( groupLeader ) {
+- // Does groupLeader have a child in qt_modal_stack?
+- bool unrelated = TRUE;
+- modal = qt_modal_stack->first();
+- while (modal && unrelated) {
+- QWidget* p = modal->parentWidget();
+- while ( p && p != groupLeader && !p->testWFlags( Qt::WGroupLeader) ) {
+- p = p->parentWidget();
+- }
+- modal = qt_modal_stack->next();
+- if ( p == groupLeader ) unrelated = FALSE;
+- }
+-
+- if ( unrelated )
+- return TRUE; // don't block event
+- }
+-
+ bool block_event = FALSE;
+ switch ( event->type ) {
+ case ButtonPress: // disallow mouse/key events
diff --git a/x11-toolkits/qt33/files/qeffects.cpp.diff b/x11-toolkits/qt33/files/qeffects.cpp.diff
new file mode 100644
index 000000000000..4ad9ee987455
--- /dev/null
+++ b/x11-toolkits/qt33/files/qeffects.cpp.diff
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/qt-copy/src/widgets/qeffects.cpp,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -p -r1.18 -r1.19
+--- qt-copy/src/widgets/qeffects.cpp 2002/10/30 01:54:25 1.18
++++ qt-copy/src/widgets/qeffects.cpp 2002/11/21 01:30:32 1.19
+@@ -275,6 +275,7 @@ void QAlphaWidget::render()
+ q_blend = 0;
+ deleteLater();
+ } else {
++ widget->clearWState( WState_ForceHide );
+ alphaBlend();
+ pm = mixed;
+ repaint( FALSE );
+@@ -505,6 +506,7 @@ void QRollEffect::run( int time )
+ void QRollEffect::scroll()
+ {
+ if ( !done ) {
++ widget->clearWState( WState_ForceHide );
+ int tempel = checkTime.elapsed();
+ if ( elapsed >= tempel )
+ elapsed++;
diff --git a/x11-toolkits/qt33/files/qwidget_x11.cpp.diff b/x11-toolkits/qt33/files/qwidget_x11.cpp.diff
new file mode 100644
index 000000000000..de7fa1e41c6f
--- /dev/null
+++ b/x11-toolkits/qt33/files/qwidget_x11.cpp.diff
@@ -0,0 +1,15 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qwidget_x11.cpp,v
+retrieving revision 1.55
+retrieving revision 1.56
+diff -u -p -r1.55 -r1.56
+--- qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 16:46:35 1.55
++++ qt-copy/src/kernel/qwidget_x11.cpp 2002/11/13 17:28:42 1.56
+@@ -1561,7 +1561,6 @@ void QWidget::showMinimized()
+ else {
+ topData()->showMode = 1;
+ show();
+- hideChildren( FALSE );
+ }
+ } else {
+ show();
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-08 20:44:47 +0000