[arch-commits] Commit in deepin-daemon/repos/community-x86_64 (7 files)
Felix Yan
felixonmars at archlinux.org
Wed Nov 7 17:50:16 UTC 2018
Date: Wednesday, November 7, 2018 @ 17:50:16
Author: felixonmars
Revision: 403022
archrelease: copy trunk to community-x86_64
Added:
deepin-daemon/repos/community-x86_64/PKGBUILD
(from rev 403020, deepin-daemon/trunk/PKGBUILD)
deepin-daemon/repos/community-x86_64/deepin-daemon.install
(from rev 403020, deepin-daemon/trunk/deepin-daemon.install)
deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
(from rev 403020, deepin-daemon/trunk/deepin-daemon.sysusers)
deepin-daemon/repos/community-x86_64/tun.patch
(from rev 403020, deepin-daemon/trunk/tun.patch)
Deleted:
deepin-daemon/repos/community-x86_64/PKGBUILD
deepin-daemon/repos/community-x86_64/deepin-daemon.install
deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
------------------------+
PKGBUILD | 139 ++++++++++++++++++++++++-----------------------
deepin-daemon.install | 6 +-
deepin-daemon.sysusers | 4 -
tun.patch | 30 ++++++++++
4 files changed, 106 insertions(+), 73 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-07 17:50:13 UTC (rev 403021)
+++ PKGBUILD 2018-11-07 17:50:16 UTC (rev 403022)
@@ -1,68 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-daemon
-pkgver=3.4.0
-pkgrel=1
-pkgdesc='Daemon handling the DDE session settings'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-daemon"
-license=('GPL3')
-depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'poppler-glib' 'rfkill' 'bluez'
- 'deepin-notifications' 'iso-codes' 'lsb-release' 'mobile-broadband-provider-info'
- 'deepin-polkit-agent' 'deepin-polkit-agent-ext-gnomekeyring' 'udisks2' 'upower'
- 'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio'
- 'gnome-keyring' 'noto-fonts')
-makedepends=('deepin-dbus-factory' 'deepin-go-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
- 'deepin-api' 'sqlite' 'deepin-gettext-tools' 'git' 'mercurial' 'python-gobject'
- 'networkmanager' 'go-pie')
-optdepends=('networkmanager: for network management support'
- 'deepin-grub2-themes: theme for grub module'
- 'iw: for miracast module'
- 'proxychains-ng: for proxy configuration module')
-conflicts=('dde-daemon')
-replaces=('dde-daemon')
-groups=('deepin')
-install="${pkgname}.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-daemon/archive/$pkgver.tar.gz"
- https://raw.githubusercontent.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.2.3.patch
- 'deepin-daemon.sysusers')
-sha512sums=('02a658b6c787847b91f6a0b607523f30b414cdf1733960bf5739fd43ddfbfaa29c1783ae329006467b6bae0e20d315e91b051a9086f765bd8b3f275b86d1ef8d'
- '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
- '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
-
-prepare() {
- cd dde-daemon-$pkgver
- patch -p1 -i ../dde-daemon_3.2.3.patch
-
- export GOPATH="$srcdir/build:/usr/share/gocode"
-
- # https://github.com/niemeyer/gopkg/issues/50
- git config --global http.https://gopkg.in.followRedirects true
-
- go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/linuxdeepin/go-x11-client \
- github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \
- github.com/BurntSushi/freetype-go/freetype github.com/BurntSushi/freetype-go/freetype/truetype \
- github.com/BurntSushi/graphics-go/graphics github.com/fsnotify/fsnotify golang.org/x/sys/unix \
- gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/nfnt/resize \
- golang.org/x/text/encoding/charmap github.com/cryptix/wav golang.org/x/net/context
-
- sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' accounts/user.go
-}
-
-build() {
- cd dde-daemon-$pkgver
- make -C network/nm_generator gen-nm-code
- make
-}
-
-package() {
- cd dde-daemon-$pkgver
- make DESTDIR="$pkgdir" install
-
- mv "$pkgdir"{,/usr}/lib/systemd
- rmdir "$pkgdir"/lib
-
- install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf"
-}
Copied: deepin-daemon/repos/community-x86_64/PKGBUILD (from rev 403020, deepin-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-07 17:50:16 UTC (rev 403022)
@@ -0,0 +1,71 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-daemon
+pkgver=3.4.0
+pkgrel=2
+pkgdesc='Daemon handling the DDE session settings'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-daemon"
+license=('GPL3')
+depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'poppler-glib' 'rfkill' 'bluez'
+ 'deepin-notifications' 'iso-codes' 'lsb-release' 'mobile-broadband-provider-info'
+ 'deepin-polkit-agent' 'deepin-polkit-agent-ext-gnomekeyring' 'udisks2' 'upower'
+ 'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio'
+ 'gnome-keyring' 'noto-fonts' 'imwheel')
+makedepends=('deepin-dbus-factory' 'deepin-go-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
+ 'deepin-api' 'sqlite' 'deepin-gettext-tools' 'git' 'mercurial' 'python-gobject'
+ 'networkmanager' 'go-pie')
+optdepends=('networkmanager: for network management support'
+ 'deepin-grub2-themes: theme for grub module'
+ 'iw: for miracast module'
+ 'proxychains-ng: for proxy configuration module')
+conflicts=('dde-daemon')
+replaces=('dde-daemon')
+groups=('deepin')
+install="${pkgname}.install"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-daemon/archive/$pkgver.tar.gz"
+ https://raw.githubusercontent.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.2.3.patch
+ tun.patch
+ 'deepin-daemon.sysusers')
+sha512sums=('02a658b6c787847b91f6a0b607523f30b414cdf1733960bf5739fd43ddfbfaa29c1783ae329006467b6bae0e20d315e91b051a9086f765bd8b3f275b86d1ef8d'
+ '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
+ 'ca3d2b7265fe550ef099d2881c437686565a7d0b16b4ea177a0c24d8afee29f6d67b58a22832e255cf40cd4a7a8ab0c5f9d3445334788e17a4a72035b8b8bd99'
+ '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
+
+prepare() {
+ cd dde-daemon-$pkgver
+ patch -p1 -i ../dde-daemon_3.2.3.patch
+ patch -p1 -i ../tun.patch
+
+ export GOPATH="$srcdir/build:/usr/share/gocode"
+
+ # https://github.com/niemeyer/gopkg/issues/50
+ git config --global http.https://gopkg.in.followRedirects true
+
+ go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/linuxdeepin/go-x11-client \
+ github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \
+ github.com/BurntSushi/freetype-go/freetype github.com/BurntSushi/freetype-go/freetype/truetype \
+ github.com/BurntSushi/graphics-go/graphics github.com/fsnotify/fsnotify golang.org/x/sys/unix \
+ gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/nfnt/resize \
+ golang.org/x/text/encoding/charmap github.com/cryptix/wav golang.org/x/net/context
+
+ sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' accounts/user.go
+}
+
+build() {
+ cd dde-daemon-$pkgver
+ make -C network/nm_generator gen-nm-code
+ make
+}
+
+package() {
+ cd dde-daemon-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"{,/usr}/lib/systemd
+ rmdir "$pkgdir"/lib
+
+ install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf"
+}
Deleted: deepin-daemon.install
===================================================================
--- deepin-daemon.install 2018-11-07 17:50:13 UTC (rev 403021)
+++ deepin-daemon.install 2018-11-07 17:50:16 UTC (rev 403022)
@@ -1,3 +0,0 @@
-post_remove() {
- rm -f /var/cache/deepin/mark-setup-network-services
-}
Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.install (from rev 403020, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- deepin-daemon.install (rev 0)
+++ deepin-daemon.install 2018-11-07 17:50:16 UTC (rev 403022)
@@ -0,0 +1,3 @@
+post_remove() {
+ rm -f /var/cache/deepin/mark-setup-network-services
+}
Deleted: deepin-daemon.sysusers
===================================================================
--- deepin-daemon.sysusers 2018-11-07 17:50:13 UTC (rev 403021)
+++ deepin-daemon.sysusers 2018-11-07 17:50:16 UTC (rev 403022)
@@ -1,2 +0,0 @@
-u deepin-daemon - "Deepin Daemon"
-g deepin-daemon -
Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 403020, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- deepin-daemon.sysusers (rev 0)
+++ deepin-daemon.sysusers 2018-11-07 17:50:16 UTC (rev 403022)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -
Copied: deepin-daemon/repos/community-x86_64/tun.patch (from rev 403020, deepin-daemon/trunk/tun.patch)
===================================================================
--- tun.patch (rev 0)
+++ tun.patch 2018-11-07 17:50:16 UTC (rev 403022)
@@ -0,0 +1,30 @@
+diff --git a/network/nm_custom_type.go b/network/nm_custom_type.go
+index 4c49f30e..e723693f 100644
+--- a/network/nm_custom_type.go
++++ b/network/nm_custom_type.go
+@@ -27,7 +27,7 @@ import (
+ "strings"
+ )
+
+-// Custom device types, use sting instead of number, used by front-end
++// Custom device types, use string instead of number, used by front-end
+ const (
+ deviceUnknown = "unknown"
+ deviceEthernet = "wired"
+@@ -45,6 +45,7 @@ const (
+ deviceBridge = "bridge"
+ deviceGeneric = "generic"
+ deviceTeam = "team"
++ deviceTun = "tun"
+ )
+
+ func getCustomDeviceType(devType uint32) (customDevType string) {
+@@ -79,6 +80,8 @@ func getCustomDeviceType(devType uint32) (customDevType string) {
+ return deviceGeneric
+ case nm.NM_DEVICE_TYPE_TEAM:
+ return deviceTeam
++ case nm.NM_DEVICE_TYPE_TUN:
++ return deviceTun
+ case nm.NM_DEVICE_TYPE_UNKNOWN:
+ default:
+ logger.Error("unknown device type", devType)
More information about the arch-commits
mailing list