[arch-commits] Commit in deepin-daemon/trunk (3 files)
Date: Thursday, November 26, 2015 @ 05:20:10
Author: fyan
Revision: 147811
upgpkg: deepin-daemon 2.93.1-3
Added:
deepin-daemon/trunk/get-distro-info.patch
deepin-daemon/trunk/ishuman-via-login-defs.patch
Modified:
deepin-daemon/trunk/PKGBUILD
--+
PKGBUILD | 13 ++--
get-distro-info.patch| 119
ishuman-via-login-defs.patch | 132 +
3 files changed, 260 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-26 03:18:15 UTC (rev 147810)
+++ PKGBUILD2015-11-26 04:20:10 UTC (rev 147811)
@@ -9,7 +9,7 @@
_golibrev=238151791673412dedf63b3a37343c461acb
_deepinapiver=2.92.1
_dbusfactoryver=2.92.1
-pkgrel=2
+pkgrel=3
pkgdesc='Daemon handling the DDE session settings'
arch=('i686' 'x86_64')
url="https://github.com/linuxdeepin/dde-daemon";
@@ -17,7 +17,7 @@
depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'metacity'
'poppler-glib'
'rfkill' 'acpid' 'bluez' 'deepin-notifications' 'iso-codes'
'lsb-release'
'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower'
'gcc-go'
- 'libxkbfile') # 'xcur2png')
+ 'libxkbfile' 'accountsservice')
makedepends=('deepin-dbus-generator' 'sqlite' 'git' 'mercurial')
optdepends=('networkmanager: Network Management daemon'
'deepin-grub2-themes: deepin theme for grub menu')
@@ -30,13 +30,15 @@
"git+https://github.com/linuxdeepin/go-lib.git#commit=$_golibrev";
"git+https://github.com/linuxdeepin/dbus-factory.git#tag=$_dbusfactoryver";
"git+https://github.com/linuxdeepin/dde-api.git#tag=$_deepinapiver";
-'fix-i686-compile.patch' 'deepin-daemon.sysusers')
+'fix-i686-compile.patch' 'deepin-daemon.sysusers'
'ishuman-via-login-defs.patch' 'get-distro-info.patch')
sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'1dccf88c5ce480560a4a2d73134e69f05135703fe34ccd5d9e2e5d7fe852efc5'
-'4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25')
+'4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25'
+'182fd299b9f222ce8f94da9137fb671f95fbd32bd28becfaf8c97b9fdd488c65'
+'4b3f743b8cffc591ab5582aa4ba6a56f464cd7c279a3594e637fffac0a14df63')
prepare() {
export GOPATH="$srcdir/build"
@@ -56,6 +58,9 @@
if [[ $CARCH == "i686" ]]; then
patch -p1 -i ../fix-i686-compile.patch
fi
+
+ patch -p1 -i ../ishuman-via-login-defs.patch
+ patch -p1 -i ../get-distro-info.patch
}
build() {
Added: get-distro-info.patch
===
--- get-distro-info.patch (rev 0)
+++ get-distro-info.patch 2015-11-26 04:20:10 UTC (rev 147811)
@@ -0,0 +1,119 @@
+commit a39042ae318f404ac44196cc028e234e6b01d489
+Author: Felix Yan
+Date: Wed Nov 25 12:55:31 2015 +0800
+
+Add methods to get distribution info
+
+Change-Id: I915fa4a5f429430e5c183ade58bd727c7d5a2478
+
+diff --git a/systeminfo/distro.go b/systeminfo/distro.go
+new file mode 100644
+index 000..cfd5bc5
+--- /dev/null
b/systeminfo/distro.go
+@@ -0,0 +1,51 @@
++package systeminfo
++
++import (
++ "fmt"
++)
++
++const (
++ distroFileLSB= "/etc/lsb-release"
++
++ distroIdKeyLSB = "DISTRIB_ID"
++ distroDescKeyLSB = "DISTRIB_DESCRIPTION"
++ distroVerKeyLSB = "DISTRIB_RELEASE"
++ distroKeyDelim = "="
++)
++
++func getDistro() (string, string, string, error) {
++ distroId, distroDesc, distroVer, err := getDistroFromLSB(distroFileLSB)
++ if err == nil {
++ return distroId, distroDesc, distroVer, nil
++ }
++
++ return "", "", "", err
++}
++
++func getDistroFromLSB(file string) (string, string, string, error) {
++ ret, err := parseInfoFile(file, distroKeyDelim)
++ if err != nil {
++ return "", "", "", err
++ }
++
++ distroId, ok := ret[distroIdKeyLSB]
++ if !ok {
++ return "", "", "", fmt.Errorf("Cannot find the key '%s'",
distroIdKeyLSB)
++ }
++
++ distroDesc, ok := ret[distroDescKeyLSB]
++ if !ok {
++ return "", "", "", fmt.Errorf("Cannot find the key '%s'",
distroDescKeyLSB)
++ }
++
++ if distroDesc[0] == '"' && distroDesc[len(distroDesc) - 1] == '"' {
++ distroDesc = distroDesc[1:len(distroDesc) - 1]
++ }
++
++ distroVer, ok := ret[distroVerKeyLSB]
++ if !ok {
++ return "", "", "", fmt.Errorf("Cannot find the key '%s'",
distroVerKeyLSB)
++ }
++
++ return distroId, distroDesc, distroVer, nil
++}
+diff --git a/systeminfo/info.go b/systeminfo/info.go
+index c905cab..808ffb7 100644
+--- a/systeminfo/info.go
b/systeminfo/info.go
+@@ -7,8 +7,14 @@ import (
+ )
+
+ type Syste
[arch-commits] Commit in deepin-daemon/trunk (3 files)
Date: Tuesday, February 7, 2017 @ 07:43:14
Author: felixonmars
Revision: 210700
upgpkg: deepin-daemon 3.0.25.2-2
Added:
deepin-daemon/trunk/nm-1.6.patch
Modified:
deepin-daemon/trunk/PKGBUILD
deepin-daemon/trunk/deepin-daemon.install
---+
PKGBUILD | 24 ++-
deepin-daemon.install |8 --
nm-1.6.patch | 60
3 files changed, 78 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-07 07:43:03 UTC (rev 210699)
+++ PKGBUILD2017-02-07 07:43:14 UTC (rev 210700)
@@ -5,7 +5,7 @@
pkgname=deepin-daemon
pkgver=3.0.25.2
-pkgrel=1
+pkgrel=2
pkgdesc='Daemon handling the DDE session settings'
arch=('i686' 'x86_64')
url="https://github.com/linuxdeepin/dde-daemon";
@@ -15,7 +15,8 @@
'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' #
'gcc-libs>=5.3.0-3'
'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf'
'pulseaudio'
'gnome-keyring')
-makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
'deepin-api' 'sqlite' 'git' 'mercurial' 'go') # 'gcc-go')
+makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
'deepin-api' 'sqlite'
+ 'git' 'mercurial' 'python-gobject' 'networkmanager' 'go') #
'gcc-go')
optdepends=('networkmanager: Network Management daemon'
'deepin-grub2-themes: deepin theme for grub menu')
conflicts=('dde-daemon')
@@ -24,22 +25,33 @@
install="${pkgname}.install"
source=("git+https://cr.deepin.io/dde/dde-daemon.git#tag=$pkgver";
'deepin-daemon.sysusers'
-'polkit-gnome-authentication-agent-1-deepin.desktop')
+'polkit-gnome-authentication-agent-1-deepin.desktop'
+'nm-1.6.patch')
sha256sums=('SKIP'
'4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25'
-'014f4c530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7')
+'014f4c530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7'
+'6cc1ba05f1a750327313732b2d3334d3429906a6207c6c61477309089ae9e318')
prepare() {
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/howeyc/fsnotify \
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
+ github.com/BurntSushi/graphics-go/graphics
github.com/fsnotify/fsnotify golang.org/x/sys/unix \
+ gopkg.in/yaml.v2
+
+ cd dde-daemon
+ patch -p1 -i ../nm-1.6.patch
}
build() {
- cd "$srcdir/dde-daemon"
+ cd dde-daemon
+ # We have newer networkmanager
+ make -C network/nm_generator gen-nm-code
make # USE_GCCGO=1
}
Modified: deepin-daemon.install
===
--- deepin-daemon.install 2017-02-07 07:43:03 UTC (rev 210699)
+++ deepin-daemon.install 2017-02-07 07:43:14 UTC (rev 210700)
@@ -1,11 +1,3 @@
-post_install() {
- systemd-sysusers deepin-daemon.conf
-}
-
-post_upgrade() {
- (( $(vercmp $2 '2.93.1-1') < 0 )) && systemd-sysusers deepin-daemon.conf ||
true
-}
-
post_remove() {
rm -f /var/cache/deepin/mark-setup-network-services
}
Added: nm-1.6.patch
===
--- nm-1.6.patch(rev 0)
+++ nm-1.6.patch2017-02-07 07:43:14 UTC (rev 210700)
@@ -0,0 +1,60 @@
+commit a5ccf1fc09eb89ea5cce250198f24857d63ec19f
+Author: jouyouyun
+Date: Tue Feb 7 14:40:15 2017 +0800
+
+nm_generator: Add quote on string constants
+
+Some constants, such as 'pkcs11:' can cause YAML unmarshal failed, so add
quote on all string constants.
+
+Change-Id: I9a900ac1101591e3ba439a02a91cc6b44ce3a46f
+
+diff --git a/network/nm_generator/gen_nm_consts.py
b/network/nm_generator/gen_nm_consts.py
+index 98ba6fad..88b0e3d0 100755
+--- a/network/nm_generator/gen_nm_consts.py
b/network/nm_generator/gen_nm_consts.py
+@@ -201,6 +201,6 @@ for const in girxml.findall('./gi:namespace/gi:constant',
ns_map):
+ cvalue = const.attrib['value']
+ if cname not in constants and const.find('./gi:type[@c:type="gchar*"]',
ns_map) is not None:
+ constants[cname]=cvalue
+-outfile.write("- Name: %s\n Value: %s\n" % (cname, cvalue))
++outfile.write("- Name: %s\n Value: \"%s\"\n" % (cname,
cvalue))
+
+ outfile.close()
+diff --git a/network/nm_setting_beans_extend.go
b/network/nm_setting_beans_extend.go
+index
[arch-commits] Commit in deepin-daemon/trunk (3 files)
Date: Monday, December 28, 2020 @ 13:21:55
Author: felixonmars
Revision: 794900
upgpkg: deepin-daemon 5.11.0.41-1
Added:
deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch
(from rev 794899, deepin-daemon/trunk/dde-daemon_5.9.4.2.diff)
Modified:
deepin-daemon/trunk/PKGBUILD
Deleted:
deepin-daemon/trunk/dde-daemon_5.9.4.2.diff
--+
PKGBUILD | 12 ++---
dde-daemon_5.9.4.2.diff | 34
deepin-daemon-fix-vanilla-libinput.patch | 59 +
3 files changed, 65 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-28 13:20:40 UTC (rev 794899)
+++ PKGBUILD2020-12-28 13:21:55 UTC (rev 794900)
@@ -3,8 +3,8 @@
# Contributor: Xu Fasheng
pkgname=deepin-daemon
-pkgver=5.11.0.36
-pkgrel=2
+pkgver=5.11.0.41
+pkgrel=1
pkgdesc='Daemon handling the DDE session settings'
arch=('x86_64')
url="https://github.com/linuxdeepin/dde-daemon";
@@ -26,15 +26,15 @@
groups=('deepin')
install="$pkgname.install"
source=("https://github.com/linuxdeepin/dde-daemon/archive/$pkgver/$pkgname-$pkgver.tar.gz";
-dde-daemon_5.9.4.2.diff
+$pkgname-fix-vanilla-libinput.patch
'deepin-daemon.sysusers')
-sha512sums=('d36e5629950ac76094da1c79bec1cfc19c2da61ac4adbd7f65ba925ade4162bcf44856e6876512b27b79bb799ad22d732e0078bf647c9e4ae178a88d545a70ac'
-
'5329b86309dcdea88347b0ee8fbee04023328571479edc8e026ba78895deca59ca6195743f398b42a4b8fd9cfae3a0b7308ce8fff9a50adf40011fd1bd8715ae'
+sha512sums=('a9beef57e985d0ae064ea37ae25a713843e604aa8b0bb630302a31237857d1d066ae2821b8698964e68e9f9a298cf38fede060d062619b6c019da5fba13905ee'
+
'944b0ae6cf7f613fd00884593c5e5f43aaf0efe4ea7aaa546a06b4367b8da4f2bc486dca640f77743bd1b7b9e4aacf741afe5c5e3ee219c2fdd4cc891ab3d367'
'808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
prepare() {
cd dde-daemon-$pkgver
- patch -p1 -i ../dde-daemon_5.9.4.2.diff
+ patch -p1 -i ../$pkgname-fix-vanilla-libinput.patch
export GOPATH="$srcdir/build:/usr/share/gocode"
Deleted: dde-daemon_5.9.4.2.diff
===
--- dde-daemon_5.9.4.2.diff 2020-12-28 13:20:40 UTC (rev 794899)
+++ dde-daemon_5.9.4.2.diff 2020-12-28 13:21:55 UTC (rev 794900)
@@ -1,34 +0,0 @@
-diff --git a/system/gesture/core.c b/system/gesture/core.c
-index f953cc1c..4a49749e 100644
a/system/gesture/core.c
-+++ b/system/gesture/core.c
-@@ -305,7 +305,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
- }
- raw_event_reset(raw);
- break;
--case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
-+/*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
- break;
- case LIBINPUT_EVENT_GESTURE_TAP_END:
- if (libinput_event_gesture_get_cancelled(gesture)) {
-@@ -314,7 +314,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
- raw->fingers = libinput_event_gesture_get_finger_count(gesture);
- g_debug("[Tap] fingers: %d", raw->fingers);
- handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE,
raw->fingers);
--break;
-+break;*/
- }
- }
-
-@@ -433,9 +433,9 @@ handle_events(struct libinput *li)
- case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
- case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
- case LIBINPUT_EVENT_GESTURE_SWIPE_END:
--case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
-+/*case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
- case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
--case LIBINPUT_EVENT_GESTURE_TAP_END:{
-+case LIBINPUT_EVENT_GESTURE_TAP_END:*/{
- handle_gesture_events(ev, type);
- break;
- }
Copied: deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch (from rev
794899, deepin-daemon/trunk/dde-daemon_5.9.4.2.diff)
===
--- deepin-daemon-fix-vanilla-libinput.patch(rev 0)
+++ deepin-daemon-fix-vanilla-libinput.patch2020-12-28 13:21:55 UTC (rev
794900)
@@ -0,0 +1,59 @@
+diff --git a/system/gesture/core.c b/system/gesture/core.c
+index 85902af6..f9a02551 100644
+--- a/system/gesture/core.c
b/system/gesture/core.c
+@@ -358,9 +358,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
+ if (raw->dblclick
+ && type != LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN
+ && type != LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
+-&& type != LIBINPUT_EVENT_GESTURE_SWIPE_END
+-&& type != LIBINPUT_EVENT_GESTURE_TAP_UPDATE
+-&& type != LIBINPUT_EVENT_GESTURE_TAP_END) {
++&& type != LIBINPUT_EVENT_GESTURE_SWIPE_END) {
+ raw->fingers = libinput_event_gesture_get_finger_count(gesture);
+ handleSwipeStop(raw->fingers);
+
