Guys,
After working to build Qt3 from svn for a day, it became clear that a bit of cleanup will be needed on the code before and getting a handle on what patches it contains before it can be usable. I took a bit of time tonight to analyze the qt-x11-3.3.8b source compared to the trinitydesktop (svn) code in hope of helping move this process along.
The script I used is here: http://www.3111skyline.com/dl/dt/trinity/arch/scr/qt3srccmp.sh
The basic setup for running the script is contained in a comment in the top of the script:
#!/bin/bash --norc
## this presumes you have: ## ## (1) downloaded the trinity desktop qt3 source with svn checkout ## (2) removed the .svn files (tar --exclude-vcs -czf qt3svn.tar.gz qt3/), then untarred the files in a 'tmp-dir/qt3' ## (3) untarred the qt3-3.3.8b source into the same 'tmp-dir/qt-x11-free-3.3.8b' #
The script then loops through the files in qt-x11-3.3.8b/ and compares the files to those in trinitydesktop qt3 (svn). The script summary provides:
6420 - files examined
files in both Qt3 (svn) and qt-x11-free-3.3.8b, reported in: identical-svn-338b.txt files in qt-x11-free-3.3.8b but not in Qt3 svn, reported in: missing-svn-338b.txt diffs for files present in both with differing contents in : qtdiffs/path/to/filename.diff
All results are available in the tarball available here:
[99k] http://www.3111skyline.com/dl/dt/trinity/arch/dev/qt3-compare/qt3-svn-v-3.3....
Files included:
-> identical-svn-338b.txt - The script identifies those files that are identical between 3.3.8b code and svn (not that interesting, but useful for knowing which patches must still be applied;
-> missing-svn-338b.txt - The files that are included in qt-x11-free-3.3.8b but are MISSING in trinitydesktop qt3 (svn). This is interesting:
examples/opengl/overlay_x11/utilities/sovinfo/Makefile examples/opengl/overlay_x11/utilities/glxvisuals/Makefile extensions/nsplugin/examples/Makefile doc/Makefile src/3rdparty/Makefile src/3rdparty/zlib/Makefile
The most important output is the identification of those file present in both source trees, but where the content of the files differs. This is wher many of the problem lie, and where work will need to be done to identify what patches have been previously applied and those that still need to be applied (or those that can be removed). This information is contained in 'diff' files created for each file where this difference was encountered. The diff files are contained under the qtdiff directory in the tarball (in proper hierarchy and effect the following files:
qmake/option.cpp.diff mkspecs/hurd-g++/qmake.conf.diff mkspecs/linux-g++/qplatformdefs.h.diff mkspecs/linux-g++/qmake.conf.diff mkspecs/linux-g++-64/qmake.conf.diff examples/demo/opengl/fbm.h.diff examples/demo/opengl/fbm.c.diff tools/makeqpf/makeqpf.pro.diff tools/makeqpf/main.cpp.diff tools/mergetr/mergetr.pro.diff tools/msg2qm/msg2qm.pro.diff tools/tools.pro.diff tools/designer/designer.pro.diff tools/designer/tools/createcw/createcw.pro.diff tools/designer/uic/form.cpp.diff tools/designer/integration/designer.el.diff tools/qvfb/qvfbview.cpp.diff tools/qvfb/pda.skin.diff tools/qvfb/qvfb.cpp.diff tools/qtconfig/mainwindow.cpp.diff tools/qtconfig/mainwindow.h.diff tools/qtconfig/mainwindowbase.ui.diff tools/qembed/qembed.pro.diff doc/html/qglobal-h.html.diff src/codecs/qutfcodec.cpp.diff src/widgets/qpopupmenu.h.diff src/widgets/qcombobox.cpp.diff src/widgets/qtextedit.cpp.diff src/widgets/qtextedit.h.diff src/widgets/qscrollview.cpp.diff src/widgets/qtooltip.cpp.diff src/widgets/qmenubar.cpp.diff src/widgets/qbutton.h.diff src/widgets/qpopupmenu.cpp.diff src/widgets/qlineedit.h.diff src/widgets/qlistview.cpp.diff src/widgets/qlineedit.cpp.diff src/kernel/qdragobject.h.diff src/kernel/qfontengine_x11.cpp.diff src/kernel/qrichtext.cpp.diff src/kernel/qapplication_x11.cpp.diff src/kernel/qclipboard_x11.cpp.diff src/kernel/qfontdatabase_x11.cpp.diff src/kernel/qinputcontext_x11.cpp.diff src/kernel/qwidget.h.diff src/kernel/qrichtext_p.h.diff src/kernel/qt_kernel.pri.diff src/kernel/qwidget_x11.cpp.diff src/kernel/qobject.h.diff src/kernel/qapplication.cpp.diff src/kernel/qdnd_x11.cpp.diff src/kernel/qobject.cpp.diff src/kernel/qapplication.h.diff src/kernel/qpixmap_x11.cpp.diff src/kernel/qwidget.cpp.diff src/kernel/qdesktopwidget_x11.cpp.diff src/kernel/qt_x11_p.h.diff src/kernel/qnamespace.h.diff src/kernel/qdragobject.cpp.diff src/kernel/qevent.cpp.diff src/kernel/qfontdatabase.cpp.diff src/tools/qstring.h.diff src/tools/qlibrary.cpp.diff src/tools/qlocale.cpp.diff src/tools/qdir_unix.cpp.diff src/tools/qglobal.h.diff src/tools/qfeatures.h.diff src/tools/qfileinfo_unix.cpp.diff src/qt.pro.diff src/sql/drivers/odbc/qsql_odbc.h.diff src/sql/drivers/ibase/qsql_ibase.cpp.diff src/sql/qt_sql.pri.diff src/dialogs/qdialog.cpp.diff src/iconview/qiconview.cpp.diff src/opengl/qgl_x11.cpp.diff plugins/src/sqldrivers/odbc/odbc.pro.diff plugins/src/sqldrivers/ibase/ibase.pro.diff plugins/src/src.pro.diff configure.diff
The file diff-file-list.txt in the tarball contains this index. I suspect the diffs above are the reason I can build from the 3.3.8b code, but my build from svn crashes.
That's it for tonight. This will allow us to get a handle on what we have in the qt3 svn dir. Depending on how well documented all the current patches are that have been applied to the qt3 code in svn, it may be quicker to save the current qt3 dir on the server and to just start over with the qt-x11-3.3.8b code. It still builds fine with minimum patching. (you guys make that call)
Feel free to add/remove whatever you like from the qt3srccmp.sh script. It is as flexible as you want to make it. Adding a bash statement or 2 will allow you to get 99.9% of the information you want from the two source trees.
Hope this helps :)
Guys,
After working to build Qt3 from svn for a day, it became clear that a bit of cleanup will be needed on the code before and getting a handle on what patches it contains before it can be usable. I took a bit of time tonight to analyze the qt-x11-3.3.8b source compared to the trinitydesktop (svn) code in hope of helping move this process along.
The script I used is here: http://www.3111skyline.com/dl/dt/trinity/arch/scr/qt3srccmp.sh
The basic setup for running the script is contained in a comment in the top of the script:
#!/bin/bash --norc
## this presumes you have: ## ## (1) downloaded the trinity desktop qt3 source with svn checkout ## (2) removed the .svn files (tar --exclude-vcs -czf qt3svn.tar.gz qt3/), then untarred the files in a 'tmp-dir/qt3' ## (3) untarred the qt3-3.3.8b source into the same 'tmp-dir/qt-x11-free-3.3.8b' #
The script then loops through the files in qt-x11-3.3.8b/ and compares the files to those in trinitydesktop qt3 (svn). The script summary provides:
6420 - files examined
files in both Qt3 (svn) and qt-x11-free-3.3.8b, reported in: identical-svn-338b.txt files in qt-x11-free-3.3.8b but not in Qt3 svn, reported in: missing-svn-338b.txt diffs for files present in both with differing contents in : qtdiffs/path/to/filename.diff
All results are available in the tarball available here:
[99k] http://www.3111skyline.com/dl/dt/trinity/arch/dev/qt3-compare/qt3-svn-v-3.3....
Files included:
-> identical-svn-338b.txt - The script identifies those files that are identical between 3.3.8b code and svn (not that interesting, but useful for knowing which patches must still be applied;
-> missing-svn-338b.txt - The files that are included in qt-x11-free-3.3.8b but are MISSING in trinitydesktop qt3 (svn). This is interesting:
examples/opengl/overlay_x11/utilities/sovinfo/Makefile examples/opengl/overlay_x11/utilities/glxvisuals/Makefile extensions/nsplugin/examples/Makefile doc/Makefile src/3rdparty/Makefile src/3rdparty/zlib/Makefile
The most important output is the identification of those file present in both source trees, but where the content of the files differs. This is wher many of the problem lie, and where work will need to be done to identify what patches have been previously applied and those that still need to be applied (or those that can be removed). This information is contained in 'diff' files created for each file where this difference was encountered. The diff files are contained under the qtdiff directory in the tarball (in proper hierarchy and effect the following files:
qmake/option.cpp.diff mkspecs/hurd-g++/qmake.conf.diff mkspecs/linux-g++/qplatformdefs.h.diff mkspecs/linux-g++/qmake.conf.diff mkspecs/linux-g++-64/qmake.conf.diff examples/demo/opengl/fbm.h.diff examples/demo/opengl/fbm.c.diff tools/makeqpf/makeqpf.pro.diff tools/makeqpf/main.cpp.diff tools/mergetr/mergetr.pro.diff tools/msg2qm/msg2qm.pro.diff tools/tools.pro.diff tools/designer/designer.pro.diff tools/designer/tools/createcw/createcw.pro.diff tools/designer/uic/form.cpp.diff tools/designer/integration/designer.el.diff tools/qvfb/qvfbview.cpp.diff tools/qvfb/pda.skin.diff tools/qvfb/qvfb.cpp.diff tools/qtconfig/mainwindow.cpp.diff tools/qtconfig/mainwindow.h.diff tools/qtconfig/mainwindowbase.ui.diff tools/qembed/qembed.pro.diff doc/html/qglobal-h.html.diff src/codecs/qutfcodec.cpp.diff src/widgets/qpopupmenu.h.diff src/widgets/qcombobox.cpp.diff src/widgets/qtextedit.cpp.diff src/widgets/qtextedit.h.diff src/widgets/qscrollview.cpp.diff src/widgets/qtooltip.cpp.diff src/widgets/qmenubar.cpp.diff src/widgets/qbutton.h.diff src/widgets/qpopupmenu.cpp.diff src/widgets/qlineedit.h.diff src/widgets/qlistview.cpp.diff src/widgets/qlineedit.cpp.diff src/kernel/qdragobject.h.diff src/kernel/qfontengine_x11.cpp.diff src/kernel/qrichtext.cpp.diff src/kernel/qapplication_x11.cpp.diff src/kernel/qclipboard_x11.cpp.diff src/kernel/qfontdatabase_x11.cpp.diff src/kernel/qinputcontext_x11.cpp.diff src/kernel/qwidget.h.diff src/kernel/qrichtext_p.h.diff src/kernel/qt_kernel.pri.diff src/kernel/qwidget_x11.cpp.diff src/kernel/qobject.h.diff src/kernel/qapplication.cpp.diff src/kernel/qdnd_x11.cpp.diff src/kernel/qobject.cpp.diff src/kernel/qapplication.h.diff src/kernel/qpixmap_x11.cpp.diff src/kernel/qwidget.cpp.diff src/kernel/qdesktopwidget_x11.cpp.diff src/kernel/qt_x11_p.h.diff src/kernel/qnamespace.h.diff src/kernel/qdragobject.cpp.diff src/kernel/qevent.cpp.diff src/kernel/qfontdatabase.cpp.diff src/tools/qstring.h.diff src/tools/qlibrary.cpp.diff src/tools/qlocale.cpp.diff src/tools/qdir_unix.cpp.diff src/tools/qglobal.h.diff src/tools/qfeatures.h.diff src/tools/qfileinfo_unix.cpp.diff src/qt.pro.diff src/sql/drivers/odbc/qsql_odbc.h.diff src/sql/drivers/ibase/qsql_ibase.cpp.diff src/sql/qt_sql.pri.diff src/dialogs/qdialog.cpp.diff src/iconview/qiconview.cpp.diff src/opengl/qgl_x11.cpp.diff plugins/src/sqldrivers/odbc/odbc.pro.diff plugins/src/sqldrivers/ibase/ibase.pro.diff plugins/src/src.pro.diff configure.diff
The file diff-file-list.txt in the tarball contains this index. I suspect the diffs above are the reason I can build from the 3.3.8b code, but my build from svn crashes.
That's it for tonight. This will allow us to get a handle on what we have in the qt3 svn dir. Depending on how well documented all the current patches are that have been applied to the qt3 code in svn, it may be quicker to save the current qt3 dir on the server and to just start over with the qt-x11-3.3.8b code. It still builds fine with minimum patching. (you guys make that call)
Feel free to add/remove whatever you like from the qt3srccmp.sh script. It is as flexible as you want to make it. Adding a bash statement or 2 will allow you to get 99.9% of the information you want from the two source trees.
Hope this helps :)
I have attached the patches that were applied; this should be all of them.
Let me know if I still need to start with a clean 3.3.8b....
Tim
On 05/14/2011 01:29 PM, Timothy Pearson wrote:
I have attached the patches that were applied; this should be all of them.
Let me know if I still need to start with a clean 3.3.8b....
Tim
Thanks,
I see what I can figure out. However, we will need more eyes on this than mine :) I can analyze the differences between svn and 3.3.8b and I can work to try and get svn building, but we all want someone with more Qt3 experience to review any proposed changes, additions, etc..
When I get into the odbc code/etc.., my eyes start to glass-over :p
Le Sat, 14 May 2011 13:29:49 -0500, "Timothy Pearson" kb9vqf@pearsoncomputing.net a écrit :
Guys,
After working to build Qt3 from svn for a day, it became clear that a bit of cleanup will be needed on the code before and getting a handle on what patches it contains before it can be usable. I took a bit of time tonight to analyze the qt-x11-3.3.8b source compared to the trinitydesktop (svn) code in hope of helping move this process along.
The script I used is here: http://www.3111skyline.com/dl/dt/trinity/arch/scr/qt3srccmp.sh
The basic setup for running the script is contained in a comment in the top of the script:
#!/bin/bash --norc
## this presumes you have: ## ## (1) downloaded the trinity desktop qt3 source with svn checkout ## (2) removed the .svn files (tar --exclude-vcs -czf qt3svn.tar.gz qt3/), then untarred the files in a 'tmp-dir/qt3' ## (3) untarred the qt3-3.3.8b source into the same 'tmp-dir/qt-x11-free-3.3.8b' #
The script then loops through the files in qt-x11-3.3.8b/ and compares the files to those in trinitydesktop qt3 (svn). The script summary provides:
6420 - files examined
files in both Qt3 (svn) and qt-x11-free-3.3.8b, reported in: identical-svn-338b.txt files in qt-x11-free-3.3.8b but not in Qt3 svn, reported in: missing-svn-338b.txt diffs for files present in both with differing contents in : qtdiffs/path/to/filename.diff
All results are available in the tarball available here:
[99k] http://www.3111skyline.com/dl/dt/trinity/arch/dev/qt3-compare/qt3-svn-v-3.3....
Files included:
-> identical-svn-338b.txt - The script identifies those files that are identical between 3.3.8b code and svn (not that interesting, but useful for knowing which patches must still be applied;
-> missing-svn-338b.txt - The files that are included in qt-x11-free-3.3.8b but are MISSING in trinitydesktop qt3 (svn). This is interesting:
examples/opengl/overlay_x11/utilities/sovinfo/Makefile examples/opengl/overlay_x11/utilities/glxvisuals/Makefile extensions/nsplugin/examples/Makefile doc/Makefile src/3rdparty/Makefile src/3rdparty/zlib/Makefile
The most important output is the identification of those file present in both source trees, but where the content of the files differs. This is wher many of the problem lie, and where work will need to be done to identify what patches have been previously applied and those that still need to be applied (or those that can be removed). This information is contained in 'diff' files created for each file where this difference was encountered. The diff files are contained under the qtdiff directory in the tarball (in proper hierarchy and effect the following files:
qmake/option.cpp.diff mkspecs/hurd-g++/qmake.conf.diff mkspecs/linux-g++/qplatformdefs.h.diff mkspecs/linux-g++/qmake.conf.diff mkspecs/linux-g++-64/qmake.conf.diff examples/demo/opengl/fbm.h.diff examples/demo/opengl/fbm.c.diff tools/makeqpf/makeqpf.pro.diff tools/makeqpf/main.cpp.diff tools/mergetr/mergetr.pro.diff tools/msg2qm/msg2qm.pro.diff tools/tools.pro.diff tools/designer/designer.pro.diff tools/designer/tools/createcw/createcw.pro.diff tools/designer/uic/form.cpp.diff tools/designer/integration/designer.el.diff tools/qvfb/qvfbview.cpp.diff tools/qvfb/pda.skin.diff tools/qvfb/qvfb.cpp.diff tools/qtconfig/mainwindow.cpp.diff tools/qtconfig/mainwindow.h.diff tools/qtconfig/mainwindowbase.ui.diff tools/qembed/qembed.pro.diff doc/html/qglobal-h.html.diff src/codecs/qutfcodec.cpp.diff src/widgets/qpopupmenu.h.diff src/widgets/qcombobox.cpp.diff src/widgets/qtextedit.cpp.diff src/widgets/qtextedit.h.diff src/widgets/qscrollview.cpp.diff src/widgets/qtooltip.cpp.diff src/widgets/qmenubar.cpp.diff src/widgets/qbutton.h.diff src/widgets/qpopupmenu.cpp.diff src/widgets/qlineedit.h.diff src/widgets/qlistview.cpp.diff src/widgets/qlineedit.cpp.diff src/kernel/qdragobject.h.diff src/kernel/qfontengine_x11.cpp.diff src/kernel/qrichtext.cpp.diff src/kernel/qapplication_x11.cpp.diff src/kernel/qclipboard_x11.cpp.diff src/kernel/qfontdatabase_x11.cpp.diff src/kernel/qinputcontext_x11.cpp.diff src/kernel/qwidget.h.diff src/kernel/qrichtext_p.h.diff src/kernel/qt_kernel.pri.diff src/kernel/qwidget_x11.cpp.diff src/kernel/qobject.h.diff src/kernel/qapplication.cpp.diff src/kernel/qdnd_x11.cpp.diff src/kernel/qobject.cpp.diff src/kernel/qapplication.h.diff src/kernel/qpixmap_x11.cpp.diff src/kernel/qwidget.cpp.diff src/kernel/qdesktopwidget_x11.cpp.diff src/kernel/qt_x11_p.h.diff src/kernel/qnamespace.h.diff src/kernel/qdragobject.cpp.diff src/kernel/qevent.cpp.diff src/kernel/qfontdatabase.cpp.diff src/tools/qstring.h.diff src/tools/qlibrary.cpp.diff src/tools/qlocale.cpp.diff src/tools/qdir_unix.cpp.diff src/tools/qglobal.h.diff src/tools/qfeatures.h.diff src/tools/qfileinfo_unix.cpp.diff src/qt.pro.diff src/sql/drivers/odbc/qsql_odbc.h.diff src/sql/drivers/ibase/qsql_ibase.cpp.diff src/sql/qt_sql.pri.diff src/dialogs/qdialog.cpp.diff src/iconview/qiconview.cpp.diff src/opengl/qgl_x11.cpp.diff plugins/src/sqldrivers/odbc/odbc.pro.diff plugins/src/sqldrivers/ibase/ibase.pro.diff plugins/src/src.pro.diff configure.diff
The file diff-file-list.txt in the tarball contains this index. I suspect the diffs above are the reason I can build from the 3.3.8b code, but my build from svn crashes.
That's it for tonight. This will allow us to get a handle on what we have in the qt3 svn dir. Depending on how well documented all the current patches are that have been applied to the qt3 code in svn, it may be quicker to save the current qt3 dir on the server and to just start over with the qt-x11-3.3.8b code. It still builds fine with minimum patching. (you guys make that call)
Feel free to add/remove whatever you like from the qt3srccmp.sh script. It is as flexible as you want to make it. Adding a bash statement or 2 will allow you to get 99.9% of the information you want from the two source trees.
Hope this helps :)
I have attached the patches that were applied; this should be all of them.
Let me know if I still need to start with a clean 3.3.8b....
I used the qt-copy patches with Qt3 on Slackware without noticing problems. However, in the other set of patches (of which I guess they come from Debian/Ubuntu), they are at least 2 patches that shouldn't be included: -the 06_disable_rpath.diff is policy, and I had to remove it from MutantTurkey's set of patches to build Qt3 on Slackware. -the 72_dont_trust_uname-m[…].diff patch has nothing to do in a Qt3 fork which is intended to be used with any Linux distribution. Slackware doesn't have dpkg-architecture, neither does Arch.
Tim
Le Sat, 14 May 2011 13:29:49 -0500, "Timothy Pearson" kb9vqf@pearsoncomputing.net a écrit :
Guys,
After working to build Qt3 from svn for a day, it became clear that a bit of cleanup will be needed on the code before and getting a handle on what patches it contains before it can be usable. I took a bit of time tonight to analyze the qt-x11-3.3.8b source compared to the trinitydesktop (svn) code in hope of helping move this process along.
The script I used is here: http://www.3111skyline.com/dl/dt/trinity/arch/scr/qt3srccmp.sh
The basic setup for running the script is contained in a comment in the top of the script:
#!/bin/bash --norc
## this presumes you have: ## ## (1) downloaded the trinity desktop qt3 source with svn checkout ## (2) removed the .svn files (tar --exclude-vcs -czf qt3svn.tar.gz qt3/), then untarred the files in a 'tmp-dir/qt3' ## (3) untarred the qt3-3.3.8b source into the same 'tmp-dir/qt-x11-free-3.3.8b' #
The script then loops through the files in qt-x11-3.3.8b/ and compares the files to those in trinitydesktop qt3 (svn). The script summary provides:
6420 - files examined
files in both Qt3 (svn) and qt-x11-free-3.3.8b, reported in: identical-svn-338b.txt files in qt-x11-free-3.3.8b but not in Qt3 svn, reported in: missing-svn-338b.txt diffs for files present in both with differing contents in : qtdiffs/path/to/filename.diff
All results are available in the tarball available here:
[99k] http://www.3111skyline.com/dl/dt/trinity/arch/dev/qt3-compare/qt3-svn-v-3.3....
Files included:
-> identical-svn-338b.txt - The script identifies those files that are identical between 3.3.8b code and svn (not that interesting, but useful for knowing which patches must still be applied;
-> missing-svn-338b.txt - The files that are included in qt-x11-free-3.3.8b but are MISSING in trinitydesktop qt3 (svn). This is interesting:
examples/opengl/overlay_x11/utilities/sovinfo/Makefile examples/opengl/overlay_x11/utilities/glxvisuals/Makefile extensions/nsplugin/examples/Makefile doc/Makefile src/3rdparty/Makefile src/3rdparty/zlib/Makefile
The most important output is the identification of those file present in both source trees, but where the content of the files differs. This is wher many of the problem lie, and where work will need to be done to identify what patches have been previously applied and those that still need to be applied (or those that can be removed). This information is contained in 'diff' files created for each file where this difference was encountered. The diff files are contained under the qtdiff directory in the tarball (in proper hierarchy and effect the following files:
qmake/option.cpp.diff mkspecs/hurd-g++/qmake.conf.diff mkspecs/linux-g++/qplatformdefs.h.diff mkspecs/linux-g++/qmake.conf.diff mkspecs/linux-g++-64/qmake.conf.diff examples/demo/opengl/fbm.h.diff examples/demo/opengl/fbm.c.diff tools/makeqpf/makeqpf.pro.diff tools/makeqpf/main.cpp.diff tools/mergetr/mergetr.pro.diff tools/msg2qm/msg2qm.pro.diff tools/tools.pro.diff tools/designer/designer.pro.diff tools/designer/tools/createcw/createcw.pro.diff tools/designer/uic/form.cpp.diff tools/designer/integration/designer.el.diff tools/qvfb/qvfbview.cpp.diff tools/qvfb/pda.skin.diff tools/qvfb/qvfb.cpp.diff tools/qtconfig/mainwindow.cpp.diff tools/qtconfig/mainwindow.h.diff tools/qtconfig/mainwindowbase.ui.diff tools/qembed/qembed.pro.diff doc/html/qglobal-h.html.diff src/codecs/qutfcodec.cpp.diff src/widgets/qpopupmenu.h.diff src/widgets/qcombobox.cpp.diff src/widgets/qtextedit.cpp.diff src/widgets/qtextedit.h.diff src/widgets/qscrollview.cpp.diff src/widgets/qtooltip.cpp.diff src/widgets/qmenubar.cpp.diff src/widgets/qbutton.h.diff src/widgets/qpopupmenu.cpp.diff src/widgets/qlineedit.h.diff src/widgets/qlistview.cpp.diff src/widgets/qlineedit.cpp.diff src/kernel/qdragobject.h.diff src/kernel/qfontengine_x11.cpp.diff src/kernel/qrichtext.cpp.diff src/kernel/qapplication_x11.cpp.diff src/kernel/qclipboard_x11.cpp.diff src/kernel/qfontdatabase_x11.cpp.diff src/kernel/qinputcontext_x11.cpp.diff src/kernel/qwidget.h.diff src/kernel/qrichtext_p.h.diff src/kernel/qt_kernel.pri.diff src/kernel/qwidget_x11.cpp.diff src/kernel/qobject.h.diff src/kernel/qapplication.cpp.diff src/kernel/qdnd_x11.cpp.diff src/kernel/qobject.cpp.diff src/kernel/qapplication.h.diff src/kernel/qpixmap_x11.cpp.diff src/kernel/qwidget.cpp.diff src/kernel/qdesktopwidget_x11.cpp.diff src/kernel/qt_x11_p.h.diff src/kernel/qnamespace.h.diff src/kernel/qdragobject.cpp.diff src/kernel/qevent.cpp.diff src/kernel/qfontdatabase.cpp.diff src/tools/qstring.h.diff src/tools/qlibrary.cpp.diff src/tools/qlocale.cpp.diff src/tools/qdir_unix.cpp.diff src/tools/qglobal.h.diff src/tools/qfeatures.h.diff src/tools/qfileinfo_unix.cpp.diff src/qt.pro.diff src/sql/drivers/odbc/qsql_odbc.h.diff src/sql/drivers/ibase/qsql_ibase.cpp.diff src/sql/qt_sql.pri.diff src/dialogs/qdialog.cpp.diff src/iconview/qiconview.cpp.diff src/opengl/qgl_x11.cpp.diff plugins/src/sqldrivers/odbc/odbc.pro.diff plugins/src/sqldrivers/ibase/ibase.pro.diff plugins/src/src.pro.diff configure.diff
The file diff-file-list.txt in the tarball contains this index. I suspect the diffs above are the reason I can build from the 3.3.8b code, but my build from svn crashes.
That's it for tonight. This will allow us to get a handle on what we have in the qt3 svn dir. Depending on how well documented all the current patches are that have been applied to the qt3 code in svn, it may be quicker to save the current qt3 dir on the server and to just start over with the qt-x11-3.3.8b code. It still builds fine with minimum patching. (you guys make that call)
Feel free to add/remove whatever you like from the qt3srccmp.sh script. It is as flexible as you want to make it. Adding a bash statement or 2 will allow you to get 99.9% of the information you want from the two source trees.
Hope this helps :)
I have attached the patches that were applied; this should be all of them.
Let me know if I still need to start with a clean 3.3.8b....
I used the qt-copy patches with Qt3 on Slackware without noticing problems. However, in the other set of patches (of which I guess they come from Debian/Ubuntu), they are at least 2 patches that shouldn't be included: -the 06_disable_rpath.diff is policy, and I had to remove it from MutantTurkey's set of patches to build Qt3 on Slackware. -the 72_dont_trust_uname-m[â¦].diff patch has nothing to do in a Qt3 fork which is intended to be used with any Linux distribution. Slackware doesn't have dpkg-architecture, neither does Arch.
Fixed in SVN revision 193.
Tim
Le Sat, 14 May 2011 21:00:13 +0200, /dev/ammo42 mickeytintincolle@yahoo.fr a écrit :
Le Sat, 14 May 2011 13:29:49 -0500, "Timothy Pearson" kb9vqf@pearsoncomputing.net a écrit :
Guys,
After working to build Qt3 from svn for a day, it became clear that a bit of cleanup will be needed on the code before and getting a handle on what patches it contains before it can be usable. I took a bit of time tonight to analyze the qt-x11-3.3.8b source compared to the trinitydesktop (svn) code in hope of helping move this process along.
The script I used is here: http://www.3111skyline.com/dl/dt/trinity/arch/scr/qt3srccmp.sh
The basic setup for running the script is contained in a comment in the top of the script:
#!/bin/bash --norc
## this presumes you have: ## ## (1) downloaded the trinity desktop qt3 source with svn checkout ## (2) removed the .svn files (tar --exclude-vcs -czf qt3svn.tar.gz qt3/), then untarred the files in a 'tmp-dir/qt3' ## (3) untarred the qt3-3.3.8b source into the same 'tmp-dir/qt-x11-free-3.3.8b' #
The script then loops through the files in qt-x11-3.3.8b/ and compares the files to those in trinitydesktop qt3 (svn). The script summary provides:
6420 - files examined
files in both Qt3 (svn) and qt-x11-free-3.3.8b, reported in: identical-svn-338b.txt files in qt-x11-free-3.3.8b but not in Qt3 svn, reported in: missing-svn-338b.txt diffs for files present in both with differing contents in : qtdiffs/path/to/filename.diff
All results are available in the tarball available here:
[99k] http://www.3111skyline.com/dl/dt/trinity/arch/dev/qt3-compare/qt3-svn-v-3.3....
Files included:
-> identical-svn-338b.txt - The script identifies those files that are identical between 3.3.8b code and svn (not that interesting, but useful for knowing which patches must still be applied;
-> missing-svn-338b.txt - The files that are included in qt-x11-free-3.3.8b but are MISSING in trinitydesktop qt3 (svn). This is interesting:
examples/opengl/overlay_x11/utilities/sovinfo/Makefile examples/opengl/overlay_x11/utilities/glxvisuals/Makefile extensions/nsplugin/examples/Makefile doc/Makefile src/3rdparty/Makefile src/3rdparty/zlib/Makefile
The most important output is the identification of those file present in both source trees, but where the content of the files differs. This is wher many of the problem lie, and where work will need to be done to identify what patches have been previously applied and those that still need to be applied (or those that can be removed). This information is contained in 'diff' files created for each file where this difference was encountered. The diff files are contained under the qtdiff directory in the tarball (in proper hierarchy and effect the following files:
qmake/option.cpp.diff mkspecs/hurd-g++/qmake.conf.diff mkspecs/linux-g++/qplatformdefs.h.diff mkspecs/linux-g++/qmake.conf.diff mkspecs/linux-g++-64/qmake.conf.diff examples/demo/opengl/fbm.h.diff examples/demo/opengl/fbm.c.diff tools/makeqpf/makeqpf.pro.diff tools/makeqpf/main.cpp.diff tools/mergetr/mergetr.pro.diff tools/msg2qm/msg2qm.pro.diff tools/tools.pro.diff tools/designer/designer.pro.diff tools/designer/tools/createcw/createcw.pro.diff tools/designer/uic/form.cpp.diff tools/designer/integration/designer.el.diff tools/qvfb/qvfbview.cpp.diff tools/qvfb/pda.skin.diff tools/qvfb/qvfb.cpp.diff tools/qtconfig/mainwindow.cpp.diff tools/qtconfig/mainwindow.h.diff tools/qtconfig/mainwindowbase.ui.diff tools/qembed/qembed.pro.diff doc/html/qglobal-h.html.diff src/codecs/qutfcodec.cpp.diff src/widgets/qpopupmenu.h.diff src/widgets/qcombobox.cpp.diff src/widgets/qtextedit.cpp.diff src/widgets/qtextedit.h.diff src/widgets/qscrollview.cpp.diff src/widgets/qtooltip.cpp.diff src/widgets/qmenubar.cpp.diff src/widgets/qbutton.h.diff src/widgets/qpopupmenu.cpp.diff src/widgets/qlineedit.h.diff src/widgets/qlistview.cpp.diff src/widgets/qlineedit.cpp.diff src/kernel/qdragobject.h.diff src/kernel/qfontengine_x11.cpp.diff src/kernel/qrichtext.cpp.diff src/kernel/qapplication_x11.cpp.diff src/kernel/qclipboard_x11.cpp.diff src/kernel/qfontdatabase_x11.cpp.diff src/kernel/qinputcontext_x11.cpp.diff src/kernel/qwidget.h.diff src/kernel/qrichtext_p.h.diff src/kernel/qt_kernel.pri.diff src/kernel/qwidget_x11.cpp.diff src/kernel/qobject.h.diff src/kernel/qapplication.cpp.diff src/kernel/qdnd_x11.cpp.diff src/kernel/qobject.cpp.diff src/kernel/qapplication.h.diff src/kernel/qpixmap_x11.cpp.diff src/kernel/qwidget.cpp.diff src/kernel/qdesktopwidget_x11.cpp.diff src/kernel/qt_x11_p.h.diff src/kernel/qnamespace.h.diff src/kernel/qdragobject.cpp.diff src/kernel/qevent.cpp.diff src/kernel/qfontdatabase.cpp.diff src/tools/qstring.h.diff src/tools/qlibrary.cpp.diff src/tools/qlocale.cpp.diff src/tools/qdir_unix.cpp.diff src/tools/qglobal.h.diff src/tools/qfeatures.h.diff src/tools/qfileinfo_unix.cpp.diff src/qt.pro.diff src/sql/drivers/odbc/qsql_odbc.h.diff src/sql/drivers/ibase/qsql_ibase.cpp.diff src/sql/qt_sql.pri.diff src/dialogs/qdialog.cpp.diff src/iconview/qiconview.cpp.diff src/opengl/qgl_x11.cpp.diff plugins/src/sqldrivers/odbc/odbc.pro.diff plugins/src/sqldrivers/ibase/ibase.pro.diff plugins/src/src.pro.diff configure.diff
The file diff-file-list.txt in the tarball contains this index. I suspect the diffs above are the reason I can build from the 3.3.8b code, but my build from svn crashes.
That's it for tonight. This will allow us to get a handle on what we have in the qt3 svn dir. Depending on how well documented all the current patches are that have been applied to the qt3 code in svn, it may be quicker to save the current qt3 dir on the server and to just start over with the qt-x11-3.3.8b code. It still builds fine with minimum patching. (you guys make that call)
Feel free to add/remove whatever you like from the qt3srccmp.sh script. It is as flexible as you want to make it. Adding a bash statement or 2 will allow you to get 99.9% of the information you want from the two source trees.
Hope this helps :)
I have attached the patches that were applied; this should be all of them.
Let me know if I still need to start with a clean 3.3.8b....
I used the qt-copy patches with Qt3 on Slackware without noticing problems. However, in the other set of patches (of which I guess they come from Debian/Ubuntu), they are at least 2 patches that shouldn't be included: -the 06_disable_rpath.diff is policy, and I had to remove it from MutantTurkey's set of patches to build Qt3 on Slackware. -the 72_dont_trust_uname-m[…].diff patch has nothing to do in a Qt3 fork which is intended to be used with any Linux distribution. Slackware doesn't have dpkg-architecture, neither does Arch.
I have reviewed a bit more the patches tarball, and the 05 and 09 patches are also Debian-specific (the 05 one specifies paths, and the 09 one makes /usr/X11R6/lib the default X11 path instead of /usr/X11R6/lib64, which will almost surely break the build on Slackware64). According the following link: http://www.trevorpounds.com/blog/?p=111 lib64 is the usual directory for 64-bit libraries on amd64 and will also work on Debian/Ubuntu.
Tim
To unsubscribe, e-mail: trinity-devel-unsubscribe@lists.pearsoncomputing.net For additional commands, e-mail: trinity-devel-help@lists.pearsoncomputing.net Read list messsages on the Web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
I used the qt-copy patches with Qt3 on Slackware without noticing problems. However, in the other set of patches (of which I guess they come from Debian/Ubuntu), they are at least 2 patches that shouldn't be included: -the 06_disable_rpath.diff is policy, and I had to remove it from MutantTurkey's set of patches to build Qt3 on Slackware. -the 72_dont_trust_uname-m[â¦].diff patch has nothing to do in a Qt3 fork which is intended to be used with any Linux distribution. Slackware doesn't have dpkg-architecture, neither does Arch.
I have reviewed a bit more the patches tarball, and the 05 and 09 patches are also Debian-specific (the 05 one specifies paths, and the 09 one makes /usr/X11R6/lib the default X11 path instead of /usr/X11R6/lib64, which will almost surely break the build on Slackware64). According the following link: http://www.trevorpounds.com/blog/?p=111 lib64 is the usual directory for 64-bit libraries on amd64 and will also work on Debian/Ubuntu.
Tim
Fixed in SVN revision 195.
Tim
On 05/16/2011 07:50 PM, Timothy Pearson wrote:
I have reviewed a bit more the patches tarball, and the 05 and 09
patches are also Debian-specific (the 05 one specifies paths, and the 09 one makes /usr/X11R6/lib the default X11 path instead of /usr/X11R6/lib64, which will almost surely break the build on Slackware64). According the following link: http://www.trevorpounds.com/blog/?p=111 lib64 is the usual directory for 64-bit libraries on amd64 and will also work on Debian/Ubuntu.
> > Tim
Fixed in SVN revision 195.
Tim
Excellent,
Maybe that will help us get rid of some of the craziness in the build scripts. i.e.:
# fix /opt/qt/lib path [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile
On 05/16/2011 07:50 PM, Timothy Pearson wrote:
I have reviewed a bit more the patches tarball, and the 05 and 09
patches are also Debian-specific (the 05 one specifies paths, and
the 09
one makes /usr/X11R6/lib the default X11 path instead of /usr/X11R6/lib64, which will almost surely break the build on Slackware64). According the following link: http://www.trevorpounds.com/blog/?p=111 lib64 is the usual directory for 64-bit libraries on amd64 and will
also
work on Debian/Ubuntu.
> > > > Tim
Fixed in SVN revision 195.
Tim
Excellent,
Maybe that will help us get rid of some of the craziness in the build scripts. i.e.:
# fix /opt/qt/lib path [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile
If something seems unusual (e.g. that nastiness you posted above), please look through the tarball I posted to this thread earlier to see if there are any patches that may have caused the problem. If so, just let me know and I will reverse the patch in question.
Tim
On 05/16/2011 10:38 PM, Timothy Pearson wrote:
If something seems unusual (e.g. that nastiness you posted above), please look through the tarball I posted to this thread earlier to see if there are any patches that may have caused the problem. If so, just let me know and I will reverse the patch in question.
Tim
Will do, I haven't had a chance to revisit Qt3 in the past few days. Mickey? (/dev/ammo42) has done a good deal of looking at it. We will have to compare notes and get a good bullet-proof baseline Qt3 setup and see what patches can be added to the svn tree that will work with *all* distributions + gcc46 to minimize the distro specific/x86_64 specific patches and build scripts.
Le Tue, 17 May 2011 21:23:42 -0500, "David C. Rankin" drankinatty@suddenlinkmail.com a écrit :
On 05/16/2011 10:38 PM, Timothy Pearson wrote:
If something seems unusual (e.g. that nastiness you posted above), please look through the tarball I posted to this thread earlier to see if there are any patches that may have caused the problem. If so, just let me know and I will reverse the patch in question.
Tim
Will do, I haven't had a chance to revisit Qt3 in the past few days. Mickey? (/dev/ammo42) has done a good deal of looking at it. We will have to compare notes and get a good bullet-proof baseline Qt3 setup and see what patches can be added to the svn tree that will work with *all* distributions + gcc46 to minimize the distro specific/x86_64 specific patches and build scripts.
I did not review the largest patches (one of the Debian ones has a size of 1 MB; for such a size I just count on its Debian/Ubuntu test of time :)).
Please i attached a README file with a few analysis of many patches i found in others distributions and also network:
Perdon my english on first readme, the file well documented its the changelog 3.3.8c but this not reflect patch work, the readme file attached its a stub and pre file for documentation, the complete work will be in the msktoo blog of netter's funtoo implementation (funtoo its a geento author/creator linux but better implemented)
I now testing compiled versions and runtime performance, I think the decision to load a patched version of qt3 without analyzing the applied/apply patches added and extra work load for the development of the trinity desktop team, causing loss of time if I was already examining the issue.
I've note that most Linux distributions do patches just to get out of step, the developers of these distributions not provide something really analyzed the library, while in debian patches are highly tested and placed with care. (only two debian patches makes library take debian specific, the rest is highly useful and distro independent!!!).
I propose that after finishing my tests compare my tarball (which will be now tested) which exists in the repository. This is because as I have analyzed, implemented and documented patches on the previous version, work that are minimal and necessary for prevent build faille or runtime errors in future!
On Tue, May 17, 2011 at 11:33 PM, /dev/ammo42 mickeytintincolle@yahoo.fr wrote:
Le Tue, 17 May 2011 21:23:42 -0500, "David C. Rankin" drankinatty@suddenlinkmail.com a écrit :
On 05/16/2011 10:38 PM, Timothy Pearson wrote:
If something seems unusual (e.g. that nastiness you posted above), please look through the tarball I posted to this thread earlier to see if there are any patches that may have caused the problem. If so, just let me know and I will reverse the patch in question.
Tim
Will do, I haven't had a chance to revisit Qt3 in the past few days. Mickey? (/dev/ammo42) has done a good deal of looking at it. We will have to compare notes and get a good bullet-proof baseline Qt3 setup and see what patches can be added to the svn tree that will work with *all* distributions + gcc46 to minimize the distro specific/x86_64 specific patches and build scripts.
I did not review the largest patches (one of the Debian ones has a size of 1 MB; for such a size I just count on its Debian/Ubuntu test of time :)).
To unsubscribe, e-mail: trinity-devel-unsubscribe@lists.pearsoncomputing.net For additional commands, e-mail: trinity-devel-help@lists.pearsoncomputing.net Read list messsages on the Web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
-- Lenz McKAY Gerardo (PICCORO) http://qgqlochekone.blogspot.com Cofundador de Venenux; debian based multimedia alike free only zealots users (oh well, i try but..too many free guidelines buahhh) http://shutendouji.net creador de massenkoh linux; debian enhanchements for better up to date support on stable brand, including non-free soft.
qt.x86.cflags.diff.gz NOT this makes qt only compiled on x86!!
The SlackBuild I posted (and also the SlackBuild from Slackware 12.2/13.0) does apply this patch only if $ARCH is equal to i486. The only goal of this patch is (was?) to enforce the -march and -mtune defaults of Slackware, but I'm not sure of it being useful anymore since CFLAGS/CXXFLAGS are passed to ./configure in the build script. Anyway, it is pure Slackware policy.
This patch are worng, CFLAGS pas to compiler dinamic on every pro file, the CFLAGS option parsing to "configure" script are overrride by configure itsefl and also teh config cflasg option are vary in every compilation part of library or tools! so this patch only work on tools directory !
Please read my previously attach file about revision of pachtes!
On Wed, May 18, 2011 at 2:02 PM, /dev/ammo42 mickeytintincolle@yahoo.frwrote:
qt.x86.cflags.diff.gz NOT this makes qt only compiled on x86!!
The SlackBuild I posted (and also the SlackBuild from Slackware 12.2/13.0) does apply this patch only if $ARCH is equal to i486. The only goal of this patch is (was?) to enforce the -march and -mtune defaults of Slackware, but I'm not sure of it being useful anymore since CFLAGS/CXXFLAGS are passed to ./configure in the build script. Anyway, it is pure Slackware policy.
To unsubscribe, e-mail: trinity-devel-unsubscribe@lists.pearsoncomputing.net For additional commands, e-mail: trinity-devel-help@lists.pearsoncomputing.net Read list messsages on the Web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
-
/dev/ammo42 -
David C. Rankin -
PICCORO McKAY Lenz -
Timothy Pearson