diff options
| author | Florian Franzmann | 2017-11-12 01:12:04 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2017-11-12 22:38:23 +0100 |
| commit | 9f300657514ab30ba81a71714fa93607604c40d1 (patch) | |
| tree | 54a8599fb2707f77a4fa0840ff095e8f07a39e82 /x11-toolkits | |
| parent | 88b5a48772ff19a415215e48f4088ee3b59fc677 (diff) | |
x11-toolkits/qt4: fix error with boost 1.65
Diffstat (limited to 'x11-toolkits')
| -rwxr-xr-x | x11-toolkits/qt4/DETAILS | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt4/HISTORY | 4 | ||||
| -rwxr-xr-x | x11-toolkits/qt4/PRE_BUILD | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS index 598b23dc82..12d10c1b4a 100755 --- a/x11-toolkits/qt4/DETAILS +++ b/x11-toolkits/qt4/DETAILS @@ -3,7 +3,7 @@ persistent_remove QT_VER TMPFS=off SPELLX=qt-everywhere-opensource-src VERSION=4.8.7 - PATCHLEVEL=2 + PATCHLEVEL=3 SOURCE_HASH=sha512:f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 SOURCE=$SPELLX-$VERSION.tar.gz SECURITY_PATCH=7 diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index 4fcca14a64..1896b1119f 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,7 @@ +2017-11-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, boost-1.65.1.patch: fix error in moc when run with boost 1.65 + * DETAILS: PATCHLEVEL++ + 2016-08-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * PRE_BUILD, 0001-fix-build-of-qtwebkit-with-gcc-6.patch: fix build of qtwebkit with gcc 6 diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD index 18699fd612..fc38d2b164 100755 --- a/x11-toolkits/qt4/PRE_BUILD +++ b/x11-toolkits/qt4/PRE_BUILD @@ -63,4 +63,6 @@ if [[ $QT_WEBKIT_VIDEO == n ]]; then sed -i '1iDEFINES += ENABLE_VIDEO=0' src/3rdparty/webkit/Source/WebCore/WebCore.pro fi && -patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-of-qtwebkit-with-gcc-6.patch" +patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-of-qtwebkit-with-gcc-6.patch" && +patch -p1 < "$SPELL_DIRECTORY/boost-1.65.1.patch" + |