git » nvchecker.git » commit c5df640

More build fixes

author Chih-Hsuan Yen
2023-09-02 17:04:34 UTC
committer Chih-Hsuan Yen
2023-09-02 17:04:34 UTC
parent 6e55c3b5bbdf2882804aa221e6054acf97b13ff6

More build fixes

Use git cherry-pick instead of a patch URL as patches are not stable
(hash length changed)

PKGBUILD +7 -8

diff --git a/PKGBUILD b/PKGBUILD
index becd647..5f93a36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,12 +30,8 @@ optdepends=(
   'python-gobject: for nvchecker-notify'
   'libnotify: for nvchecker-notify'
 )
-source=("git+https://github.com/lilydjwg/nvchecker.git?signed#tag=$_tag"
-        # see https://github.com/lilydjwg/nvchecker/pull/233
-        "${pkgname}_fix_symlinks.patch::https://github.com/lilydjwg/nvchecker/pull/233/commits/1986f2953a0e1dda8abb42b9d8847308546f4ea6.patch"
-)
-sha512sums=('SKIP'
-            'd55d46774773aa8cd2d35ef3f1531d747affa03a9d9f176967e82348b609b22ed755b71b206b384464840015b29a2c1725e57e75fdfe9e73c9b66d4a19fb67ad')
+source=("git+https://github.com/lilydjwg/nvchecker.git?signed#tag=$_tag")
+sha512sums=('SKIP')
 validpgpkeys=(
   # No direct trust chain. Some related stuffs:
   # https://api.github.com/users/lilydjwg/gpg_keys
@@ -52,6 +48,11 @@ _backports=(
   '598bb941352d0d554ae44742fe2a2e5e3ab306a4'
   # tests: fix tests with httpbin 0.10.0
   '07cddd9bd66eb038cfa0ede2f5b3bab0efb07488'
+  # update tests: give up deepin as it times out frequently
+  '2683f47e0405e3b2f723b58f0aa9eef879c64af8'
+
+  # see https://github.com/lilydjwg/nvchecker/pull/233 (unmerged)
+  '1986f2953a0e1dda8abb42b9d8847308546f4ea6'
 )
 
 pkgver() {
@@ -62,8 +63,6 @@ pkgver() {
 prepare() {
   cd nvchecker
 
-  patch --verbose --strip=1 --input="../${pkgname}_fix_symlinks.patch"
-
   # this loop is stolen from core/systemd :)
   local _c
   for _c in "${_backports[@]}"; do