* Sat Dec 03 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.0-0.27.rc1
- work around a MOC issue with Boost 1.48 headers (#756395)
This commit is contained in:
parent
c4934b1a43
commit
060db3c767
11
qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch
Normal file
11
qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp
|
||||||
|
--- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 05:44:32.000000000 +0200
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp 2011-12-04 00:11:25.000000000 +0100
|
||||||
|
@@ -187,6 +187,7 @@
|
||||||
|
Moc moc;
|
||||||
|
pp.macros["Q_MOC_RUN"];
|
||||||
|
pp.macros["__cplusplus"];
|
||||||
|
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395
|
||||||
|
QByteArray filename;
|
||||||
|
QByteArray output;
|
||||||
|
FILE *in = 0;
|
9
qt.spec
9
qt.spec
@ -11,7 +11,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.0
|
Version: 4.8.0
|
||||||
Release: 0.26.rc1%{?dist}
|
Release: 0.27.rc1%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
@ -49,6 +49,9 @@ Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
|
|||||||
# workaround for gdal/grass crashers wrt glib_eventloop null deref's
|
# workaround for gdal/grass crashers wrt glib_eventloop null deref's
|
||||||
Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
|
Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
|
||||||
|
|
||||||
|
# workaround for a MOC issue with Boost 1.48 headers (#756395)
|
||||||
|
Patch24: qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch
|
||||||
|
|
||||||
## upstreamable bits
|
## upstreamable bits
|
||||||
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
|
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
|
||||||
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
||||||
@ -402,6 +405,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
|||||||
%patch4 -p1 -b .uic_multilib
|
%patch4 -p1 -b .uic_multilib
|
||||||
%patch15 -p1 -b .enable_ft_lcdfilter
|
%patch15 -p1 -b .enable_ft_lcdfilter
|
||||||
%patch23 -p1 -b .glib_eventloop_nullcheck
|
%patch23 -p1 -b .glib_eventloop_nullcheck
|
||||||
|
%patch24 -p1 -b .moc-boost148
|
||||||
## TODO: still worth carrying? if so, upstream it.
|
## TODO: still worth carrying? if so, upstream it.
|
||||||
%patch53 -p1 -b .qatomic-inline-asm
|
%patch53 -p1 -b .qatomic-inline-asm
|
||||||
## TODO: upstream me
|
## TODO: upstream me
|
||||||
@ -1059,6 +1063,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Dec 03 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.0-0.27.rc1
|
||||||
|
- work around a MOC issue with Boost 1.48 headers (#756395)
|
||||||
|
|
||||||
* Wed Nov 30 2011 Than Ngo <than@redhat.com> - 4.8.0-0.26.rc1
|
* Wed Nov 30 2011 Than Ngo <than@redhat.com> - 4.8.0-0.26.rc1
|
||||||
- workaround crash on ppc64
|
- workaround crash on ppc64
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user