Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10731/10.3/unstable/main/finkinfo/x11
Modified Files: qt3.info qt3.patch Log Message: incorporated some patches from other distributors; I believe this fixes the crash on kde shutdown Index: qt3.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/qt3.info,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- qt3.info 17 Feb 2006 03:02:15 -0000 1.26 +++ qt3.info 2 Mar 2006 12:57:24 -0000 1.27 @@ -1,6 +1,6 @@ Package: qt3 Version: 3.3.5 -Revision: 16 +Revision: 17 Description: Cross-Platform GUI application framework License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> @@ -26,12 +26,35 @@ nam-US: http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source << Source: mirror:custom:qt-x11-free-%v.tar.bz2 +Source2: http://ranger.befunk.com/fink/qt-upstream-patches-0002.tar.bz2 SourceDirectory: qt-x11-free-%v +Source2ExtractDir: qt-x11-free-%v Source-MD5: 05d04688c0c0230ed54e89102d689ca4 +Source2-MD5: 85bd46f2c4b820ae6b64271dae173b4b PatchScript: << #!/bin/sh -ex sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 perl -pi -e 's|cp \-P|/bin/cp \-RL|' qmake/Makefile.unix + + for patch in \ + patches/qt-3.3.4-print-CJK.patch \ + patches/qt-3.0.5-nodebug.patch \ + patches/qt-x11-free-3.3.2-quiet.patch \ + patches/qt-uic-nostdlib.patch \ + patches/qt-x11-free-3.3.4-qfontdatabase_x11.patch \ + patches/qt-3.3.3-gtkstyle.patch \ + patches/0038-dragobject-dont-prefer-unknown.rr.patch \ + patches/0047-fix-kmenu-width.rr.diff \ + patches/0048-qclipboard_hack_80072.rr.patch \ + patches/0051-qtoolbar_77047.rr.patch \ + patches/0056-khotkeys_input_84434.rr.patch \ + patches/qt-x11-free-3.3.4-assistant_de.patch \ + patches/qt-x11-free-3.3.4-fullscreen.patch \ + patches/qt-x11-free-3.3.5-warning.patch \ + ; do + echo "patching with $patch" + patch -p1 --fuzz=4 < $patch + done << NoSetLDFLAGS: true @@ -127,17 +150,21 @@ install -d -m 0755 %i/lib/qt3-plugins /bin/cp -fRL plugins/* %i/lib/qt3-plugins/ + ln -sf libdesignercore.1.0.0.dylib %i/lib/libdesignercore.1.0.dylib + ln -sf libdesignercore.1.0.dylib %i/lib/libdesignercore.1.dylib + ln -sf libdesignercore.1.dylib %i/lib/libdesignercore.dylib + ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.0.dylib - ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.dylib - ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.dylib + ln -sf libeditor.1.0.dylib %i/lib/libeditor.1.dylib + ln -sf libeditor.1.dylib %i/lib/libeditor.dylib - ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.3.dylib - ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.dylib - ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.dylib + ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.3.dylib + ln -sf libqt-mt.3.3.dylib %i/lib/libqt-mt.3.dylib + ln -sf libqt-mt.3.dylib %i/lib/libqt-mt.dylib ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.0.dylib - ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.dylib - ln -sf libqui.1.0.0.dylib %i/lib/libqui.dylib + ln -sf libqui.1.0.dylib %i/lib/libqui.1.dylib + ln -sf libqui.1.dylib %i/lib/libqui.dylib install -d -m 0755 %i/lib/pkgconfig install -c -m 644 %i/lib/qt-mt.pc %i/lib/pkgconfig/ Index: qt3.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/qt3.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- qt3.patch 26 Feb 2006 23:21:31 -0000 1.13 +++ qt3.patch 2 Mar 2006 12:57:24 -0000 1.14 @@ -364,16 +364,6 @@ class Q_EXPORT QImageConsumer { public: ---- qt-x11-free-3.3.5/src/kernel/qclipboard_x11.cpp 2005-09-02 08:43:00.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/kernel/qclipboard_x11.cpp 2006-02-11 11:24:11.000000000 -0500 -@@ -109,6 +109,7 @@ - static bool pending_clipboard_changed = FALSE; - static bool pending_selection_changed = FALSE; - -+Q_EXPORT bool qt_qclipboard_bailout_hack = false; - - // event capture mechanism for qt_xclb_wait_for_event - static bool waiting_for_data = FALSE; --- qt-x11-free-3.3.5/src/kernel/qimageformatinterface_p.h 2005-09-02 08:43:04.000000000 -0400 +++ qt-x11-free-3.3.5-new/src/kernel/qimageformatinterface_p.h 2006-02-11 11:24:10.000000000 -0500 @@ -40,6 +40,9 @@ @@ -844,3 +834,15 @@ +CFLAGS += -mdynamic-no-pic +CXXFLAGS += -mdynamic-no-pic REQUIRES=full-config nocrosscompiler !win32* +--- qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp.orig 2006-03-02 00:21:49.000000000 -0500 ++++ qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp 2006-03-02 00:22:47.000000000 -0500 +@@ -2670,6 +2670,9 @@ + + void QWidget::createInputContext() + { ++ if( !isInputMethodEnabled() || QApplication::closingDown() ) ++ return; ++ + QWidget *tlw = topLevelWidget(); + QTLWExtra *topdata = tlw->topData(); + ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits