aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-06-02 12:37:20 +0200
committerFlorian Bruhin <git@the-compiler.org>2015-06-02 12:37:20 +0200
commit9f6dd88101cc395336a9ed1b593721d0d25afb9e (patch)
treefdb60b78c7a1366bdad2e091ad0a68b3168ecfe5
parentdc02017c213e04e5dad7774200f4a31501e045e4 (diff)
downloadqt-debug-pkgbuild-9f6dd88101cc395336a9ed1b593721d0d25afb9e.tar.gz
qt-debug-pkgbuild-9f6dd88101cc395336a9ed1b593721d0d25afb9e.zip
non-Arch 5.4.2 update
-rw-r--r--qt5/PKGBUILD58
1 files changed, 6 insertions, 52 deletions
diff --git a/qt5/PKGBUILD b/qt5/PKGBUILD
index e68c3d5..309c6f0 100644
--- a/qt5/PKGBUILD
+++ b/qt5/PKGBUILD
@@ -27,8 +27,8 @@ pkgname=('qt5-base'
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.4.1
-pkgrel=9
+pkgver=5.4.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -42,63 +42,17 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz"
- '0001-Revert-Rotate-images-according-to-Exif-orientation.patch'
- '0001-Require-fPIC-instead-of-just-fPIE-for-reduce-relocat.patch'
- '0001-Make-qglobal.h-complain-if-you-use-fPIE.patch'
- '0001-Try-to-ensure-that-fPIC-is-used-in-CMake-builds.patch'
- 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' 'glib-2.43.patch'
- 'qlockfile-deadlock.patch' 'qnam-corruption.patch' 'keypad-shortcuts.patch'
- 'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch'
- 'inline.patch')
-md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
- 'fb1459f325a15b15b18afeac51173a1d'
- 'ac8fa252868161c676d876b614e24436'
- '913a5931d33110b8e698bc9ce733075e'
- 'fb18ddd022422cd42721d6fb2a994e6a'
+ 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+ 'qdbusviewer.desktop')
+md5sums=('c23bd0f14d66e7901d24906a1edce9b0'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1'
- 'bf756a3061e1b30b28df85dcf0c90df3'
- '30d219401f77e536d215addc420b634c'
- 'd0b070d6f211948ef4842b46542b9e4f'
- '665439088fc7de52a97455c5eaf87889'
- '871ab111d03a640b4d0250388a4307cc'
- 'b799130014294cb3c73fc46e7e8889db'
- '64bc4f7d5097438eb6c6f8042378b3a3'
- '06dd155143866c827f90747ec52a5dd4')
+ '322b419b16c75d4de0ee7ad0a246caa1')
prepare() {
cd ${_pkgfqn}
- # https://bugreports.qt.io/browse/QTBUG-37946
- (cd qtbase; patch -p1 -i "$srcdir/0001-Revert-Rotate-images-according-to-Exif-orientation.patch")
-
- # https://bugreports.qt.io/browse/QTBUG-45755
- (cd qtbase; patch -p1 -i "$srcdir/0001-Require-fPIC-instead-of-just-fPIE-for-reduce-relocat.patch")
- (cd qtbase; patch -p1 -i "$srcdir/0001-Make-qglobal.h-complain-if-you-use-fPIE.patch")
- (cd qtbase; patch -p1 -i "$srcdir/0001-Try-to-ensure-that-fPIC-is-used-in-CMake-builds.patch")
-
- # for glib 2.43+ https://bugreports.qt.io/browse/QTBUG-44714
- (cd qtwebkit; patch -p1 -i "$srcdir/glib-2.43.patch")
-
- # https://bugs.kde.org/show_bug.cgi?id=345901
- (cd qtbase; patch -p1 -i "$srcdir/qlockfile-deadlock.patch")
-
- # https://codereview.qt-project.org/#/c/110150/
- (cd qtbase; patch -p1 -i "$srcdir/qnam-corruption.patch")
-
- # https://bugs.archlinux.org/task/44676
- (cd qtbase; patch -p1 -i "$srcdir/keypad-shortcuts.patch")
-
- # http://lists.qt-project.org/pipermail/announce/2015-February/000059.html
- (cd qtbase; patch -p1 -i "$srcdir/CVE-2015-0295.patch")
-
- # http://lists.qt-project.org/pipermail/announce/2015-April/000067.html
- (cd qtbase; patch -p1 -i "$srcdir/CVE-2015-1858_1859.patch"; patch -p1 -i "$srcdir/CVE-2015-1860.patch")
-
- (cd qtwebkit; patch -p1 -i "$srcdir/inline.patch")
-
# Build qmake using Arch {C,LD}FLAGS
# This also sets default {C,CXX,LD}FLAGS for projects built using qmake
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \