Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25204/common/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
whups, need to commit to test
Index: qt3.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11/qt3.info,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- qt3.info 23 Mar 2006 06:28:37 -0000 1.47
+++ qt3.info 24 Mar 2006 16:02:19 -0000 1.48
@@ -16,8 +16,8 @@
Source: mirror:custom:qt-x11-free-%v.tar.bz2
Source-MD5: dc1384c03ac08af21f6fefab32d982cf
SourceDirectory: qt-x11-free-%v
-Source2: http://ranger.befunk.com/fink/qt-upstream-patches-0002.tar.bz2
-Source2-MD5: 85bd46f2c4b820ae6b64271dae173b4b
+Source2: http://ranger.befunk.com/fink/qt-upstream-patches-0003.tar.bz2
+Source2-MD5: cfe0cc6a7a8411bce151ebfaaa7e03e7
Source2ExtractDir: qt-x11-free-%v
Description: Cross-Platform GUI application framework
Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r),
%N-doc (>= %v-%r), pkgconfig, macosx (>= 10.4.3-1)
@@ -37,18 +37,43 @@
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.5-uic.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/0056-khotkeys_input_84434.rr.patch \
patches/qt-x11-free-3.3.4-fullscreen.patch \
; do
echo "patching with $patch"
patch -p1 --fuzz=4 < $patch
done
+ for patch in \
+ patches/0001-dnd_optimization.patch \
+ patches/0002-dnd_active_window_fix.patch \
+ patches/0005-qpixmap_mitshm.patch \
+ patches/0007-qpixmap_constants.patch \
+ patches/0015-qiconview-finditem.patch \
+ patches/0016-qiconview-rebuildcontainer.patch \
+ patches/0017-qiconview-ctrl_rubber.patch \
+ patches/0020-designer-deletetabs.patch \
+ patches/0032-fix_rotated_randr.diff \
+ patches/0035-qvaluelist-streaming-operator.patch \
+ patches/0036-qprogressbar-optimization.patch \
+ patches/0038-dragobject-dont-prefer-unknown.patch \
+ patches/0044-qscrollview-windowactivate-fix.diff \
+ patches/0046-qiconview-no-useless-scrollbar.diff \
+ patches/0047-fix-kmenu-width.diff \
+ patches/0048-qclipboard_hack_80072.patch \
+ patches/0049-qiconview-rubber_on_move.diff \
+ patches/0056-khotkeys_input_84434.patch \
+ patches/0059-qpopup_has_mouse.patch \
+ patches/0060-qpopup_ignore_mousepos.patch \
+ patches/0061-qscrollview-propagate-horizontal-wheelevent.patch \
+ patches/0069-fix-minsize.patch \
+ ; do
+ echo "patching with $patch"
+ patch -p0 --fuzz=4 < $patch
+ done
+
<<
NoSetLDFLAGS: true
CompileScript: <<
Index: qt3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- qt3.patch 21 Mar 2006 18:50:43 -0000 1.36
+++ qt3.patch 24 Mar 2006 16:02:19 -0000 1.37
@@ -73,24 +73,6 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/include/qprogressbar.h 2006-03-08 11:47:58.000000000
-0500
-+++ qt-x11-free-3.3.6-new/include/qprogressbar.h 2006-03-19
19:02:19.000000000 -0500
-@@ -61,6 +61,7 @@
- public:
- QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
- QProgressBar( int totalSteps, QWidget* parent=0, const char* name=0,
WFlags f=0 );
-+ virtual ~QProgressBar();
-
- int totalSteps() const;
- int progress() const;
-@@ -91,6 +92,7 @@
- virtual bool setIndicator( QString & progress_str, int progress,
- int totalSteps );
- void styleChange( QStyle& );
-+ bool requireRepaint( int newProgress ) const;
-
- private:
- int total_steps;
--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf 2006-03-08
11:48:20.000000000 -0500
+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-20
10:03:17.000000000 -0500
@@ -9,10 +9,10 @@
@@ -266,18 +248,6 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp 2006-03-08
11:47:47.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp 2006-03-19
19:02:19.000000000 -0500
-@@ -2671,6 +2671,9 @@
-
- void QWidget::createInputContext()
- {
-+ if( !isInputMethodEnabled() || QApplication::closingDown() )
-+ return;
-+
- QWidget *tlw = topLevelWidget();
- QTLWExtra *topdata = tlw->topData();
-
--- qt-x11-free-3.3.6/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
+++ qt-x11-free-3.3.6-new/src/moc/moc.pro 2006-03-19 19:02:19.000000000
-0500
@@ -48,6 +48,8 @@
@@ -459,55 +429,6 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp 2006-03-08
11:47:58.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp 2006-03-19
19:02:19.000000000 -0500
-@@ -105,7 +105,6 @@
- initFrame();
- }
-
--
- /*!
- Constructs a progress bar.
-
-@@ -136,6 +135,9 @@
- initFrame();
- }
-
-+QProgressBar::~QProgressBar()
-+{
-+}
-
- /*!
- Reset the progress bar. The progress bar "rewinds" and shows no
-@@ -318,6 +320,10 @@
- QFrame::styleChange( old );
- }
-
-+bool QProgressBar::requireRepaint( int newProgress ) const
-+{
-+ return false;
-+}
-
- /*!
- This method is called to generate the text displayed in the center
---- qt-x11-free-3.3.6/src/widgets/qprogressbar.h 2006-03-08
11:47:58.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h 2006-03-19
19:02:19.000000000 -0500
-@@ -61,6 +61,7 @@
- public:
- QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
- QProgressBar( int totalSteps, QWidget* parent=0, const char* name=0,
WFlags f=0 );
-+ virtual ~QProgressBar();
-
- int totalSteps() const;
- int progress() const;
-@@ -91,6 +92,7 @@
- virtual bool setIndicator( QString & progress_str, int progress,
- int totalSteps );
- void styleChange( QStyle& );
-+ bool requireRepaint( int newProgress ) const;
-
- private:
- int total_steps;
--- qt-x11-free-3.3.6/tools/assistant/assistant.pro 2003-11-17
07:40:25.000000000 -0500
+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-19
19:02:19.000000000 -0500
@@ -32,6 +32,8 @@
@@ -550,22 +471,6 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
---- qt-x11-free-3.3.6/tools/designer/uic/form.cpp 2005-08-31
06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp 2006-03-19
19:02:19.000000000 -0500
-@@ -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();
--- qt-x11-free-3.3.6/tools/designer/uic/uic.pro 2003-10-31
09:36:28.000000000 -0500
+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro 2006-03-19
19:02:19.000000000 -0500
@@ -40,3 +40,6 @@
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
