ports/compat-32
3
0
Fork 1
Code Issues Pull Requests Activity

qt4-32: fixed build for boost >= 1.48

Browse Source
This commit is contained in:
Danny Rawlins 2013-04-11 17:57:21 +10:00
parent a464bbe18e
commit e962a1387b
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qt4-32/.md5sum
View File

@ -1 +1,2 @@
41edf6403e0119336ebddb6a0ec356c3 boost-1.48.patch
89c5ecba180cae74c66260ac732dc5cb qt-everywhere-opensource-src-4.8.4.tar.gz

7
qt4-32/Pkgfile
View File

@ -5,12 +5,15 @@
name=qt4-32
version=4.8.4
release=2
source=(http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$version.tar.gz)
release=3
source=(http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$version.tar.gz
boost-1.48.patch)
build () {
cd qt-everywhere-opensource-src-$version
patch -p1 -i $SRC/boost-1.48.patch
sed -i 's|X11R6/||g' mkspecs/*/*.conf
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++-unix.conf
sed -i "s|INSTALLS += translations||" projects.pro

15
qt4-32/boost-1.48.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600
+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600
@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
Moc moc;
pp.macros["Q_MOC_RUN"];
pp.macros["__cplusplus"];
+
+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
+
QByteArray filename;
QByteArray output;
FILE *in = 0;