[arch-commits] Commit in deepin-daemon/trunk (2 files)

[Felix Yan]

    Date: Sunday, January 31, 2021 @ 01:02:23
  Author: felixonmars
Revision: 836834

upgpkg: deepin-daemon 5.12.0.0-1: bump version and add a patch for https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/646

Added:
  deepin-daemon/trunk/networkmanager-duplicated-enums.patch
Modified:
  deepin-daemon/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |    9 +++++-
 networkmanager-duplicated-enums.patch |   43 ++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-31 00:42:12 UTC (rev 836833)
+++ PKGBUILD	2021-01-31 01:02:23 UTC (rev 836834)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=5.11.0.49
+pkgver=5.12.0.0
 pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64')
@@ -26,9 +26,11 @@
 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=('ede4fac3bc180166c8411e33a965e651126a4f985f16eb5e22ea8522c9273b3aea49de639f19446adc2beb8e10a136301354bcad1e116186e89b81e54074c9e4'
+sha512sums=('3978812e66be976b8686d9efc777e88a73113e2269a7a6e6e180eb38ac403e3306073657f8a55259e203d331b116bd7fe09128943489c1297dd27306ba04adb2'
+            'fcda3703fa64d994d86093dd1b4fe2d6008fec825e8ffc29f75cfa70fd36e5ecfdfeeb552056671e1378a40bf0c02ef026cd2ea8acbcc234991ded6259dae248'
             '944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
@@ -36,6 +38,8 @@
   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
@@ -56,6 +60,7 @@
   export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
 
   cd dde-daemon-$pkgver
+  
   make -C network/nm_generator gen-nm-code
   make
 }

Added: networkmanager-duplicated-enums.patch
===================================================================
--- networkmanager-duplicated-enums.patch	                        (rev 0)
+++ networkmanager-duplicated-enums.patch	2021-01-31 01:02:23 UTC (rev 836834)
@@ -0,0 +1,43 @@
+--- 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