diff options
| -rw-r--r-- | .SRCINFO | 58 | ||||
| -rw-r--r-- | PKGBUILD | 76 | ||||
| -rw-r--r-- | dde-daemon_5.9.4.2.diff | 54 | ||||
| -rw-r--r-- | deepin-daemon-git.install | 3 | ||||
| -rw-r--r-- | deepin-daemon.sysusers | 2 |
5 files changed, 193 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..f44f34317b15 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,58 @@ +pkgbase = deepin-daemon-git + pkgdesc = Daemon handling the DDE session settings + pkgver = 5.11.0.19.r27.g34e54761 + pkgrel = 1 + url = https://github.com/linuxdeepin/dde-daemon + install = deepin-daemon-git.install + arch = x86_64 + groups = deepin-git + license = GPL3 + makedepends = golang-github-linuxdeepin-go-dbus-factory + makedepends = golang-deepin-gir + makedepends = golang-deepin-lib + makedepends = golang-deepin-dde-api + makedepends = golang-github-nfnt-resize + makedepends = golang-gopkg-yaml.v2 + makedepends = sqlite + makedepends = deepin-gettext-tools + makedepends = git + makedepends = mercurial + makedepends = python-gobject + makedepends = networkmanager + makedepends = bluez + makedepends = go + depends = deepin-desktop-schemas-git + depends = ddcutil + depends = deepin-api + depends = gvfs + depends = iso-codes + depends = lsb-release + depends = mobile-broadband-provider-info + depends = deepin-polkit-agent + depends = deepin-polkit-agent-ext-gnomekeyring + depends = udisks2 + depends = upower + depends = libxkbfile + depends = accountsservice + depends = deepin-desktop-base + depends = bamf + depends = pulseaudio + depends = org.freedesktop.secrets + depends = noto-fonts + depends = imwheel + optdepends = networkmanager: for network management support + optdepends = bluez: for bluetooth support + optdepends = iw: for miracast module + optdepends = proxychains-ng: for proxy configuration module + provides = deepin-daemon + conflicts = deepin-daemon + replaces = deepin-daemon + source = git://github.com/linuxdeepin/dde-daemon + source = dde-daemon_5.9.4.2.diff + source = deepin-daemon.sysusers + sha512sums = SKIP + sha512sums = 188bb74fc4deddd2d9cbc210ec487b45664178524294d9a98e47cd4c8a70e369fd3441697bc50b696a975cfbbbfa16666d1798b1ae25469abee50eb84e4bef27 + sha512sums = 808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a + +pkgname = deepin-daemon-git + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..c101956e2eff --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,76 @@ +# Maintainer: DingYuan Zhang <justforlxz@gmail.com> + +pkgname=deepin-daemon-git +pkgver=5.11.0.19.r27.g34e54761 +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-git' 'ddcutil' 'deepin-api' 'gvfs' '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' + 'org.freedesktop.secrets' 'noto-fonts' 'imwheel') +makedepends=('golang-github-linuxdeepin-go-dbus-factory' 'golang-deepin-gir' 'golang-deepin-lib' + 'golang-deepin-dde-api' 'golang-github-nfnt-resize' 'golang-gopkg-yaml.v2' 'sqlite' 'deepin-gettext-tools' + 'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go') +optdepends=('networkmanager: for network management support' + 'bluez: for bluetooth support' + 'iw: for miracast module' + 'proxychains-ng: for proxy configuration module') +conflicts=('deepin-daemon') +replaces=('deepin-daemon') +provides=('deepin-daemon') +groups=('deepin-git') +install="$pkgname.install" +source=("git://github.com/linuxdeepin/dde-daemon" + dde-daemon_5.9.4.2.diff + 'deepin-daemon.sysusers') +sha512sums=('SKIP' + '188bb74fc4deddd2d9cbc210ec487b45664178524294d9a98e47cd4c8a70e369fd3441697bc50b696a975cfbbbfa16666d1798b1ae25469abee50eb84e4bef27' + '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a') + +pkgver() { + cd dde-daemon + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + cd dde-daemon + patch -p1 -i ../dde-daemon_5.9.4.2.diff + + export GOPATH="$srcdir/build:/usr/share/gocode" + + # golang-deepin-lib's dependency, remove when go packaging resumes + go get github.com/cryptix/wav + + go get github.com/axgle/mahonia github.com/msteinert/pam github.com/gosexy/gettext github.com/rickb777/date \ + github.com/jinzhu/gorm github.com/kelvins/sunrisesunset github.com/mozillazg/go-pinyin github.com/teambition/rrule-go \ + golang.org/x/xerrors github.com/mattn/go-sqlite3 + + sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' accounts/user.go +} + +build() { + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" + + cd dde-daemon + make -C network/nm_generator gen-nm-code + make +} + +package() { + cd dde-daemon + make DESTDIR="$pkgdir" PAM_MODULE_DIR=usr/lib/security install + + mv "$pkgdir"{,/usr}/lib/systemd + mv "$pkgdir"{,/usr}/lib/udev + rmdir "$pkgdir"/lib + + install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf" +} diff --git a/dde-daemon_5.9.4.2.diff b/dde-daemon_5.9.4.2.diff new file mode 100644 index 000000000000..773e47b48bb2 --- /dev/null +++ b/dde-daemon_5.9.4.2.diff @@ -0,0 +1,54 @@ +diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json +index 73a3d7ee..fbcc8fd8 100644 +--- a/misc/dde-daemon/gesture.json ++++ b/misc/dde-daemon/gesture.json +@@ -53,15 +53,6 @@ + "Action": "ShowWindow" + } + }, +- { +- "Name": "tap", +- "Direction": "none", +- "Fingers": 3, +- "Action": { +- "Type": "built-in", +- "Action": "MoveWindow" +- } +- }, + { + "Name": "swipe", + "Direction": "up", +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; + } diff --git a/deepin-daemon-git.install b/deepin-daemon-git.install new file mode 100644 index 000000000000..71ac50b4f259 --- /dev/null +++ b/deepin-daemon-git.install @@ -0,0 +1,3 @@ +post_remove() { + rm -f /var/cache/deepin/mark-setup-network-services +} diff --git a/deepin-daemon.sysusers b/deepin-daemon.sysusers new file mode 100644 index 000000000000..a67608714d0b --- /dev/null +++ b/deepin-daemon.sysusers @@ -0,0 +1,2 @@ +u deepin-daemon - "Deepin Daemon" +g deepin-daemon - |