[arch-commits] Commit in deepin-anything-arch/trunk (3 files)

[Felix Yan]

    Date: Wednesday, March 27, 2019 @ 13:10:20
  Author: felixonmars
Revision: 444336

upgpkg: deepin-anything-arch 0.0.5-1

Modified:
  deepin-anything-arch/trunk/PKGBUILD
Deleted:
  deepin-anything-arch/trunk/linux-4.20.patch
  deepin-anything-arch/trunk/linux-5.0.patch

------------------+
 PKGBUILD         |   18 +++-----------
 linux-4.20.patch |   16 -------------
 linux-5.0.patch  |   64 -----------------------------------------------------
 3 files changed, 4 insertions(+), 94 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-27 13:10:00 UTC (rev 444335)
+++ PKGBUILD	2019-03-27 13:10:20 UTC (rev 444336)
@@ -1,9 +1,9 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-anything-arch
-pkgver=0.0.4
+pkgver=0.0.5
 _extramodules=extramodules-ARCH
-pkgrel=11
+pkgrel=1
 pkgdesc="Deepin Anything file search tool, kernel module for Arch kernel"
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-anything"
@@ -12,19 +12,9 @@
 makedepends=('linux-headers')
 provides=('DEEPIN-ANYTHING-MODULE')
 replaces=('deepin-anything-module')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
-        linux-4.20.patch
-        linux-5.0.patch)
-sha512sums=('fcb7683ce3bef818ac06dd62f14b5624669f9c09b53c5f08e319b724f5408bc221154428a6436d9e2a68aa6444e966c494c8a7611dfed0c93b6b9e71a3da0f55'
-            'dc3c85e9535cc589fdf56d265c4330519c92b5bcc406153e3162ba6ef5e799b702c394e1961132770f4f3ddd288dbbfe74a9d8056329e4585eb5a2094ffe0155'
-            '6179fae5263d651279e073b4e116cf5fd1986614a0f3129927c39f462cc2ff12bb7c118b64ddbd31399a752d6b177df517133ae634d38146465fe97f49dc31d4')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz")
+sha512sums=('bda1de375d376a1f4f28c279c9f800e54640583203ce543a7464317b06666f74b629c0fa3ebd18eb3028fe4a738a1b3beb7fd880c597c60c1d1bf67df9998d46')
 
-prepare() {
-  cd deepin-anything-$pkgver
-  patch -p1 -i ../linux-4.20.patch
-  patch -p1 -i ../linux-5.0.patch
-}
-
 build() {
   cd deepin-anything-$pkgver
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"

Deleted: linux-4.20.patch
===================================================================
--- linux-4.20.patch	2019-03-27 13:10:00 UTC (rev 444335)
+++ linux-4.20.patch	2019-03-27 13:10:20 UTC (rev 444336)
@@ -1,16 +0,0 @@
-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, 

Deleted: linux-5.0.patch
===================================================================
--- linux-5.0.patch	2019-03-27 13:10:00 UTC (rev 444335)
+++ linux-5.0.patch	2019-03-27 13:10:20 UTC (rev 444336)
@@ -1,64 +0,0 @@
-diff -u -r deepin-anything-0.0.4/kernelmod/vfs_change.c deepin-anything-0.0.4-5.0/kernelmod/vfs_change.c
---- deepin-anything-0.0.4/kernelmod/vfs_change.c	2019-03-04 19:59:13.782355964 +0000
-+++ deepin-anything-0.0.4-5.0/kernelmod/vfs_change.c	2019-03-04 20:17:05.425142691 +0000
-@@ -15,7 +15,7 @@
- #endif
- 
- typedef struct __vfs_change__ {
--	struct timeval ts;
-+	struct timespec64 ts;
- 	char *src, *dst;
- 	unsigned char action;
- 	unsigned short size;
-@@ -77,7 +77,7 @@
- 		return -EBUSY;
- 	}
- 
--	struct timeval* tv = kzalloc(sizeof(struct timeval), GFP_KERNEL);
-+	struct timespec64* tv = kzalloc(sizeof(struct timespec64), GFP_KERNEL);
- 	if (unlikely(tv == 0)) {
- 		atomic_set(&vfs_changes_is_open, 0);
- 		return -ENOMEM;
-@@ -104,13 +104,13 @@
- 
- #define MIN_LINE_SIZE	50
- 
--static ssize_t copy_vfs_changes(struct timeval *last, char* buf, size_t size)
-+static ssize_t copy_vfs_changes(struct timespec64 *last, char* buf, size_t size)
- {
- 	size_t total = 0;
- 	vfs_change* vc;
- 	list_for_each_entry(vc, &vfs_changes, list) {
- 		if (vc->ts.tv_sec < last->tv_sec || 
--			(vc->ts.tv_sec == last->tv_sec && vc->ts.tv_usec <= last->tv_usec))
-+			(vc->ts.tv_sec == last->tv_sec && vc->ts.tv_nsec <= last->tv_nsec))
- 			continue;
- 
- 		time_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
-@@ -122,7 +122,7 @@
- #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, 
-+			1900+ts.tm_year, 1+ts.tm_mon, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec, vc->ts.tv_nsec/1000000, 
- 			action_names[vc->action]);
- 		size_t line_len = strlen(temp) + strlen(vc->src) + 1;  //+1 for \n
- 		if (vc->dst)
-@@ -158,7 +158,7 @@
- 	if (kbuf == 0)
- 		return -ENOMEM;
- 
--	struct timeval *last = (struct timeval*)filp->private_data;
-+	struct timespec64 *last = (struct timespec64*)filp->private_data;
- 	spin_lock(&sl_changes);
- 	ssize_t r = copy_vfs_changes(last, kbuf, size);
- 	spin_unlock(&sl_changes);
-@@ -585,7 +585,7 @@
- 		strcat(full_dst, dst);
- 	}
- 	vfs_change* vc = (vfs_change*)p;
--	do_gettimeofday(&vc->ts);
-+	ktime_get_real_ts64(&vc->ts);
- 	vc->size = size;
- 	vc->action = act;
- 	vc->src = full_src;