[arch-commits] Commit in deepin-daemon/trunk (2 files)
Felix Yan
felixonmars at archlinux.org
Sat Feb 20 13:12:09 UTC 2021
Date: Saturday, February 20, 2021 @ 13:12:09
Author: felixonmars
Revision: 866830
upgpkg: deepin-daemon 5.12.0.15-1
Modified:
deepin-daemon/trunk/PKGBUILD
Deleted:
deepin-daemon/trunk/networkmanager-duplicated-enums.patch
---------------------------------------+
PKGBUILD | 8 +----
networkmanager-duplicated-enums.patch | 43 --------------------------------
2 files changed, 2 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-20 13:11:39 UTC (rev 866829)
+++ PKGBUILD 2021-02-20 13:12:09 UTC (rev 866830)
@@ -3,7 +3,7 @@
# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
pkgname=deepin-daemon
-pkgver=5.12.0.14
+pkgver=5.12.0.15
pkgrel=1
pkgdesc='Daemon handling the DDE session settings'
arch=('x86_64')
@@ -26,11 +26,9 @@
groups=('deepin')
install="$pkgname.install"
source=("https://github.com/linuxdeepin/dde-daemon/archive/$pkgver/$pkgname-$pkgver.tar.gz"
- networkmanager-duplicated-enums.patch
$pkgname-fix-vanilla-libinput.patch
'deepin-daemon.sysusers')
-sha512sums=('3823fde0e849afc28f2613f96cc3e4807fcd7cee76f64f40c4ac2c39a0da58ca2b41bc45547638d89dc504af4609408249798f15ea266c868dca32f4952a4971'
- 'fcda3703fa64d994d86093dd1b4fe2d6008fec825e8ffc29f75cfa70fd36e5ecfdfeeb552056671e1378a40bf0c02ef026cd2ea8acbcc234991ded6259dae248'
+sha512sums=('29eed2d98db3837f58910257678f65b98a8e7262b02b8d75ac35a5f028c6dbbbde7fb72c51f4028265b3823bac85f163bc0de83ae03ca039b2332ff9d91b24b3'
'944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
'808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
@@ -38,8 +36,6 @@
cd dde-daemon-$pkgver
patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
- sed -i '/gen_nm_consts.py/a \\tpatch -p3 -i ../../../networkmanager-duplicated-enums.patch' network/nm_generator/Makefile
-
export GOPATH="$srcdir/build:/usr/share/gocode"
# golang-deepin-lib's dependency, remove when go packaging resumes
Deleted: networkmanager-duplicated-enums.patch
===================================================================
--- networkmanager-duplicated-enums.patch 2021-02-20 13:11:39 UTC (rev 866829)
+++ networkmanager-duplicated-enums.patch 2021-02-20 13:12:09 UTC (rev 866830)
@@ -1,43 +0,0 @@
---- a/network/nm_generator/nm_consts_gen.yml 2021-01-31 08:43:57.460564050 +0800
-+++ b/network/nm_generator/nm_consts_gen.yml 2021-01-31 08:44:16.737318429 +0800
-@@ -3068,40 +3068,24 @@
- Value: 1
- - Name: NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED
- Value: 2
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED
-- Value: 2
- - Name: NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED
- Value: 3
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED
-- Value: 3
- - Name: NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED
- Value: 4
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED
-- Value: 4
- - Name: NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID
- Value: 5
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID
-- Value: 5
- - Name: NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT
- Value: 6
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT
-- Value: 6
- - Name: NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT
- Value: 7
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT
-- Value: 7
- - Name: NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED
- Value: 8
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED
-- Value: 8
- - Name: NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS
- Value: 9
- - Name: NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED
- Value: 10
- - Name: NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED
- Value: 11
-- - Name: NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED
-- Value: 11
- - EnumClass: VpnPluginError
- Members:
- - Name: NM_VPN_PLUGIN_ERROR_FAILED
More information about the arch-commits
mailing list