qt4: Adding a patch to take care of those modules that trip over BOOS…

…T_JOIN such as avogadro.
lunar-linux · May 7, 2013 · a73c372 · a73c372
1 parent acc436a
commit a73c372
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
@@ -1,5 +1,7 @@
 (
 
+  patch_it $SOURCE2 1 &&
+
 # This lives in /usr/bin/
   sedit "s:/bin/ls:/usr/bin/ls:g" src/corelib/global/global.pri src/3rdparty/webkit/Source/WebCore/loader/FTPDirectoryParser.h src/3rdparty/webkit/Source/WebCore/loader/FTPDirectoryParser.cpp &&
 

diff --git a/qt4-apps/qt4/DETAILS b/qt4-apps/qt4/DETAILS
@@ -1,9 +1,12 @@
           MODULE=qt4
          VERSION=4.8.4
           SOURCE=qt-everywhere-opensource-src-$VERSION.tar.gz
+         SOURCE2=qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
       SOURCE_URL=http://releases.qt-project.org/qt4/source
+     SOURCE2_URL=http://pkgs.fedoraproject.org/cgit/qt.git/plain/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-$VERSION
       SOURCE_VFY=sha1:f5880f11c139d7d8d01ecb8d874535f7d9553198
+     SOURCE2_VFY=sha1:5437fc7eb5492690ffdf2c7d37640130595b337b
    MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420