[arch-commits] Commit in deepin-anything/repos/community-x86_64 (5 files)
Christian Hesse
eworm at archlinux.org
Fri Apr 3 20:00:00 UTC 2020
Date: Friday, April 3, 2020 @ 19:59:59
Author: eworm
Revision: 611204
archrelease: copy trunk to community-x86_64
Added:
deepin-anything/repos/community-x86_64/0001-linux-5.6.patch
(from rev 611203, deepin-anything/trunk/0001-linux-5.6.patch)
deepin-anything/repos/community-x86_64/PKGBUILD
(from rev 611203, deepin-anything/trunk/PKGBUILD)
deepin-anything/repos/community-x86_64/deepin-anything-server.sysusers
(from rev 611203, deepin-anything/trunk/deepin-anything-server.sysusers)
Deleted:
deepin-anything/repos/community-x86_64/PKGBUILD
deepin-anything/repos/community-x86_64/deepin-anything-server.sysusers
---------------------------------+
0001-linux-5.6.patch | 40 ++++++++++++++
PKGBUILD | 103 +++++++++++++++++++-------------------
deepin-anything-server.sysusers | 4 -
3 files changed, 95 insertions(+), 52 deletions(-)
Copied: deepin-anything/repos/community-x86_64/0001-linux-5.6.patch (from rev 611203, deepin-anything/trunk/0001-linux-5.6.patch)
===================================================================
--- 0001-linux-5.6.patch (rev 0)
+++ 0001-linux-5.6.patch 2020-04-03 19:59:59 UTC (rev 611204)
@@ -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)
+ {
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-03 19:59:51 UTC (rev 611203)
+++ PKGBUILD 2020-04-03 19:59:59 UTC (rev 611204)
@@ -1,50 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=deepin-anything
-pkgname=(deepin-anything deepin-anything-dkms)
-pkgver=5.0.1
-_extramodules=extramodules-ARCH
-pkgrel=1
-pkgdesc="Deepin Anything file search tool"
-arch=('x86_64')
-url="https://github.com/linuxdeepin/deepin-anything"
-license=('GPL3')
-makedepends=('dtkcore' 'udisks2-qt5')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
- deepin-anything-server.sysusers)
-sha512sums=('f79b4db917cce2611bd6964d00ae0e162fc500fa7ca76a987145456a9ee81296c776d2b83cf6492a4224c4e4fd95df3ad95a25c1c14d2d4e6865f5bbd639be14'
- '0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85')
-
-prepare() {
- cd deepin-anything-$pkgver
- sed -i 's|^systemd_service.path.*|systemd_service.path = /usr/lib/systemd/system|' server/monitor/src/src.pro server/tool/tool.pro
-}
-
-build() {
- cd deepin-anything-$pkgver
- make VERSION=$pkgver
-}
-
-package_deepin-anything-dkms() {
- depends=('dkms')
- provides=('DEEPIN-ANYTHING-MODULE')
- conflicts=('DEEPIN-ANYTHING-MODULE')
-
- cd deepin-anything-$pkgver
- install -dm 755 "$pkgdir"/usr/src
- cp -r kernelmod "$pkgdir"/usr/src/deepin-anything-$pkgver
- install -m644 debian/deepin-anything-dkms.dkms "$pkgdir"/usr/src/deepin-anything-$pkgver/dkms.conf
-}
-
-package_deepin-anything() {
- depends=('DEEPIN-ANYTHING-MODULE' 'dtkcore' 'udisks2-qt5')
- groups=('deepin')
-
- cd deepin-anything-$pkgver
- make VERSION=$pkgver DESTDIR="$pkgdir" install
- rm -r "$pkgdir"/usr/src
-
- mv "$pkgdir"/etc/dbus-1/system.d "$pkgdir"/usr/share/dbus-1/system.d
-
- install -Dm644 ../deepin-anything-server.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-anything-server.conf"
-}
Copied: deepin-anything/repos/community-x86_64/PKGBUILD (from rev 611203, deepin-anything/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-03 19:59:59 UTC (rev 611204)
@@ -0,0 +1,53 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=deepin-anything
+pkgname=(deepin-anything deepin-anything-dkms)
+pkgver=5.0.1
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="Deepin Anything file search tool"
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-anything"
+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
+}
+
+build() {
+ cd deepin-anything-$pkgver
+ make VERSION=$pkgver
+}
+
+package_deepin-anything-dkms() {
+ depends=('dkms')
+ provides=('DEEPIN-ANYTHING-MODULE')
+ conflicts=('DEEPIN-ANYTHING-MODULE')
+
+ cd deepin-anything-$pkgver
+ install -dm 755 "$pkgdir"/usr/src
+ cp -r kernelmod "$pkgdir"/usr/src/deepin-anything-$pkgver
+ install -m644 debian/deepin-anything-dkms.dkms "$pkgdir"/usr/src/deepin-anything-$pkgver/dkms.conf
+}
+
+package_deepin-anything() {
+ depends=('DEEPIN-ANYTHING-MODULE' 'dtkcore' 'udisks2-qt5')
+ groups=('deepin')
+
+ cd deepin-anything-$pkgver
+ make VERSION=$pkgver DESTDIR="$pkgdir" install
+ rm -r "$pkgdir"/usr/src
+
+ mv "$pkgdir"/etc/dbus-1/system.d "$pkgdir"/usr/share/dbus-1/system.d
+
+ install -Dm644 ../deepin-anything-server.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-anything-server.conf"
+}
Deleted: deepin-anything-server.sysusers
===================================================================
--- deepin-anything-server.sysusers 2020-04-03 19:59:51 UTC (rev 611203)
+++ deepin-anything-server.sysusers 2020-04-03 19:59:59 UTC (rev 611204)
@@ -1,2 +0,0 @@
-u deepin_anything_server - "Deepin Anything Server"
-g deepin_anything_server -
Copied: deepin-anything/repos/community-x86_64/deepin-anything-server.sysusers (from rev 611203, deepin-anything/trunk/deepin-anything-server.sysusers)
===================================================================
--- deepin-anything-server.sysusers (rev 0)
+++ deepin-anything-server.sysusers 2020-04-03 19:59:59 UTC (rev 611204)
@@ -0,0 +1,2 @@
+u deepin_anything_server - "Deepin Anything Server"
+g deepin_anything_server -
More information about the arch-commits
mailing list