From 8cc105fb120ea1a466a81d7b6746fc392edb1bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 3 Mar 2014 14:58:09 +0000
Subject: testing/qt-creator: upgrade to 3.0.1

---
 testing/qt-creator/APKBUILD               | 24 ++++++++++++++++++------
 testing/qt-creator/fix-execinfo.patch     | 29 +++++++++++++++++++++++++++++
 testing/qt-creator/fix-headers-musl.patch | 11 +++++++++++
 3 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 testing/qt-creator/fix-execinfo.patch
 create mode 100644 testing/qt-creator/fix-headers-musl.patch

(limited to 'testing')

diff --git a/testing/qt-creator/APKBUILD b/testing/qt-creator/APKBUILD
index 5dd9a91cf..cc44c6178 100644
--- a/testing/qt-creator/APKBUILD
+++ b/testing/qt-creator/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt-creator
-pkgver=2.5.2
-pkgrel=2
+pkgver=3.0.1
+pkgrel=0
 pkgdesc="Lightweight and cross-platform IDE for Qt"
-url="http://developer.qt.nokia.com/wiki/Category:Tools::QtCreator"
+url="https://qt-project.org/wiki/Category:Tools::QtCreator"
 arch="all"
 license="LGPLv2 with exceptions"
 depends=""
@@ -13,10 +13,12 @@ makedepends="$depends_dev qt-dev qt-private-dev paxctl"
 install=""
 subpackages=""
 ldpath="/usr/lib/qtcreator:/usr/lib/qtcreator/plugins/Nokia"
-source="http://get.qt.nokia.com/qtcreator/qt-creator-$pkgver-src.tar.gz
+source="http://download.qt-project.org/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.gz
+	fix-headers-musl.patch
+	fix-execinfo.patch
 	qtcreator.desktop"
 
-_builddir="$srcdir"/qt-creator-$pkgver-src
+_builddir="$srcdir"/qt-creator-opensource-src-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -42,5 +44,15 @@ package() {
 		"$pkgdir"/usr/share/applications/qtcreator.desktop
 }
 
-md5sums="4a9c09cdf4609753283c31451c84ceb8  qt-creator-2.5.2-src.tar.gz
+md5sums="1d736f4b3c25c25cf070c400a92e50c4  qt-creator-opensource-src-3.0.1.tar.gz
+0e31a207fd72013b10dbf3cc1ebf0651  fix-headers-musl.patch
+f2645b7f79dde965ed57b948fadf19a7  fix-execinfo.patch
 f8b1f18e8d62cd4734bb676a97cee1dc  qtcreator.desktop"
+sha256sums="829f1608c1c7304c907548315317520bf24cf5db711775d4d5f827607affdf98  qt-creator-opensource-src-3.0.1.tar.gz
+10e0e48ef7855c760e34d2bc50719b17ed12429a42090f95d3f7ddfb3562b57b  fix-headers-musl.patch
+c460933c25ef1ff098a047b1403b90dd7ea439e13d06ec42fec32bf6b8b26390  fix-execinfo.patch
+849194d74b8fe1dd8ce78c39371256cd80a7cb3a79ec130dea36c8fd6155f88d  qtcreator.desktop"
+sha512sums="fa8b2c4196136b310127daf308a5a99b0ef39b2e25db83930f959a034418a08590edbe8e19e6afea02c1d647602bb49c96df8db156d24f6b9b9246c1a93ead19  qt-creator-opensource-src-3.0.1.tar.gz
+f523b9da264265a01c7e3c6c298c3ea2098b1d15baa16a38dee6b3bd5b696dff6a5b7d32040fee2ad1d88bec3119a4d83029714e88cd56f5fb8f725694a742e6  fix-headers-musl.patch
+d145e037a7871a60309c0db70a30cbe1e7fac04756ff9445c8689cc56ac06838387db67ed8a3395200ecee0b7fd73108e3b5231b643f0eee6f9a02783f6278a8  fix-execinfo.patch
+b694063d2c91bfcf1cad25845c32158f35b8659f03ab9beebbadd98d06f01324ceafca682c2145025f6155c4f1d86bcba3bdcae4f54d5b5d71fc813aaf129a48  qtcreator.desktop"
diff --git a/testing/qt-creator/fix-execinfo.patch b/testing/qt-creator/fix-execinfo.patch
new file mode 100644
index 000000000..418ff73d5
--- /dev/null
+++ b/testing/qt-creator/fix-execinfo.patch
@@ -0,0 +1,29 @@
+--- qt-creator-opensource-src-3.0.1/src/plugins/debugger/shared/backtrace.cpp.orig
++++ qt-creator-opensource-src-3.0.1/src/plugins/debugger/shared/backtrace.cpp
+@@ -31,7 +31,7 @@
+ #include <QDebug>
+ #include <QProcess>
+ 
+-#if defined(Q_OS_LINUX)
++#if defined(__GLIBC__)
+ #include <stdio.h>
+ #include <signal.h>
+ #include <execinfo.h>
+@@ -44,7 +44,7 @@
+ {
+     if (maxdepth == -1)
+         maxdepth = 200;
+-#if defined(Q_OS_LINUX)
++#if defined(__GLIBC__)
+     void *bt[200] = {0};
+     qDebug() << "BACKTRACE:";
+     int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));
+@@ -71,7 +71,7 @@
+ /*
+ void installSignalHandlers()
+ {
+-#if defined(Q_OS_LINUX)
++#if defined(__GLIBC__)
+     struct sigaction SignalAction;
+ 
+     SignalAction.sa_sigaction = handler;
diff --git a/testing/qt-creator/fix-headers-musl.patch b/testing/qt-creator/fix-headers-musl.patch
new file mode 100644
index 000000000..e3f4f1a6f
--- /dev/null
+++ b/testing/qt-creator/fix-headers-musl.patch
@@ -0,0 +1,11 @@
+--- qt-creator-opensource-src-3.0.1/src/libs/zeroconf/servicebrowser.cpp.orig
++++ qt-creator-opensource-src-3.0.1/src/libs/zeroconf/servicebrowser.cpp
+@@ -45,7 +45,7 @@
+ #include <signal.h>
+ #ifdef Q_OS_UNIX
+ // for select()
+-#  include <unistd.h>
++#  include <sys/select.h>
+ #endif
+ 
+ #include <QAtomicPointer>
-- 
cgit v1.2.3