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

[Christian Hesse]

    Date: Friday, April 3, 2020 @ 19:59:51
  Author: eworm
Revision: 611203

upgpkg: deepin-anything 5.0.1-2

fix for linux 5.6

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

----------------------+
 0001-linux-5.6.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 PKGBUILD             |    5 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

Added: 0001-linux-5.6.patch
===================================================================
--- 0001-linux-5.6.patch	                        (rev 0)
+++ 0001-linux-5.6.patch	2020-04-03 19:59:51 UTC (rev 611203)
@@ -0,0 +1,40 @@
+diff --git a/kernelmod/vfs_change.c b/kernelmod/vfs_change.c
+index 6a0e334..e25faf4 100644
+--- a/kernelmod/vfs_change.c
++++ b/kernelmod/vfs_change.c
+@@ -125,7 +125,11 @@ static ssize_t copy_vfs_changes(struct TIMESTRUCT *last, char* buf, size_t size)
+ 			))
+ 			continue;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ 		time_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
++#else
++		time64_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
++#endif
+ 		struct tm ts;
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
+ 		time_to_tm(shifted_secs, 0, &ts);
+@@ -333,6 +337,7 @@ static long ioctl_vfs_changes(struct file* filp, unsigned int cmd, unsigned long
+ 	}
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ static struct file_operations procfs_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = open_vfs_changes,
+@@ -342,6 +347,15 @@ static struct file_operations procfs_ops = {
+ 	//.llseek = generic_file_llseek,
+ 	.release = release_vfs_changes,
+ };
++#else
++static struct proc_ops procfs_ops = {
++	.proc_open = open_vfs_changes,
++	.proc_read = read_vfs_changes,
++	.proc_ioctl = ioctl_vfs_changes,
++	.proc_lseek = no_llseek,
++	.proc_release = release_vfs_changes,
++};
++#endif
+ 
+ int __init init_vfs_changes(void)
+ {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-03 19:56:48 UTC (rev 611202)
+++ PKGBUILD	2020-04-03 19:59:51 UTC (rev 611203)
@@ -4,7 +4,7 @@
 pkgname=(deepin-anything deepin-anything-dkms)
 pkgver=5.0.1
 _extramodules=extramodules-ARCH
-pkgrel=1
+pkgrel=2
 pkgdesc="Deepin Anything file search tool"
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-anything"
@@ -11,12 +11,15 @@
 license=('GPL3')
 makedepends=('dtkcore' 'udisks2-qt5')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
+        '0001-linux-5.6.patch'
         deepin-anything-server.sysusers)
 sha512sums=('f79b4db917cce2611bd6964d00ae0e162fc500fa7ca76a987145456a9ee81296c776d2b83cf6492a4224c4e4fd95df3ad95a25c1c14d2d4e6865f5bbd639be14'
+            '5ddbd2d968bc5b01dbc99648cec81ea072675d7fe7198835649d5b581997945d32bd842dd7ebf60185aa84722b94575ac7aeb5e4616945e22fae53272907305b'
             '0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85')
 
 prepare() {
   cd deepin-anything-$pkgver
+  patch -Np1 < ../0001-linux-5.6.patch
   sed -i 's|^systemd_service.path.*|systemd_service.path = /usr/lib/systemd/system|' server/monitor/src/src.pro server/tool/tool.pro
 }