[arch-commits] Commit in deepin-daemon/repos/community-x86_64 (8 files)
Felix Yan
felixonmars at archlinux.org
Thu Oct 25 13:50:21 UTC 2018
Date: Thursday, October 25, 2018 @ 13:50:20
Author: felixonmars
Revision: 398970
archrelease: copy trunk to community-x86_64
Added:
deepin-daemon/repos/community-x86_64/PKGBUILD
(from rev 398969, deepin-daemon/trunk/PKGBUILD)
deepin-daemon/repos/community-x86_64/deepin-daemon.install
(from rev 398969, deepin-daemon/trunk/deepin-daemon.install)
deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
(from rev 398969, deepin-daemon/trunk/deepin-daemon.sysusers)
deepin-daemon/repos/community-x86_64/nm-1.14.patch
(from rev 398969, deepin-daemon/trunk/nm-1.14.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
deepin-daemon/repos/community-x86_64/nm-1.14.patch
------------------------+
PKGBUILD | 142 ++++++++++++++++-----------------
deepin-daemon.install | 6 -
deepin-daemon.sysusers | 4
nm-1.14.patch | 198 +++++++++++++++++++++++------------------------
4 files changed, 175 insertions(+), 175 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-25 13:49:55 UTC (rev 398969)
+++ PKGBUILD 2018-10-25 13:50:20 UTC (rev 398970)
@@ -1,71 +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.2.24.6
-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'
- nm-1.14.patch)
-sha512sums=('a4ed7b4dc206b135c9c7f64955f2d1c45fc65a0aa2e3ece85ccb3a9a8c0c62347a8a430529f67e2dfd3d9df38b628af96370cfcd9988850c06d4cfdb4b16510e'
- '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
- '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a'
- 'b118eefb9f6cb1ecd2e8e2f0f59ab6fe3c6bf8e581b106c2d4fa86573f50a37549e6041726a3fe084dec1e8306e5498086e55fd928b64f614b4eac6c6a81920b')
-
-prepare() {
- cd dde-daemon-$pkgver
- patch -p1 -i ../dde-daemon_3.2.3.patch
- patch -p1 -i ../nm-1.14.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 398969, deepin-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-25 13:50:20 UTC (rev 398970)
@@ -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.3.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'
+ nm-1.14.patch)
+sha512sums=('7d6d638a3afd400cb6144bc30e0a6662665933f79422a1c001e92b03bd355c600610a980525a3a81d98b9e6e6fdc6d31dd5b91898d3f1510d7c878964119031c'
+ '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
+ '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a'
+ 'b118eefb9f6cb1ecd2e8e2f0f59ab6fe3c6bf8e581b106c2d4fa86573f50a37549e6041726a3fe084dec1e8306e5498086e55fd928b64f614b4eac6c6a81920b')
+
+prepare() {
+ cd dde-daemon-$pkgver
+ patch -p1 -i ../dde-daemon_3.2.3.patch
+ patch -p1 -i ../nm-1.14.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-10-25 13:49:55 UTC (rev 398969)
+++ deepin-daemon.install 2018-10-25 13:50:20 UTC (rev 398970)
@@ -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 398969, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- deepin-daemon.install (rev 0)
+++ deepin-daemon.install 2018-10-25 13:50:20 UTC (rev 398970)
@@ -0,0 +1,3 @@
+post_remove() {
+ rm -f /var/cache/deepin/mark-setup-network-services
+}
Deleted: deepin-daemon.sysusers
===================================================================
--- deepin-daemon.sysusers 2018-10-25 13:49:55 UTC (rev 398969)
+++ deepin-daemon.sysusers 2018-10-25 13:50:20 UTC (rev 398970)
@@ -1,2 +0,0 @@
-u deepin-daemon - "Deepin Daemon"
-g deepin-daemon -
Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 398969, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- deepin-daemon.sysusers (rev 0)
+++ deepin-daemon.sysusers 2018-10-25 13:50:20 UTC (rev 398970)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -
Deleted: nm-1.14.patch
===================================================================
--- nm-1.14.patch 2018-10-25 13:49:55 UTC (rev 398969)
+++ nm-1.14.patch 2018-10-25 13:50:20 UTC (rev 398970)
@@ -1,99 +0,0 @@
-commit 13f13416eba2beae2f83de32352ca6dd5afa6f6d
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Thu Sep 27 23:08:40 2018 +0800
-
- fix: compile errors under networkmanager 1.14+
-
- Add new empty functions to pass the build
-
- Change-Id: I67e8b2ff0d797b95531efc396964cd78efb0039a
-
-diff --git a/network/nm_setting_beans_extend.go b/network/nm_setting_beans_extend.go
-index 3be4b7e3..d42b9751 100644
---- a/network/nm_setting_beans_extend.go
-+++ b/network/nm_setting_beans_extend.go
-@@ -20,6 +20,16 @@
- package network
-
- // Empty functions to make compile success
-+func getSetting6LowpanAvailableKeys(data connectionData) (keys []string) {
-+ return
-+}
-+func getSetting6LowpanAvailableValues(data connectionData, key string) (values []kvalue) {
-+ return
-+}
-+func checkSetting6LowpanValues(data connectionData) (err sectionErrors) {
-+ return
-+}
-+
- func getSettingAdslAvailableKeys(data connectionData) (keys []string) {
- return
- }
-@@ -80,6 +90,16 @@ func checkSettingDcbValues(data connectionData) (err sectionErrors) {
- return
- }
-
-+func getSettingEthtoolAvailableKeys(data connectionData) (keys []string) {
-+ return
-+}
-+func getSettingEthtoolAvailableValues(data connectionData, key string) (values []kvalue) {
-+ return
-+}
-+func checkSettingEthtoolValues(data connectionData) (err sectionErrors) {
-+ return
-+}
-+
- func getSettingGenericAvailableKeys(data connectionData) (keys []string) {
- return
- }
-@@ -130,6 +150,16 @@ func checkSettingMacvlanValues(data connectionData) (err sectionErrors) {
- return
- }
-
-+func getSettingMatchAvailableKeys(data connectionData) (keys []string) {
-+ return
-+}
-+func getSettingMatchAvailableValues(data connectionData, key string) (values []kvalue) {
-+ return
-+}
-+func checkSettingMatchValues(data connectionData) (err sectionErrors) {
-+ return
-+}
-+
- func getSettingOlpcMeshAvailableKeys(data connectionData) (keys []string) {
- return
- }
-@@ -190,6 +220,16 @@ func checkSettingProxyValues(data connectionData) (err sectionErrors) {
- return
- }
-
-+func getSettingSriovAvailableKeys(data connectionData) (keys []string) {
-+ return
-+}
-+func getSettingSriovAvailableValues(data connectionData, key string) (values []kvalue) {
-+ return
-+}
-+func checkSettingSriovValues(data connectionData) (err sectionErrors) {
-+ return
-+}
-+
- func getSettingTCConfigAvailableKeys(data connectionData) (keys []string) {
- return
- }
-@@ -260,6 +300,16 @@ func checkSettingWimaxValues(data connectionData) (err sectionErrors) {
- return
- }
-
-+func getSettingWpanAvailableKeys(data connectionData) (keys []string) {
-+ return
-+}
-+func getSettingWpanAvailableValues(data connectionData, key string) (values []kvalue) {
-+ return
-+}
-+func checkSettingWpanValues(data connectionData) (err sectionErrors) {
-+ return
-+}
-+
- func setSettingWirelessAssignedMacAddressJSON(data connectionData, valueJSON string) (err error) {
- return setSettingKeyJSON(data, "802-11-wireless", "assigned-mac-address", valueJSON, ktypeWrapperString)
- }
Copied: deepin-daemon/repos/community-x86_64/nm-1.14.patch (from rev 398969, deepin-daemon/trunk/nm-1.14.patch)
===================================================================
--- nm-1.14.patch (rev 0)
+++ nm-1.14.patch 2018-10-25 13:50:20 UTC (rev 398970)
@@ -0,0 +1,99 @@
+commit 13f13416eba2beae2f83de32352ca6dd5afa6f6d
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Thu Sep 27 23:08:40 2018 +0800
+
+ fix: compile errors under networkmanager 1.14+
+
+ Add new empty functions to pass the build
+
+ Change-Id: I67e8b2ff0d797b95531efc396964cd78efb0039a
+
+diff --git a/network/nm_setting_beans_extend.go b/network/nm_setting_beans_extend.go
+index 3be4b7e3..d42b9751 100644
+--- a/network/nm_setting_beans_extend.go
++++ b/network/nm_setting_beans_extend.go
+@@ -20,6 +20,16 @@
+ package network
+
+ // Empty functions to make compile success
++func getSetting6LowpanAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSetting6LowpanAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSetting6LowpanValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func getSettingAdslAvailableKeys(data connectionData) (keys []string) {
+ return
+ }
+@@ -80,6 +90,16 @@ func checkSettingDcbValues(data connectionData) (err sectionErrors) {
+ return
+ }
+
++func getSettingEthtoolAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSettingEthtoolAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSettingEthtoolValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func getSettingGenericAvailableKeys(data connectionData) (keys []string) {
+ return
+ }
+@@ -130,6 +150,16 @@ func checkSettingMacvlanValues(data connectionData) (err sectionErrors) {
+ return
+ }
+
++func getSettingMatchAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSettingMatchAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSettingMatchValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func getSettingOlpcMeshAvailableKeys(data connectionData) (keys []string) {
+ return
+ }
+@@ -190,6 +220,16 @@ func checkSettingProxyValues(data connectionData) (err sectionErrors) {
+ return
+ }
+
++func getSettingSriovAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSettingSriovAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSettingSriovValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func getSettingTCConfigAvailableKeys(data connectionData) (keys []string) {
+ return
+ }
+@@ -260,6 +300,16 @@ func checkSettingWimaxValues(data connectionData) (err sectionErrors) {
+ return
+ }
+
++func getSettingWpanAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSettingWpanAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSettingWpanValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func setSettingWirelessAssignedMacAddressJSON(data connectionData, valueJSON string) (err error) {
+ return setSettingKeyJSON(data, "802-11-wireless", "assigned-mac-address", valueJSON, ktypeWrapperString)
+ }
More information about the arch-commits
mailing list