Date: Tuesday, February 19, 2019 @ 21:10:04 Author: felixonmars Revision: 434642
archrelease: copy trunk to community-x86_64 Added: deepin-screensaver/repos/community-x86_64/PKGBUILD (from rev 434641, deepin-screensaver/trunk/PKGBUILD) deepin-screensaver/repos/community-x86_64/symlink.patch (from rev 434641, deepin-screensaver/trunk/symlink.patch) Deleted: deepin-screensaver/repos/community-x86_64/PKGBUILD ---------------+ PKGBUILD | 56 +++++++++++++++++++++++++++++++------------------------- symlink.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 25 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-02-19 21:09:30 UTC (rev 434641) +++ PKGBUILD 2019-02-19 21:10:04 UTC (rev 434642) @@ -1,25 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=deepin-screensaver -pkgver=0.0.6 -pkgrel=1 -pkgdesc='Deepin screensaver viewer and tools' -arch=('x86_64') -url="https://github.com/linuxdeepin/deepin-screensaver" -license=('GPL3') -depends=('qt5-declarative' 'qt5-x11extras' 'libxss' 'xscreensaver') -makedepends=('qt5-tools' 'python') -groups=('deepin') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-screensaver/archive/$pkgver.tar.gz") -sha512sums=('ccfabd941c32bbbda300a3f66809941143459d246bcf25c0a83ff354046d9f34fd381b2e8d669bb5b2cdc5b2feda377c19c639c3a468727f88696e704093ddaa') - -build() { - cd deepin-screensaver-$pkgver - qmake-qt5 PREFIX=/usr - make -} - -package() { - cd deepin-screensaver-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-screensaver/repos/community-x86_64/PKGBUILD (from rev 434641, deepin-screensaver/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-19 21:10:04 UTC (rev 434642) @@ -0,0 +1,31 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=deepin-screensaver +pkgver=0.0.6 +pkgrel=2 +pkgdesc='Deepin screensaver viewer and tools' +arch=('x86_64') +url="https://github.com/linuxdeepin/deepin-screensaver" +license=('GPL3') +depends=('qt5-declarative' 'qt5-x11extras' 'libxss' 'xscreensaver') +makedepends=('qt5-tools' 'python') +groups=('deepin') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-screensaver/archive/$pkgver.tar.gz" + symlink.patch) +sha512sums=('ccfabd941c32bbbda300a3f66809941143459d246bcf25c0a83ff354046d9f34fd381b2e8d669bb5b2cdc5b2feda377c19c639c3a468727f88696e704093ddaa' + '5950d9dc061be8135a7b707c6b50ab2abb223e537fccca203a42cd79d1a8f1bfe78f86c4d1eedabc6d7563f68530a932434c5e7042e4571514f6af146c41656a') + +prepare() { + patch -d deepin-screensaver-$pkgver -p1 -i ../symlink.patch +} + +build() { + cd deepin-screensaver-$pkgver + qmake-qt5 PREFIX=/usr + make +} + +package() { + cd deepin-screensaver-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Copied: deepin-screensaver/repos/community-x86_64/symlink.patch (from rev 434641, deepin-screensaver/trunk/symlink.patch) =================================================================== --- symlink.patch (rev 0) +++ symlink.patch 2019-02-19 21:10:04 UTC (rev 434642) @@ -0,0 +1,32 @@ +commit cfefea3e716da1cb837b070e04c85587eb9a1d53 +Author: zccrs <ccrr1...@live.com> +Date: Mon Feb 18 15:00:03 2019 +0800 + + install symlinks instead of copied binaries from xscreensaver + + Change-Id: Id8f0ea8842968ffdfe548f4357cbf7dca2ca34ee + +diff --git a/debian/deepin-screensaver-xscreensaver-data.install b/debian/deepin-screensaver-xscreensaver-data.install +index 418b701..0b5ea03 100644 +--- a/debian/deepin-screensaver-xscreensaver-data.install ++++ b/debian/deepin-screensaver-xscreensaver-data.install +@@ -1,2 +1 @@ + usr/lib/deepin-screensaver/modules/* +-xscreensaver/extras/* usr/lib/deepin-screensaver/modules/ +diff --git a/xscreensaver/xscreensaver.pro b/xscreensaver/xscreensaver.pro +index 55d36d6..163ab00 100644 +--- a/xscreensaver/xscreensaver.pro ++++ b/xscreensaver/xscreensaver.pro +@@ -16,11 +16,9 @@ isEmpty(XSCREENSAVER_DATA_PATH) { + } + + screensaver.path = $$MODULE_PATH +-mkpath($$PWD/extras) + + for(ss, screensaver_list) { +- system(ln -s $$XSCREENSAVER_DATA_PATH/$$ss $$PWD/extras/$$ss) +- screensaver.files += $$PWD/extras/$$ss ++ screensaver.extra += ln -s $$XSCREENSAVER_DATA_PATH/$$ss $(INSTALL_ROOT)$$screensaver.path/$$ss; + } + + INSTALLS += cover screensaver