[arch-commits] Commit in deepin-screensaver/trunk (PKGBUILD symlink.patch)

2019-02-19 Thread Felix Yan via arch-commits
Date: Wednesday, February 20, 2019 @ 03:15:07
  Author: felixonmars
Revision: 434647

upgpkg: deepin-screensaver 0.0.7-1

Modified:
  deepin-screensaver/trunk/PKGBUILD
Deleted:
  deepin-screensaver/trunk/symlink.patch

---+
 PKGBUILD  |   14 --
 symlink.patch |   32 
 2 files changed, 4 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-19 23:21:19 UTC (rev 434646)
+++ PKGBUILD2019-02-20 03:15:07 UTC (rev 434647)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan 
 
 pkgname=deepin-screensaver
-pkgver=0.0.6
-pkgrel=2
+pkgver=0.0.7
+pkgrel=1
 pkgdesc='Deepin screensaver viewer and tools'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-screensaver;
@@ -10,15 +10,9 @@
 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')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-screensaver/archive/$pkgver.tar.gz;)
+sha512sums=('0921c14fb8fdc25e976e3127c2a07eb66ca984994049f9935e650f5255f7a43dacc38d03e1d13f75549f4bfb976dee8005cb8178d171d8f95bd6172b88fcc097')
 
-prepare() {
-  patch -d deepin-screensaver-$pkgver -p1 -i ../symlink.patch
-}
-
 build() {
   cd deepin-screensaver-$pkgver
   qmake-qt5 PREFIX=/usr

Deleted: symlink.patch
===
--- symlink.patch   2019-02-19 23:21:19 UTC (rev 434646)
+++ symlink.patch   2019-02-20 03:15:07 UTC (rev 434647)
@@ -1,32 +0,0 @@
-commit cfefea3e716da1cb837b070e04c85587eb9a1d53
-Author: zccrs 
-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


[arch-commits] Commit in deepin-screensaver/trunk (PKGBUILD symlink.patch)

2019-02-19 Thread Felix Yan via arch-commits
Date: Tuesday, February 19, 2019 @ 21:09:30
  Author: felixonmars
Revision: 434641

upgpkg: deepin-screensaver 0.0.6-2

fix symlink

Added:
  deepin-screensaver/trunk/symlink.patch
Modified:
  deepin-screensaver/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +---
 symlink.patch |   32 
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-19 20:59:33 UTC (rev 434640)
+++ PKGBUILD2019-02-19 21:09:30 UTC (rev 434641)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-screensaver
 pkgver=0.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin screensaver viewer and tools'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-screensaver;
@@ -10,9 +10,15 @@
 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')
+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

Added: symlink.patch
===
--- symlink.patch   (rev 0)
+++ symlink.patch   2019-02-19 21:09:30 UTC (rev 434641)
@@ -0,0 +1,32 @@
+commit cfefea3e716da1cb837b070e04c85587eb9a1d53
+Author: zccrs 
+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