diff options
| author | Jose V Beneyto <sepen@crux.nu> | 2013-04-02 11:06:32 +0200 |
|---|---|---|
| committer | Jose V Beneyto <sepen@crux.nu> | 2013-04-02 11:06:45 +0200 |
| commit | 840a6a9739e63173ca250e5c02a2ac692a9e8c5e (patch) | |
| tree | a3ce36f618057dcfd7fca7ae5fd2a1bd50143833 /qt4 | |
| parent | f19c2f7fdf064781f57a5a1cd831a09a80a67597 (diff) | |
| download | opt-840a6a9739e63173ca250e5c02a2ac692a9e8c5e.tar.gz opt-840a6a9739e63173ca250e5c02a2ac692a9e8c5e.tar.xz | |
qt4: fixed build for boost >= 1.48 (thanks Juergen)
Diffstat (limited to 'qt4')
| -rw-r--r-- | qt4/.md5sum | 1 | ||||
| -rw-r--r-- | qt4/Pkgfile | 7 | ||||
| -rw-r--r-- | qt4/boost-1.48.patch | 15 |
3 files changed, 21 insertions, 2 deletions
diff --git a/qt4/.md5sum b/qt4/.md5sum index a5bf5bf5c..43bbf5f1c 100644 --- a/qt4/.md5sum +++ b/qt4/.md5sum @@ -1 +1,2 @@ +41edf6403e0119336ebddb6a0ec356c3 boost-1.48.patch 89c5ecba180cae74c66260ac732dc5cb qt-everywhere-opensource-src-4.8.4.tar.gz diff --git a/qt4/Pkgfile b/qt4/Pkgfile index 7c5032b32..88b07af08 100644 --- a/qt4/Pkgfile +++ b/qt4/Pkgfile @@ -6,12 +6,15 @@ name=qt4 version=4.8.4 -release=3 -source=(http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$version.tar.gz) +release=4 +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 diff --git a/qt4/boost-1.48.patch b/qt4/boost-1.48.patch new file mode 100644 index 000000000..fa82334d7 --- /dev/null +++ b/qt4/boost-1.48.patch @@ -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; |