[opensuse-kde3] Updated Qt3 (gcc46) Patch
Ilya, Robert, Here is the updated patch that was required to build parts of kdegraphics on Arch with gcc46. It is the same opensuse gcc46.diff + addition of an include of <cstddef> in qmap.h: 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 -- David C. Rankin, J.D.,P.E. -- To unsubscribe, e-mail: opensuse-kde3+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde3+help@opensuse.org
On 05/10/2011 09:21 AM, David C. Rankin wrote:
Ilya, Robert,
Here is the updated patch that was required to build parts of kdegraphics on Arch with gcc46. It is the same opensuse gcc46.diff + addition of an include of <cstddef> in qmap.h:
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
<snip> Err... hold off a bit on this patch. I ran into a symbol lookup error I'm chasing down ..... -- David C. Rankin, J.D.,P.E. -- To unsubscribe, e-mail: opensuse-kde3+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde3+help@opensuse.org
On 05/10/2011 10:38 AM, David C. Rankin wrote:
On 05/10/2011 09:21 AM, David C. Rankin wrote:
Ilya, Robert,
Here is the updated patch that was required to build parts of kdegraphics on Arch with gcc46. It is the same opensuse gcc46.diff + addition of an include of <cstddef> in qmap.h:
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
<snip>
Err... hold off a bit on this patch. I ran into a symbol lookup error I'm chasing down .....
The patch is fine -- I've screwed up my kdelibs somehow :) -- David C. Rankin, J.D.,P.E. -- To unsubscribe, e-mail: opensuse-kde3+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde3+help@opensuse.org
On Tuesday 10 May 2011 18:21:18 David C. Rankin wrote:
Here is the updated patch that was required to build parts of kdegraphics on Arch with gcc46. It is the same opensuse gcc46.diff + addition of an include of <cstddef> in qmap.h:
Don't you mind to create an OBS account and just make a submitrequest? -- To unsubscribe, e-mail: opensuse-kde3+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde3+help@opensuse.org
participants (2)
-
David C. Rankin
-
Ilya Chernykh