[arch-commits] Commit in deepin-anything/trunk (PKGBUILD linux-4.20.patch)

[Felix Yan]

    Date: Sunday, December 30, 2018 @ 09:12:21
  Author: felixonmars
Revision: 418971

upgpkg: deepin-anything 0.0.3-2

rebuild for linux 4.20

Added:
  deepin-anything/trunk/linux-4.20.patch
Modified:
  deepin-anything/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 +++++++----
 linux-4.20.patch |   16 ++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-30 09:12:15 UTC (rev 418970)
+++ PKGBUILD	2018-12-30 09:12:21 UTC (rev 418971)
@@ -9,18 +9,21 @@
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-anything"
 license=('GPL3')
-makedepends=('qt5-base' 'linux>=4.19.12' 'linux-headers>=4.19.12')
+makedepends=('qt5-base' 'linux>=4.20' 'linux-headers>=4.20')
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
         deepin-anything-server.sysusers
-        fix-include.patch)
+        fix-include.patch
+        linux-4.20.patch)
 sha512sums=('8a506ba57d6a2ac9c9089719d18013fbde6443cb4f63de79498269e728b7e8725b4e06e7029ae2d2242aaac955c63e56c680fdd18e3fb0d72e9953a9fc5e8402'
             '0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85'
-            '55498f8b14e1b233b4052d516b880f4c27797eede46481135dcf76808e9f00f4ac4fdd0e2e2d7d478d335fb12b7137ca1bef0745e1c8b4195e025b81eec94d21')
+            '55498f8b14e1b233b4052d516b880f4c27797eede46481135dcf76808e9f00f4ac4fdd0e2e2d7d478d335fb12b7137ca1bef0745e1c8b4195e025b81eec94d21'
+            'dc3c85e9535cc589fdf56d265c4330519c92b5bcc406153e3162ba6ef5e799b702c394e1961132770f4f3ddd288dbbfe74a9d8056329e4585eb5a2094ffe0155')
 
 prepare() {
   cd deepin-anything-$pkgver
   patch -p1 -i ../fix-include.patch
+  patch -p1 -i ../linux-4.20.patch
   sed -i 's|^systemd_service.path.*|systemd_service.path = /usr/lib/systemd/system|' server/src/src.pro
 }
 
@@ -34,7 +37,7 @@
 }
 
 package_deepin-anything-module() {
-  depends=('linux>=4.19.12' 'linux<4.20')
+  depends=('linux>=4.20' 'linux<4.21')
 
   cd deepin-anything-$pkgver/kernelmod
   install -dm 755 "$pkgdir"/usr/lib/{modules/$_extramodules,modules-load.d}

Added: linux-4.20.patch
===================================================================
--- linux-4.20.patch	                        (rev 0)
+++ linux-4.20.patch	2018-12-30 09:12:21 UTC (rev 418971)
@@ -0,0 +1,16 @@
+diff --git a/kernelmod/vfs_change.c b/kernelmod/vfs_change.c
+index 0d6d360..d09e439 100644
+--- a/kernelmod/vfs_change.c
++++ b/kernelmod/vfs_change.c
+@@ -115,7 +115,11 @@ static ssize_t copy_vfs_changes(struct timeval *last, char* buf, size_t size)
+ 
+ 		time_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
+ 		struct tm ts;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
+ 		time_to_tm(shifted_secs, 0, &ts);
++#else
++		time64_to_tm(shifted_secs, 0, &ts);
++#endif
+ 		char temp[MIN_LINE_SIZE];
+ 		snprintf(temp, sizeof(temp), "%04ld-%02d-%02d %02d:%02d:%02d.%03ld %s ",
+ 			1900+ts.tm_year, 1+ts.tm_mon, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec, vc->ts.tv_usec/1000,