Date: Monday, May 20, 2019 @ 18:00:04 Author: felixonmars Revision: 468116
upgpkg: deepin-daemon 3.27.2-2 fix location of pam file Added: deepin-daemon/trunk/build-fix.patch Modified: deepin-daemon/trunk/PKGBUILD -----------------+ PKGBUILD | 11 +++++++---- build-fix.patch | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-20 17:47:43 UTC (rev 468115) +++ PKGBUILD 2019-05-20 18:00:04 UTC (rev 468116) @@ -4,7 +4,7 @@ pkgname=deepin-daemon pkgver=3.27.2 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon handling the DDE session settings' arch=('x86_64') url="https://github.com/linuxdeepin/dde-daemon" @@ -27,14 +27,17 @@ 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') + 'deepin-daemon.sysusers' + build-fix.patch) sha512sums=('c806769d4458f8caa6bccaf0ad2e91a6712ac65e994b6af6e856bb2beaa2ce3dc16fb6927b4449ad9384d8efe588f74acab254210c772200130a67d3ba0a16d5' '334839a8136cad44aadb4c97be29ae89f8a1106928175b9bd9115051b34d52cb468902636a67bae8685888bdfe8d8ae195cf8df2b9e93e480f3f008494942e74' - '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a') + '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" @@ -54,7 +57,7 @@ package() { cd dde-daemon-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" PAM_MODULE_DIR=usr/lib/security install mv "$pkgdir"{,/usr}/lib/systemd rmdir "$pkgdir"/lib Added: build-fix.patch =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2019-05-20 18:00:04 UTC (rev 468116) @@ -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 $@ $< +