[arch-commits] Commit in deepin-wallpapers/trunk (PKGBUILD fix-blur-filename.patch)

[Felix Yan]

    Date: Tuesday, May 15, 2018 @ 08:02:31
  Author: felixonmars
Revision: 322358

upgpkg: deepin-wallpapers 1:1.7.2-1

Added:
  deepin-wallpapers/trunk/fix-blur-filename.patch
Modified:
  deepin-wallpapers/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   21 +++++++++++++++++----
 fix-blur-filename.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-15 07:46:38 UTC (rev 322357)
+++ PKGBUILD	2018-05-15 08:02:31 UTC (rev 322358)
@@ -4,7 +4,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-wallpapers
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 epoch=1
 pkgdesc='Deepin Wallpapers'
@@ -13,12 +13,19 @@
 url="https://github.com/linuxdeepin/deepin-wallpapers"
 makedepends=('deepin-api')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-wallpapers/archive/$pkgver.tar.gz")
-sha512sums=('2821b0dbcd897ba2ac6fe7cf40bb182c5238e37f9d5c29391d53fc1645ec4e7a0b1f09ad4b2c0ce93a1f232f57b6cd22419cbf8f0799e2efc16f78f7ab92892d')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-wallpapers/archive/$pkgver.tar.gz"
+        fix-blur-filename.patch)
+sha512sums=('1760d0b06f2b70635d2a5339d7724c0d74ef93d53321739e38b2bbeabbe461b58dd5efb788232a0b34ef44e27fd1c923c69ea554436304a28eea0c811822afa7'
+            'b90f4c008969598b300f00c4f0518a579da98de1bc35ba16d8a744bd223759fd06d893c5a7f27769269336dbc4fd5e9e0224840be7ef23e70d742aface281af0')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fix-blur-filename.patch
+}
+
 build() {
   cd $pkgname-$pkgver
-  make
+  make -j8
 }
 
 package() {
@@ -28,4 +35,10 @@
 
   install -dm755 "$pkgdir"/var/cache
   cp -r image-blur "$pkgdir"/var/cache/
+
+  # Suggested by upstream
+  install -dm755 "$pkgdir"/usr/share/backgrounds/deepin
+  ln -s ../../wallpapers/deepin/Hummingbird_by_Shu_Le.jpg "$pkgdir"/usr/share/backgrounds/deepin/desktop.jpg
+  ln -s $(echo -n /usr/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg | md5sum | cut -d " " -f 1).jpg \
+        "$pkgdir"/var/cache/image-blur/$(echo -n /usr/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
 }

Added: fix-blur-filename.patch
===================================================================
--- fix-blur-filename.patch	                        (rev 0)
+++ fix-blur-filename.patch	2018-05-15 08:02:31 UTC (rev 322358)
@@ -0,0 +1,33 @@
+commit aabd2479cbaeb3f8151e41f6860ba24762753e6a
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Tue May 15 15:50:26 2018 +0800
+
+    fix: generate correct blur filename
+    
+    A space was added between the filename and path when calculating md5sum, this causes the generated blur files useless.
+    
+    Before:
+    $ echo -n "/usr/share/wallpapers/deepin/ Hummingbird_by_Shu_Le.jpg" |
+    md5sum
+    c85efb9df57e04a9aa704f2c29f8517c  -
+    
+    Fixed:
+    $ echo -n /usr/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg |
+    md5sum
+    f1b59d03d44b2c3babaa7769b3f905b3  -
+    
+    Change-Id: Ie641236f02b0303f45b8769987553c12005e671c
+
+diff --git a/Makefile b/Makefile
+index 19f835a..57cb3b0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ prepare:
+ 	@mkdir -p image-blur
+ 
+ blur/%: 
+-	/usr/lib/deepin-api/image-blur --sigma 30 $(subst blur/,,$@) image-blur/$(call md5sum, ${@F}).jpg
++	/usr/lib/deepin-api/image-blur --sigma 30 $(subst blur/,,$@) image-blur/$(call md5sum,${@F}).jpg
+ 
+ clean:
+ 	rm -rf image-blur