On 05/10/2011 11:46 AM, David C. Rankin wrote:
On 05/10/2011 09:05 AM, David C. Rankin wrote:
On 05/10/2011 08:40 AM, David C. Rankin wrote:
On 05/09/2011 07:27 PM, Baho Utot wrote:
Here is the correct patch...
--- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000 +++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100 @@ -50,6 +50,7 @@ #endif // QT_H
#ifndef QT_NO_STL +#include <cstddef> #include <iterator> #include <map> #endif --- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000 +++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100 @@ -48,6 +48,7 @@ #endif // QT_H
#ifndef QT_NO_STL +#include <cstddef> #include <iterator> #include <list> #endif
I am rebuilding qt3 with the correct patch as we speak
Baho,
We need to blend your patch with this one:
http://svn.trinitydesktop.org/svn/trinity-packaging/arch/master/trinity-qt3/...
Here is what I come up with (do you see anything wrong with doing it this way?):
diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h --- qt-x11-free-3.3.8b +++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-05-10 08:47:27.000000000 -0500 @@ -50,6 +50,7 @@ #endif // QT_H
#ifndef QT_NO_STL +#include <cstddef> #include <iterator> #include <map> #endif @@ -107,7 +108,7 @@ #endif typedef T value_type; #ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
- typedef std::ptrdiff_t difference_type;
#else typedef int difference_type; #endif @@ -223,7 +224,7 @@ #endif typedef T value_type; #ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
- typedef std::ptrdiff_t difference_type;
#else typedef int difference_type; #endif @@ -604,7 +605,7 @@ typedef value_type& reference; typedef const value_type& const_reference; #ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
- typedef std::ptrdiff_t difference_type;
#else typedef int difference_type; #endif diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h --- qt-x11-free-3.3.8b +++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-05-10 08:46:46.000000000 -0500 @@ -50,6 +50,7 @@ #ifndef QT_NO_STL #include <iterator> #include <list> +#include <cstddef> #endif
//#define QT_CHECK_VALUELIST_RANGE diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h --- qt-x11-free-3.3.8b +++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-05-10 08:46:46.000000000 -0500 @@ -244,7 +244,7 @@ typedef const value_type& const_reference; typedef size_t size_type; #ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
- typedef std::ptrdiff_t difference_type;
#else typedef int difference_type; #endif
UUGH! I killed Qt3.... After adding the qmap.h patch I get a Qt3 symbol lookup error I don't even recognize:
../../../include/qimage.h:61:61: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses] /home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b/bin/uic -L /home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b/plugins listvieweditor.ui -i listvieweditor.h -o listvieweditor.cpp /home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b/bin/uic: symbol lookup error: /opt/trinity/lib/libkdecore.so.4: undefined symbol: _ZN7KGlobal20deleteStaticDeletersEv make[4]: *** [listvieweditor.cpp] Error 127 make[4]: Leaving directory `/home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b/tools/designer/designer' make[3]: *** [sub-designer] Error 2 make[3]: Leaving directory `/home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b/tools/designer' make[2]: *** [sub-designer] Error 2 make[2]: Leaving directory `/home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b/tools' make[1]: *** [sub-tools] Error 2 make[1]: Leaving directory `/home/david/tblds/trinity-qt3/src/qt-x11-free-3.3.8b' make: *** [init] Error 2 ==> ERROR: A failure occurred in build(). Aborting...
It has got to be the qmap.h patch, because I've been using the gcc46.diff without issue and all I did was ass the qmap.h <cstddef> include based on Baho's suggestion :)
I rebuilt my qt3 and it compiles just fine with my qt.diff patch
I am going to see if it fixes the poppler-qt3 issue.
cp -f "../doc/html/y2k.html" "/build/pkg/usr/qt3/doc/html/" make[2]: Leaving directory `/build/src/qt-x11-free-3.3.8b/src' make[1]: Leaving directory `/build/src/qt-x11-free-3.3.8b' `/build/pkg/usr/qt3/mkspecs/linux-g++/linux-g++' -> `../linux-g++' `/build/pkg/usr/qt3/lib/libqt.so' -> `libqt-mt.so' install: creating directory `/build/pkg/etc' install: creating directory `/build/pkg/etc/profile.d' ==> Tidying install... -> Removing doc files... -> Purging other files... -> Compressing man and info pages... -> Stripping unneeded symbols from binaries and libraries... ==> WARNING: Package contains reference to $srcdir ==> Creating package... -> Generating .PKGINFO file... -> Compressing package... ==> Leaving fakeroot environment. ==> Finished making: qt3 3.3.8b-6 (Tue May 10 00:32:23 UTC 2011)