Date: Wednesday, June 12, 2019 @ 10:36:32 Author: felixonmars Revision: 480644
archrelease: copy trunk to community-x86_64 Added: deepin-daemon/repos/community-x86_64/PKGBUILD (from rev 480643, deepin-daemon/trunk/PKGBUILD) deepin-daemon/repos/community-x86_64/build-fix.patch (from rev 480643, deepin-daemon/trunk/build-fix.patch) deepin-daemon/repos/community-x86_64/deepin-daemon.install (from rev 480643, deepin-daemon/trunk/deepin-daemon.install) deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 480643, deepin-daemon/trunk/deepin-daemon.sysusers) Deleted: deepin-daemon/repos/community-x86_64/PKGBUILD deepin-daemon/repos/community-x86_64/build-fix.patch deepin-daemon/repos/community-x86_64/deepin-daemon.install deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers ------------------------+ PKGBUILD | 132 +++++++++++++++++++++++------------------------ build-fix.patch | 44 +++++++-------- deepin-daemon.install | 6 +- deepin-daemon.sysusers | 4 - 4 files changed, 93 insertions(+), 93 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-06-12 10:36:13 UTC (rev 480643) +++ PKGBUILD 2019-06-12 10:36:32 UTC (rev 480644) @@ -1,66 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-daemon -pkgver=3.27.2.4 -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' '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' - 'gnome-keyring' 'noto-fonts' 'imwheel') -makedepends=('golang-github-linuxdeepin-go-dbus-factory' 'golang-deepin-gir' 'golang-deepin-lib' - 'golang-deepin-dde-api' 'golang-github-nfnt-resize' 'sqlite' 'deepin-gettext-tools' - 'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go-pie') -optdepends=('networkmanager: for network management support' - 'bluez: for bluetooth support' - '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.8.0.patch - 'deepin-daemon.sysusers' - build-fix.patch) -sha512sums=('a088909c58f87ac42a708966abc015a3dd97a6f27570104cf8b6b4c9183ccb960022c4a6b26feb2adbd5b21f3100e259c2067601b569be72aa6e1d113223b349' - '334839a8136cad44aadb4c97be29ae89f8a1106928175b9bd9115051b34d52cb468902636a67bae8685888bdfe8d8ae195cf8df2b9e93e480f3f008494942e74' - '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a' - '047123cfcf6463914bb25a6eba34b79192d6bba09cd95e22bf250e6820c4172d8a1b5856ec19d1e638ea463519590f2b0c540fb5b866d094869e768c565d88c5') - -prepare() { - cd dde-daemon-$pkgver - patch -p1 -i ../dde-daemon_3.8.0.patch - patch -p1 -i ../build-fix.patch - - 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 gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/gosexy/gettext - - 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" PAM_MODULE_DIR=usr/lib/security 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 480643, deepin-daemon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-06-12 10:36:32 UTC (rev 480644) @@ -0,0 +1,66 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-daemon +pkgver=3.27.2.5 +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' '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' + 'gnome-keyring' 'noto-fonts' 'imwheel') +makedepends=('golang-github-linuxdeepin-go-dbus-factory' 'golang-deepin-gir' 'golang-deepin-lib' + 'golang-deepin-dde-api' 'golang-github-nfnt-resize' 'sqlite' 'deepin-gettext-tools' + 'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go-pie') +optdepends=('networkmanager: for network management support' + 'bluez: for bluetooth support' + '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.8.0.patch + 'deepin-daemon.sysusers' + build-fix.patch) +sha512sums=('9edbf7e491fb309a325bc8870c96c8695c666d64768f1e7e5c8a4af39715599a531bbfdb97658b8377cc98b4771fc870562937e1f34c0c4e6d46753dd7adda3d' + '334839a8136cad44aadb4c97be29ae89f8a1106928175b9bd9115051b34d52cb468902636a67bae8685888bdfe8d8ae195cf8df2b9e93e480f3f008494942e74' + '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a' + '047123cfcf6463914bb25a6eba34b79192d6bba09cd95e22bf250e6820c4172d8a1b5856ec19d1e638ea463519590f2b0c540fb5b866d094869e768c565d88c5') + +prepare() { + cd dde-daemon-$pkgver + patch -p1 -i ../dde-daemon_3.8.0.patch + patch -p1 -i ../build-fix.patch + + 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 gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/gosexy/gettext + + 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" PAM_MODULE_DIR=usr/lib/security install + + mv "$pkgdir"{,/usr}/lib/systemd + rmdir "$pkgdir"/lib + + install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf" +} Deleted: build-fix.patch =================================================================== --- build-fix.patch 2019-06-12 10:36:13 UTC (rev 480643) +++ build-fix.patch 2019-06-12 10:36:32 UTC (rev 480644) @@ -1,22 +0,0 @@ -diff --git a/Makefile b/Makefile -index bc82a3e7..a3394d5f 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ prepare: - ln -sf ../../../.. ${GOPATH_DIR}/src/${GOPKG_PREFIX}; \ - fi - --out/bin/%: -+out/bin/%: prepare - env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOPKG_PREFIX}/bin/${@F} - - out/bin/default-file-manager: bin/default-file-manager/main.c -@@ -41,7 +41,7 @@ out/pam_deepin_auth.so: misc/pam-module/deepin_auth.c - gcc -fPIC -shared -Wall $(shell pkg-config --libs libsystemd) -o $@ $^ - chmod -x $@ - --out/locale/%/LC_MESSAGES/dde-daemon.mo:misc/po/%.po -+out/locale/%/LC_MESSAGES/dde-daemon.mo: misc/po/%.po - mkdir -p $(@D) - msgfmt -o $@ $< - Copied: deepin-daemon/repos/community-x86_64/build-fix.patch (from rev 480643, deepin-daemon/trunk/build-fix.patch) =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2019-06-12 10:36:32 UTC (rev 480644) @@ -0,0 +1,22 @@ +diff --git a/Makefile b/Makefile +index bc82a3e7..a3394d5f 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ prepare: + ln -sf ../../../.. ${GOPATH_DIR}/src/${GOPKG_PREFIX}; \ + fi + +-out/bin/%: ++out/bin/%: prepare + env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOPKG_PREFIX}/bin/${@F} + + out/bin/default-file-manager: bin/default-file-manager/main.c +@@ -41,7 +41,7 @@ out/pam_deepin_auth.so: misc/pam-module/deepin_auth.c + gcc -fPIC -shared -Wall $(shell pkg-config --libs libsystemd) -o $@ $^ + chmod -x $@ + +-out/locale/%/LC_MESSAGES/dde-daemon.mo:misc/po/%.po ++out/locale/%/LC_MESSAGES/dde-daemon.mo: misc/po/%.po + mkdir -p $(@D) + msgfmt -o $@ $< + Deleted: deepin-daemon.install =================================================================== --- deepin-daemon.install 2019-06-12 10:36:13 UTC (rev 480643) +++ deepin-daemon.install 2019-06-12 10:36:32 UTC (rev 480644) @@ -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 480643, deepin-daemon/trunk/deepin-daemon.install) =================================================================== --- deepin-daemon.install (rev 0) +++ deepin-daemon.install 2019-06-12 10:36:32 UTC (rev 480644) @@ -0,0 +1,3 @@ +post_remove() { + rm -f /var/cache/deepin/mark-setup-network-services +} Deleted: deepin-daemon.sysusers =================================================================== --- deepin-daemon.sysusers 2019-06-12 10:36:13 UTC (rev 480643) +++ deepin-daemon.sysusers 2019-06-12 10:36:32 UTC (rev 480644) @@ -1,2 +0,0 @@ -u deepin-daemon - "Deepin Daemon" -g deepin-daemon - Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 480643, deepin-daemon/trunk/deepin-daemon.sysusers) =================================================================== --- deepin-daemon.sysusers (rev 0) +++ deepin-daemon.sysusers 2019-06-12 10:36:32 UTC (rev 480644) @@ -0,0 +1,2 @@ +u deepin-daemon - "Deepin Daemon" +g deepin-daemon -