archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-09 00:17:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/qt4 to 4.8.6-3

Browse source
This commit is contained in:
David Beauchamp 2014-11-05 21:59:35 -05:00
parent 05ebc14392
commit f27148a356
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extra/qt4/PKGBUILD
View file

@ -10,7 +10,7 @@
pkgname=qt4
pkgver=4.8.6
pkgrel=2
pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@ -38,6 +38,7 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
'moc-boost-workaround.patch'
'CVE-2014-0190.patch')
md5sums=('2edbe4d6c2eff33ef91732602f3518eb'
'a16638f4781e56e7887ff8212a322ecc'
@ -46,6 +47,7 @@ md5sums=('2edbe4d6c2eff33ef91732602f3518eb'
'0e384663d3dd32abe35f5331c4147569'
'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971'
'da387bde22ae1c446f12525d2a31f070'
'34ed257109afb83342cfe514c8abe027')
prepare() {
@ -53,6 +55,9 @@ prepare() {
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
# QTBUG#22829
patch -p1 -i "${srcdir}"/moc-boost-workaround.patch
# QTBUG#38367
patch -p1 -i "${srcdir}"/CVE-2014-0190.patch

12
extra/qt4/moc-boost-workaround.patch Normal file
View file

@ -0,0 +1,12 @@
diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300
+++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200
@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
// Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
QByteArray filename;
QByteArray output;