summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-06-01 12:59:47 +0200
committerFlorian Bruhin <git@the-compiler.org>2015-06-01 12:59:47 +0200
commitd9eba7fdf6bdc9b09d28a0d77ba57b4a029b5ffc (patch)
treefc10fa33603f87647ab0a584bdbb235cf4aeb7cd
parenta33f16a8b55d6e9c3e4b09ffd2388be48390e38f (diff)
downloadpkgbuild-d9eba7fdf6bdc9b09d28a0d77ba57b4a029b5ffc.tar.gz
pkgbuild-d9eba7fdf6bdc9b09d28a0d77ba57b4a029b5ffc.zip
pebble-sdk: WIP update from comments.
-rw-r--r--pebble-sdk/PKGBUILD38
-rw-r--r--pebble-sdk/build-command.patch13
2 files changed, 37 insertions, 14 deletions
diff --git a/pebble-sdk/PKGBUILD b/pebble-sdk/PKGBUILD
index bd95a31..e4e1e48 100644
--- a/pebble-sdk/PKGBUILD
+++ b/pebble-sdk/PKGBUILD
@@ -1,24 +1,44 @@
# Maintainer: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
+# Adapted for dp1 version by Semyon Maryasin <simeon@maryasin.name>
+# Adapted for beta12/release by Adam Goldsmith <contact@adamgoldsmith.name>
# vim: ft=sh
pkgname=pebble-sdk
-pkgver=2.9
+pkgver=3.0
pkgrel=1
pkgdesc="Pebble SDK, used to develop applications and watchfaces for the Pebble Smartwatch."
url="https://developer.getpebble.com/2/getting-started/"
arch=('i386' 'x86_64')
license=('custom' 'MIT')
install='pebble-sdk.install'
-depends=('arm-none-eabi-gcc' 'python2-pypng' 'python2-sh' 'python2-freetype-py'
- 'python2-websocket-client' 'arm-none-eabi-binutils')
+depends=('arm-none-eabi-gcc' 'arm-none-eabi-newlib' 'arm-none-eabi-binutils'
+ 'libpng12'
+ 'python2-freetype-py'
+ 'python2-sh'
+ 'python2-websocket-client-pebble'
+ 'python2-pypng'
+ 'python2-oauth2client'
+ 'python2-requests'
+ 'python2-gevent'
+ 'python2-gevent-websocket'
+ 'python2-greenlet'
+ 'python2-peewee'
+ 'python2-pygeoip'
+ 'python2-dateutil'
+ 'python2-six'
+ 'python2-wsgiref'
+ 'python2-twisted'
+ 'python2-autobahn'
+ 'qemu-fdt')
+# 'pypy-backports.ssl_match_hostname'
+
optdepends=('python2-pyserial: To connect to the Pebble via serial port')
-source=("http://assets.getpebble.com.s3-website-us-east-1.amazonaws.com/sdk2/PebbleSDK-${pkgver}.tar.gz"
- 'python-waf.patch'
+conflicts=('pebble-sdk-beta')
+source=("http://assets.getpebble.com.s3-website-us-east-1.amazonaws.com/sdk2/PebbleSDK-${pkgver/_/-}.tar.gz"
'build-command.patch'
'pebble-sdk.install')
-sha1sums=('d4c46177d07a61d90bd0dac888ca1cf3768bcc09'
- '526d2071bc8b60a3102fb5d592e67c8ea1057990'
- '215c4e3d6b3d4649b4baae27fae66c3d596a307c'
+sha1sums=('de170797466b8f981f0189456dfed52d9078a830'
+ '488ab70f3b21ca59e784ed47f45daf853ce94142'
'7ea5244f828e682d073434078569fab62a1ad996')
options=('staticlibs' '!strip')
@@ -34,7 +54,7 @@ prepare() {
cd .waf*
find . -type f -name '*.py' -exec \
sed -i '1s|^#! /usr/bin/env python$|#!/usr/bin/python2|' {} \;
- patch -p0 -i "$srcdir/python-waf.patch"
+ #patch -p0 -i "$srcdir/python-waf.patch"
}
package() {
diff --git a/pebble-sdk/build-command.patch b/pebble-sdk/build-command.patch
index db6e2ed..d384cf1 100644
--- a/pebble-sdk/build-command.patch
+++ b/pebble-sdk/build-command.patch
@@ -1,8 +1,8 @@
---- tools/pebble/PblBuildCommand.py.old 2014-05-10 19:38:33.525057866 +0200
-+++ tools/pebble/PblBuildCommand.py 2014-05-10 19:38:54.871724628 +0200
-@@ -191,21 +191,6 @@
- os.path.join(self.sdk_path(args), "arm-cs-tools", "bin"),
- os.environ['PATH'])
+--- tools/pebble/PblBuildCommand.py 2015-03-07 00:28:38.599053155 +0300
++++ tools/pebble/PblBuildCommand.py.new 2015-03-07 00:28:38.782389940 +0300
+@@ -188,21 +188,10 @@
+ def run(self, args):
+ self.add_arm_tools_to_path(args)
- # If python3 is the default and python2 is available, then plug in
- # our stub 'python' shell script which passes control to python2
@@ -19,6 +19,9 @@
- os.path.join(os.path.normpath(os.path.dirname(__file__))),
- os.environ['PATH'])
-
++ os.environ['PATH'] = "{}:{}".format(
++ os.path.join(os.path.normpath(os.path.dirname(__file__))),
++ os.environ['PATH'])
# Execute the build command
cmdLine = '"%s" %s' % (self.waf_path(args), self.waf_cmds)
retval = subprocess.call(cmdLine, shell=True)