summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2016-03-03 18:48:27 -0800
committerDonald Carr2016-03-03 18:48:27 -0800
commit88f71609cf79c11fcbce99ac0a3c585a2409881d (patch)
tree8a4058315a14a5b3eb42ee791ee8b54a910371d7
parentd5ca08aac4f24b71804ce53b6cc7bc941b22265d (diff)
parentc724f6320736c938c35543a2a3f579af068ba1d0 (diff)
downloadaur-88f71609cf79c11fcbce99ac0a3c585a2409881d.tar.gz
Merge remote-tracking branch 'pi2/master'
Change-Id: I37c357cd8c4ebe34bce702915fadfc7c5e9cf898
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD5
2 files changed, 9 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 609dc03f41f..9b3159f3441 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Mar 4 02:43:21 UTC 2016
-pkgbase = qt-sdk-raspberry-pi2
- pkgdesc = Qt SDK for the Raspberry Pi2
+# Fri Mar 4 02:48:17 UTC 2016
+pkgbase = qt-sdk-raspberry-pi1
+ pkgdesc = Qt SDK for the Raspberry Pi1
pkgver = 5.6.0
- pkgrel = 9
+ pkgrel = 10
url = http://www.qt.io
install = qpi.install
arch = x86_64
@@ -14,14 +14,13 @@ pkgbase = qt-sdk-raspberry-pi2
makedepends = gcc
depends = qpi-toolchain
depends = qtcreator
- provides = qt-sdk-raspberry-pi2
- conflicts = qt-sdk-raspberry-pi2
- replaces = qt-sdk-raspberry-pi2
+ provides = qt-sdk-raspberry-pi1
+ conflicts = qt-sdk-raspberry-pi1
options = !strip
source = git://github.com/sirspudd/mkspecs.git
source = https://download.qt.io/development_releases/qt/5.6/5.6.0-rc/single/qt-everywhere-opensource-src-5.6.0-rc.7z
sha256sums = SKIP
sha256sums = 82ed4bc1bf7735747e1612f322f8723dfd84f05fa4dca9398863e6527a0c1971
-pkgname = qt-sdk-raspberry-pi2
+pkgname = qt-sdk-raspberry-pi1
diff --git a/PKGBUILD b/PKGBUILD
index de8bd73a423..f0ae3c4a2ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,10 +25,10 @@ _local_qt5_repo="/opt/dev/src/qtproject/qt5"
_wayland_compositor=true
pkgver=5.6.0
-pkgrel=9
+pkgrel=10
# PKGBUILD
-_piver=2
+_piver=1
pkgname="qt-sdk-raspberry-pi${_piver}"
if $_static_build; then
@@ -41,7 +41,6 @@ fi
provides=("${pkgname}")
conflicts=("${pkgname}")
-replaces=("${pkgname}")
_packaginguser=$(whoami)
_libspkgname="${pkgname}-target-libs"
_mkspec="linux-rpi${_piver}-g++"