[arch-commits] Commit in deepin-daemon/repos/community-x86_64 (7 files)

Felix Yan felixonmars at archlinux.org
Mon May 20 18:00:24 UTC 2019


    Date: Monday, May 20, 2019 @ 18:00:24
  Author: felixonmars
Revision: 468117

archrelease: copy trunk to community-x86_64

Added:
  deepin-daemon/repos/community-x86_64/PKGBUILD
    (from rev 468116, deepin-daemon/trunk/PKGBUILD)
  deepin-daemon/repos/community-x86_64/build-fix.patch
    (from rev 468116, deepin-daemon/trunk/build-fix.patch)
  deepin-daemon/repos/community-x86_64/deepin-daemon.install
    (from rev 468116, deepin-daemon/trunk/deepin-daemon.install)
  deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers
    (from rev 468116, deepin-daemon/trunk/deepin-daemon.sysusers)
Deleted:
  deepin-daemon/repos/community-x86_64/PKGBUILD
  deepin-daemon/repos/community-x86_64/deepin-daemon.install
  deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers

------------------------+
 PKGBUILD               |  129 ++++++++++++++++++++++++-----------------------
 build-fix.patch        |   22 ++++++++
 deepin-daemon.install  |    6 +-
 deepin-daemon.sysusers |    4 -
 4 files changed, 93 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-20 18:00:04 UTC (rev 468116)
+++ PKGBUILD	2019-05-20 18:00:24 UTC (rev 468117)
@@ -1,63 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at 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
-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')
-sha512sums=('c806769d4458f8caa6bccaf0ad2e91a6712ac65e994b6af6e856bb2beaa2ce3dc16fb6927b4449ad9384d8efe588f74acab254210c772200130a67d3ba0a16d5'
-            '334839a8136cad44aadb4c97be29ae89f8a1106928175b9bd9115051b34d52cb468902636a67bae8685888bdfe8d8ae195cf8df2b9e93e480f3f008494942e74'
-            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
-
-prepare() {
-  cd dde-daemon-$pkgver
-  patch -p1 -i ../dde-daemon_3.8.0.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" 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 468116, deepin-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-20 18:00:24 UTC (rev 468117)
@@ -0,0 +1,66 @@
+# Maintainer: Felix Yan <felixonmars at 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
+pkgrel=2
+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=('c806769d4458f8caa6bccaf0ad2e91a6712ac65e994b6af6e856bb2beaa2ce3dc16fb6927b4449ad9384d8efe588f74acab254210c772200130a67d3ba0a16d5'
+            '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/build-fix.patch (from rev 468116, deepin-daemon/trunk/build-fix.patch)
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2019-05-20 18:00:24 UTC (rev 468117)
@@ -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-05-20 18:00:04 UTC (rev 468116)
+++ deepin-daemon.install	2019-05-20 18:00:24 UTC (rev 468117)
@@ -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 468116, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- deepin-daemon.install	                        (rev 0)
+++ deepin-daemon.install	2019-05-20 18:00:24 UTC (rev 468117)
@@ -0,0 +1,3 @@
+post_remove() {
+  rm -f /var/cache/deepin/mark-setup-network-services
+}

Deleted: deepin-daemon.sysusers
===================================================================
--- deepin-daemon.sysusers	2019-05-20 18:00:04 UTC (rev 468116)
+++ deepin-daemon.sysusers	2019-05-20 18:00:24 UTC (rev 468117)
@@ -1,2 +0,0 @@
-u deepin-daemon - "Deepin Daemon"
-g deepin-daemon -

Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 468116, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- deepin-daemon.sysusers	                        (rev 0)
+++ deepin-daemon.sysusers	2019-05-20 18:00:24 UTC (rev 468117)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -



More information about the arch-commits mailing list