Commit f833e6cb authored by Natanael Copa's avatar Natanael Copa

main/qt: upgrade to 4.8.3

parent 9ded27f3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qt
pkgver=4.8.2
pkgrel=1
pkgver=4.8.3
pkgrel=0
pkgdesc="A cross-platform application and UI framework"
url="http://qt.nokia.com/"
arch="all"
......@@ -18,10 +18,9 @@ makedepends="$depends_dev postgresql-dev mysql-dev unixodbc-dev cups-dev
gtk+-dev tiff-dev libmng-dev libxrandr-dev libxv-dev libxi-dev perl
gawk"
install=
source="ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-$pkgver.tar.gz
source="http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$pkgver.tar.gz
qt-gtk-theme-fix.patch
qsettings-recursive-global-mutex.patch
qt-4.8.1-webkit-no_Werror.patch
assistant.desktop
designer.desktop
linguist.desktop
......@@ -235,10 +234,9 @@ x11() {
usr/lib/qt/plugins
}
md5sums="3c1146ddf56247e16782f96910a8423b qt-everywhere-opensource-src-4.8.2.tar.gz
md5sums="a663b6c875f8d7caa8ac9c30e4a4ec3b qt-everywhere-opensource-src-4.8.3.tar.gz
91e8b5ea1e682ae51b60a27d01d7d381 qt-gtk-theme-fix.patch
7467e168418c50b2737b4b2fab4448fe qsettings-recursive-global-mutex.patch
b7535d9515a3990f684ff52dbd3328e1 qt-4.8.1-webkit-no_Werror.patch
a445c6917086d80f1cfc1e40cb6b0132 assistant.desktop
d457f0a0ad68a3861c3cadefe3b42ded designer.desktop
668331d9798a0e2b94381efb7be4c513 linguist.desktop
......
diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri
--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200
@@ -102,8 +102,6 @@ CONFIG -= warn_on
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
-
greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment