Date: Monday, November 12, 2018 @ 21:28:15
Author: felixonmars
Revision: 406463
archrelease: copy trunk to community-x86_64
Added:
deepin-api/repos/community-x86_64/PKGBUILD
(from rev 406462, deepin-api/trunk/PKGBUILD)
deepin-api/repos/community-x86_64/deepin-api.sysusers
(from rev 406462, deepin-api/trunk/deepin-api.sysusers)
deepin-api/repos/community-x86_64/rfkill.patch
(from rev 406462, deepin-api/trunk/rfkill.patch)
Deleted:
deepin-api/repos/community-x86_64/PKGBUILD
deepin-api/repos/community-x86_64/deepin-api.sysusers
---------------------+
PKGBUILD | 100 ++++++++++++++++++++++++++------------------------
deepin-api.sysusers | 4 +-
rfkill.patch | 13 ++++++
3 files changed, 67 insertions(+), 50 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-12 21:27:52 UTC (rev 406462)
+++ PKGBUILD 2018-11-12 21:28:15 UTC (rev 406463)
@@ -1,48 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-api
-pkgver=3.5.0
-pkgrel=1
-pkgdesc='Golang bindings for dde-daemon'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-api";
-license=('GPL3')
-depends=('glib2' 'gdk-pixbuf2' 'gtk3' 'libcanberra-pulse' 'libxi' 'libxfixes'
'rfkill'
- 'poppler-glib' 'xcur2png' 'blur-effect')
-makedepends=('git' 'deepin-gettext-tools' 'deepin-dbus-factory'
'deepin-gir-generator'
- 'deepin-go-lib' 'deepin-go-dbus-factory' 'bzr' 'go-pie')
-conflicts=('dde-api')
-replaces=('dde-api')
-groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/dde-api/archive/$pkgver.tar.gz";
- deepin-api.sysusers)
-sha512sums=('44c0258dff39d5a5dce144bc477269e201e4f1a583776848278077afe118cce374c3e11681b51dfb3863415e42753b6901498f585038f5ef0d3a54849763fce6'
-
'548b4c8d06a10f0103d84fe6b68532ca71aae53347a6ad85dad1d274844146c9861d1bf6ce8e5518ea1b043aa082d705c534f0a4c0feb16a031537cee6befb08')
-
-prepare() {
- export GOPATH="$srcdir/build:/usr/share/gocode"
- mkdir -p build/src/pkg.deepin.io/dde/api
- cp -a dde-api-$pkgver/* build/src/pkg.deepin.io/dde/api/
-
- # https://github.com/niemeyer/gopkg/issues/50
- git config --global http.https://gopkg.in.followRedirects true
-
- cd "$srcdir"/dde-api-$pkgver
- make build-dep
- go get gopkg.in/alecthomas/kingpin.v2 github.com/nfnt/resize
github.com/cryptix/wav \
- golang.org/x/net/context github.com/fogleman/gg
-}
-
-build(){
- cd dde-api-$pkgver
- make
-}
-
-package() {
- cd dde-api-$pkgver
- make DESTDIR="$pkgdir" SYSTEMD_LIB_DIR=/usr/lib install
-
- install -Dm644 ../deepin-api.sysusers
"$pkgdir"/usr/lib/sysusers.d/deepin-api.conf
-}
Copied: deepin-api/repos/community-x86_64/PKGBUILD (from rev 406462,
deepin-api/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-12 21:28:15 UTC (rev 406463)
@@ -0,0 +1,52 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-api
+pkgver=3.5.0
+pkgrel=2
+pkgdesc='Golang bindings for dde-daemon'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-api";
+license=('GPL3')
+depends=('glib2' 'gdk-pixbuf2' 'gtk3' 'libcanberra-pulse' 'libxi' 'libxfixes'
'rfkill'
+ 'poppler-glib' 'xcur2png' 'blur-effect')
+makedepends=('git' 'deepin-gettext-tools' 'deepin-dbus-factory'
'deepin-gir-generator'
+ 'deepin-go-lib' 'deepin-go-dbus-factory' 'bzr' 'go-pie')
+conflicts=('dde-api')
+replaces=('dde-api')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-api/archive/$pkgver.tar.gz";
+ deepin-api.sysusers
+ rfkill.patch)
+sha512sums=('44c0258dff39d5a5dce144bc477269e201e4f1a583776848278077afe118cce374c3e11681b51dfb3863415e42753b6901498f585038f5ef0d3a54849763fce6'
+
'548b4c8d06a10f0103d84fe6b68532ca71aae53347a6ad85dad1d274844146c9861d1bf6ce8e5518ea1b043aa082d705c534f0a4c0feb16a031537cee6befb08'
+
'61cf0c2b36e104d7a2c2564c60885c5c00654c633c2de920479491e76e50578cc12d63d8d3757a1db1606458ab0c57baabfc9f4cd4cdeaed532434a209752320')
+
+prepare() {
+ patch -d dde-api-$pkgver -p1 -i ../rfkill.patch
+
+ export GOPATH="$srcdir/build:/usr/share/gocode"
+ mkdir -p build/src/pkg.deepin.io/dde/api
+ cp -a dde-api-$pkgver/* build/src/pkg.deepin.io/dde/api/
+
+ # https://github.com/niemeyer/gopkg/issues/50
+ git config --global http.https://gopkg.in.followRedirects true
+
+ cd "$srcdir"/dde-api-$pkgver
+ make build-dep
+ go get gopkg.in/alecthomas/kingpin.v2 github.com/nfnt/resize
github.com/cryptix/wav \
+ golang.org/x/net/context github.com/fogleman/gg
+}
+
+build(){
+ cd dde-api-$pkgver
+ make
+}
+
+package() {
+ cd dde-api-$pkgver
+ make DESTDIR="$pkgdir" SYSTEMD_LIB_DIR=/usr/lib install
+
+ install -Dm644 ../deepin-api.sysusers
"$pkgdir"/usr/lib/sysusers.d/deepin-api.conf
+}
Deleted: deepin-api.sysusers
===================================================================
--- deepin-api.sysusers 2018-11-12 21:27:52 UTC (rev 406462)
+++ deepin-api.sysusers 2018-11-12 21:28:15 UTC (rev 406463)
@@ -1,2 +0,0 @@
-u deepin-sound-player - "Deepin Sound Player"
-g deepin-sound-player -
Copied: deepin-api/repos/community-x86_64/deepin-api.sysusers (from rev 406462,
deepin-api/trunk/deepin-api.sysusers)
===================================================================
--- deepin-api.sysusers (rev 0)
+++ deepin-api.sysusers 2018-11-12 21:28:15 UTC (rev 406463)
@@ -0,0 +1,2 @@
+u deepin-sound-player - "Deepin Sound Player"
+g deepin-sound-player -
Copied: deepin-api/repos/community-x86_64/rfkill.patch (from rev 406462,
deepin-api/trunk/rfkill.patch)
===================================================================
--- rfkill.patch (rev 0)
+++ rfkill.patch 2018-11-12 21:28:15 UTC (rev 406463)
@@ -0,0 +1,13 @@
+diff --git a/device/device.go b/device/device.go
+index 504b194..2b25db1 100644
+--- a/device/device.go
++++ b/device/device.go
+@@ -117,7 +117,7 @@ func checkAuthorization(actionId string, pid uint32)
(bool, error) {
+ }
+
+ type rfkillItem struct {
+- Id string `json:"id"`
++ Id int `json:"id"`
+ Type string `json:"type"`
+ Device string `json:"device"`
+ Soft string `json:"soft"`
