aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/qt-ibase-plugin/Makefile3
-rw-r--r--databases/qt-mysql-plugin/Makefile2
-rw-r--r--databases/qt-odbc-plugin/Makefile2
-rw-r--r--databases/qt-pgsql-plugin/Makefile2
-rw-r--r--databases/qt-sqlite-plugin/Makefile2
-rw-r--r--devel/qmake/Makefile2
-rw-r--r--devel/qmake/distinfo4
-rw-r--r--devel/qmake/pkg-plist6
-rw-r--r--x11-toolkits/qt33/Makefile6
-rw-r--r--x11-toolkits/qt33/distinfo4
-rw-r--r--x11-toolkits/qt33/files/0037-dnd-timestamp-fix.patch56
-rw-r--r--x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch9
-rw-r--r--x11-toolkits/qt33/files/0064-fix_gcc4.patch21
-rw-r--r--x11-toolkits/qt33/files/patch-src_widgets-qlistview.cpp10
-rw-r--r--x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp16
-rw-r--r--x11-toolkits/qt33/files/patch-visibility65
-rw-r--r--x11-toolkits/qt33/pkg-plist2
17 files changed, 132 insertions, 80 deletions
diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile
index 098356af050a..40495332aa4a 100644
--- a/databases/qt-ibase-plugin/Makefile
+++ b/databases/qt-ibase-plugin/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.4
-PORTREVISION= 1
+PORTVERSION= 3.3.5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index fb03151669d3..ac109dcc0863 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 64d07853460e..b47865ab2aab 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index f20b6a99e1d4..5159a8613795 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index 23e331fecf4c..d6d8f97fa675 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index f6059b382e6a..dc42a03c2cb6 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= qmake
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/devel/qmake/distinfo b/devel/qmake/distinfo
index a75bf1962bb1..e49cf3493a9a 100644
--- a/devel/qmake/distinfo
+++ b/devel/qmake/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
-SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
+MD5 (KDE/qt-x11-free-3.3.5.tar.bz2) = 05d04688c0c0230ed54e89102d689ca4
+SIZE (KDE/qt-x11-free-3.3.5.tar.bz2) = 14431679
diff --git a/devel/qmake/pkg-plist b/devel/qmake/pkg-plist
index 4f4e498d24e4..2ec2becdc304 100644
--- a/devel/qmake/pkg-plist
+++ b/devel/qmake/pkg-plist
@@ -19,6 +19,8 @@ dgux-g++/qmake.conf
dgux-g++/qplatformdefs.h
freebsd-g++/qmake.conf
freebsd-g++/qplatformdefs.h
+freebsd-g++34/qmake.conf
+freebsd-g++34/qplatformdefs.h
freebsd-icc/qmake.conf
freebsd-icc/qplatformdefs.h
hpux-acc-64/qmake.conf
@@ -123,6 +125,8 @@ win32-msvc/qplatformdefs.h
win32-msvc/win32app.dsp
win32-msvc/win32dll.dsp
win32-msvc/win32lib.dsp
+win32-msvc2005/qmake.conf
+win32-msvc2005/qplatformdefs.h
win32-watcom/qmake.conf
@dirrm aix-g++
@dirrm aix-g++-64
@@ -133,6 +137,7 @@ win32-watcom/qmake.conf
@dirrm darwin-g++
@dirrm dgux-g++
@dirrm freebsd-g++
+@dirrm freebsd-g++34
@dirrm freebsd-icc
@dirrm hpux-acc
@dirrm hpux-acc-64
@@ -180,6 +185,7 @@ win32-watcom/qmake.conf
@dirrm win32-icc
@dirrm win32-msvc
@dirrm win32-msvc.net
+@dirrm win32-msvc2005
@dirrm win32-watcom
@unexec rmdir %%_PREFIX%%/share/qt/mkspecs
@unexec rmdir %%_PREFIX%%/share/qt || echo %%_PREFIX%%/share/qt is still in use -- probably by the rest of Qt
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 5e759ef82a3c..18afaa582acb 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
@@ -126,7 +126,6 @@ EXTRA_PATCHES= ${PATCHDIR}/0001-dnd_optimization.patch \
${PATCHDIR}/0020-designer-deletetabs.patch \
${PATCHDIR}/0032-fix_rotated_randr.diff \
${PATCHDIR}/0035-qvaluelist-streaming-operator.patch \
- ${PATCHDIR}/0037-dnd-timestamp-fix.patch \
${PATCHDIR}/0038-dragobject-dont-prefer-unknown.patch \
${PATCHDIR}/0044-qscrollview-windowactivate-fix.diff \
${PATCHDIR}/0046-qiconview-no-useless-scrollbar.diff \
@@ -138,7 +137,8 @@ EXTRA_PATCHES= ${PATCHDIR}/0001-dnd_optimization.patch \
${PATCHDIR}/0056-khotkeys_input_84434.patch \
${PATCHDIR}/0059-qpopup_has_mouse.patch \
${PATCHDIR}/0060-qpopup_ignore_mousepos.patch \
- ${PATCHDIR}/0061-qscrollview-propagate-horizontal-wheelevent.patch
+ ${PATCHDIR}/0061-qscrollview-propagate-horizontal-wheelevent.patch \
+ ${PATCHDIR}/0064-fix_gcc4.patch
PKGNAMESUFFIX= -copy
COMMENT+= (+ KDE patches)
CONFLICTS+= qt-3.3.*
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index a75bf1962bb1..e49cf3493a9a 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.4.tar.bz2) = 027f4e82fbe592b39d2f160bfb3a73af
-SIZE (KDE/qt-x11-free-3.3.4.tar.bz2) = 14439722
+MD5 (KDE/qt-x11-free-3.3.5.tar.bz2) = 05d04688c0c0230ed54e89102d689ca4
+SIZE (KDE/qt-x11-free-3.3.5.tar.bz2) = 14431679
diff --git a/x11-toolkits/qt33/files/0037-dnd-timestamp-fix.patch b/x11-toolkits/qt33/files/0037-dnd-timestamp-fix.patch
deleted file mode 100644
index 234e1b794705..000000000000
--- a/x11-toolkits/qt33/files/0037-dnd-timestamp-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-qt-bugs@ issue : 38794
-bugs.kde.org number : 69519
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
- Hello,
-
-please consider applying the attached patch. It changes XDND handling code to
-put the drop timestamp in the right field in the XdndDrop message according
-to http://www.newplanetsoftware.com/xdnd/ . I'm not quite sure why the code
-has the field moved by one, and puts 1<<24 in the flags, but I see it has a
-todo mark next to it. The last snippet of the patch changes it to match the
-XDND spec. I tested briefly with Gtk, Mozilla and OOo, and they still work
-with the patch.
-
-The rest of the patch is for fixing part of
-http://bugs.kde.org/show_bug.cgi?id=69519, when the user drags some data to
-the desktop, and desktop in response popups a dialog asking for filename.
-Without the X user timestamp (qt-bugs@ issue 24923) being updated after the
-drop, KWin's focus stealing prevention will refuse to activate the dialog. As
-the XdndDrop message is kind of an user action too, the timestamp should be
-updated.
-
---- src/kernel/qdnd_x11.cpp.sav 2004-01-05 19:18:33.000000000 +0100
-+++ src/kernel/qdnd_x11.cpp 2004-01-08 19:08:52.000000000 +0100
-@@ -81,6 +81,7 @@ extern void qt_leave_modal( QWidget *wid
- extern Window qt_x11_findClientWindow( Window, Atom, bool );
- extern Atom qt_wm_state;
- extern Time qt_x_time;
-+extern Time qt_x_user_time;
-
- // this stuff is copied from qclb_x11.cpp
-
-@@ -834,6 +835,9 @@ void qt_handle_xdnd_drop( QWidget *, con
- // l[0], qt_xdnd_dragsource_xid );
- return;
- }
-+
-+ if( l[2] != 0 )
-+ qt_x_user_time = l[2];
- if ( qt_xdnd_source_object )
- qt_xdnd_source_object->setTarget( qt_xdnd_current_widget );
-
-@@ -1366,9 +1370,9 @@ void QDragManager::drop()
- drop.format = 32;
- drop.message_type = qt_xdnd_drop;
- drop.data.l[0] = object->source()->winId();
-- drop.data.l[1] = 1 << 24; // flags
-- drop.data.l[2] = 0; // ###
-- drop.data.l[3] = qt_x_time;
-+ drop.data.l[1] = 0; // flags
-+ drop.data.l[2] = qt_x_time;
-+ drop.data.l[3] = 0;
- drop.data.l[4] = 0;
-
- QWidget * w = QWidget::find( qt_xdnd_current_proxy_target );
diff --git a/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch b/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch
index 426338e3d783..73ba70894f58 100644
--- a/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch
+++ b/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch
@@ -12,15 +12,6 @@ retrieving revision 1.65
diff -u -3 -p -r1.65 qscrollview.cpp
--- src/widgets/qscrollview.cpp 29 Apr 2004 22:31:28 -0000 1.65
+++ src/widgets/qscrollview.cpp 25 Jan 2005 12:07:04 -0000
-@@ -1180,7 +1180,7 @@ void QScrollView::mouseMoveEvent( QMous
- void QScrollView::wheelEvent( QWheelEvent *e )
- {
- QWheelEvent ce( viewport()->mapFromGlobal( e->globalPos() ),
-- e->globalPos(), e->delta(), e->state());
-+ e->globalPos(), e->delta(), e->state(), e->orientation() );
- viewportWheelEvent(&ce);
- if ( !ce.isAccepted() ) {
- if ( e->orientation() == Horizontal && horizontalScrollBar() )
@@ -1863,7 +1863,7 @@ void QScrollView::viewportWheelEvent( QW
the event itself.
*/
diff --git a/x11-toolkits/qt33/files/0064-fix_gcc4.patch b/x11-toolkits/qt33/files/0064-fix_gcc4.patch
new file mode 100644
index 000000000000..f10bc98655a6
--- /dev/null
+++ b/x11-toolkits/qt33/files/0064-fix_gcc4.patch
@@ -0,0 +1,21 @@
+qt-bugs@ issue : none yet
+bugs.kde.org number : none
+applied: no
+author: Dirk Mueller <mueller@kde.org>
+
+This fixes Qt buildkey generation to use the same buildkey for all gcc 4.0.x compilers, because
+they produce binary compatible code. This way one doesn't have to rebuild all of Qt and all
+Qt plugins just because of the daily gcc version bump.
+
+--- configure.orig 2005-07-29 17:04:29.000000000 +0200
++++ configure 2005-07-29 17:04:54.000000000 +0200
+@@ -3030,6 +3030,9 @@
+ *3.*)
+ COMPILER_VERSION="3.*"
+ ;;
++ *4.0*)
++ COMPILER_VERSION="4.0*"
++ ;;
+ *)
+ ;;
+ esac
diff --git a/x11-toolkits/qt33/files/patch-src_widgets-qlistview.cpp b/x11-toolkits/qt33/files/patch-src_widgets-qlistview.cpp
new file mode 100644
index 000000000000..47e5e27a0ad7
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-src_widgets-qlistview.cpp
@@ -0,0 +1,10 @@
+--- src/widgets/qlistview.cpp.orig Sat Nov 5 05:43:59 2005
++++ src/widgets/qlistview.cpp Sat Nov 5 05:45:00 2005
+@@ -3231,6 +3231,7 @@
+ d->focusItem = 0;
+ d->selectAnchor = 0;
+ d->pressedItem = 0;
++ d->highlighted = 0;
+
+ // if it's down its downness makes no sense, so undown it
+ d->buttonDown = FALSE;
diff --git a/x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp b/x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp
new file mode 100644
index 000000000000..a9985d5ab9ff
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp
@@ -0,0 +1,16 @@
+--- tools/designer/uic/form.cpp
++++ tools/designer/uic/form.cpp
+@@ -731,6 +731,13 @@
+ while ( !n2.isNull() ) {
+ if ( n2.tagName() == "includehint" ) {
+ QString file = n2.firstChild().toText().data();
++ int colons = file.find("::");
++
++ if (colons != -1)
++ {
++ file = file.right(file.length() - colons - 2);
++ }
++
+ localIncludes += file;
+ }
+ n2 = n2.nextSibling().toElement();
diff --git a/x11-toolkits/qt33/files/patch-visibility b/x11-toolkits/qt33/files/patch-visibility
new file mode 100644
index 000000000000..df4828e4c6e7
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-visibility
@@ -0,0 +1,65 @@
+Index: src/kernel/qgplugin.h
+===================================================================
+--- src/kernel/qgplugin.h (revision 423270)
++++ src/kernel/qgplugin.h (working copy)
+@@ -90,35 +90,19 @@
+ return i->iface(); \
+ }
+
+-# ifdef Q_WS_WIN
+-# ifdef Q_CC_BOR
+-# define Q_EXPORT_PLUGIN(PLUGIN) \
+- Q_PLUGIN_VERIFICATION_DATA \
+- Q_EXTERN_C __declspec(dllexport) \
+- const char * __stdcall qt_ucm_query_verification_data() \
+- { return qt_ucm_verification_data; } \
+- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
+- __stdcall ucm_instantiate() \
+- Q_PLUGIN_INSTANTIATE( PLUGIN )
+-# else
+-# define Q_EXPORT_PLUGIN(PLUGIN) \
+- Q_PLUGIN_VERIFICATION_DATA \
+- Q_EXTERN_C __declspec(dllexport) \
+- const char *qt_ucm_query_verification_data() \
+- { return qt_ucm_verification_data; } \
+- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
+- Q_PLUGIN_INSTANTIATE( PLUGIN )
+-# endif
+-# else
+-# define Q_EXPORT_PLUGIN(PLUGIN) \
++#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
++# define Q_STDCALL __stdcall
++#else
++# define Q_STDCALL
++#endif
++
++#define Q_EXPORT_PLUGIN(PLUGIN) \
+ Q_PLUGIN_VERIFICATION_DATA \
+- Q_EXTERN_C \
+- const char *qt_ucm_query_verification_data() \
++ Q_EXTERN_C Q_EXPORT \
++ const char * Q_STDCALL qt_ucm_query_verification_data() \
+ { return qt_ucm_verification_data; } \
+- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
++ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
+ Q_PLUGIN_INSTANTIATE( PLUGIN )
+-# endif
+-
+ #endif
+
+ struct QUnknownInterface;
+Index: src/tools/qglobal.h
+===================================================================
+--- src/tools/qglobal.h (revision 423270)
++++ src/tools/qglobal.h (working copy)
+@@ -865,6 +865,10 @@
+ # define Q_TEMPLATE_EXTERN
+ # undef Q_DISABLE_COPY /* avoid unresolved externals */
+ # endif
++#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
++# define Q_EXPORT __attribute__((visibility("default")))
++# undef QT_MAKEDLL /* ignore these for other platforms */
++# undef QT_DLL
+ #else
+ # undef QT_MAKEDLL /* ignore these for other platforms */
+ # undef QT_DLL
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 2bd917f9b021..cdcbc89c74f4 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -415,7 +415,7 @@ lib/libqt-mt.prl
lib/libqt-mt.so
lib/libqt-mt.so.3
lib/libqt-mt.so.3.3
-lib/libqt-mt.so.3.3.4
+lib/libqt-mt.so.3.3.5
lib/libqui.prl
lib/libqui.so
lib/libqui.so.1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 14:29:15 +0000