all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob ca06da050d2d54af542c688d4ff9366780880595 1759 bytes (raw)
name: gnu/packages/patches/yabridge-5.0.4-dependencies.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 
Meson fails to detect bitsery, function2 and gulrak-filesystem.
https://github.com/robbert-vdh/yabridge/issues/18

This patch removes these dependencies in "meson.build".


diff --git a/meson.build b/meson.build
index d8d9135b..b35ebfcd 100644
--- a/meson.build
+++ b/meson.build
@@ -248,22 +248,13 @@ else
   asio_dep = dependency('asio', version : '>=1.22.0')
 endif
 
-if meson.version().version_compare('>=0.60')
-  # Bitsery's CMake build definition is capitalized for some reason
-  bitsery_dep = dependency('bitsery', 'Bitsery', version : '>=5.2.0')
-else
-  # Mmeson <=0.6.0 didn't support multiple names for a dependency, and since at
-  # the moment this is only relevant for packing on Arch btw, it's probably
-  # better to remove this conditional later than it is to bump the minimum Meson
-  # version now.
-  bitsery_dep = dependency('bitsery', version : '>=5.2.0')
-endif
+bitsery_dep = declare_dependency()
 
 # The D-Bus headers are also only accessed through the include path. We don't
 # link to libdbus-1 to make soname changes don't completely break yabridge.
 dbus_dep = dependency('dbus-1').partial_dependency(compile_args : true, includes : true)
-function2_dep = dependency('function2', version : '>=4.0.0')
-ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0')
+function2_dep = declare_dependency()
+ghc_filesystem_dep = declare_dependency()
 threads_dep = dependency('threads')
 # Tomlplusplus recently added a shraed library version. We don't want to link to that.
 tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.3.0', default_options : ['compile_library=false']).partial_dependency(compile_args : true, includes : true)

debug log:

solving ca06da050d ...
found ca06da050d in https://yhetil.org/guix/5212b5b349e392f9d2b2de4a2ac4b7168bbe0915.1732814113.git.sughosha@disroot.org/

applying [1/1] https://yhetil.org/guix/5212b5b349e392f9d2b2de4a2ac4b7168bbe0915.1732814113.git.sughosha@disroot.org/
diff --git a/gnu/packages/patches/yabridge-5.0.4-dependencies.patch b/gnu/packages/patches/yabridge-5.0.4-dependencies.patch
new file mode 100644
index 0000000000..ca06da050d

1:7: trailing whitespace.
Meson fails to detect bitsery, function2 and gulrak-filesystem.\r
1:8: trailing whitespace.
https://github.com/robbert-vdh/yabridge/issues/18\r
1:9: trailing whitespace.
\r
1:10: trailing whitespace.
This patch removes these dependencies in "meson.build".\r
1:11: trailing whitespace.
\r
Checking patch gnu/packages/patches/yabridge-5.0.4-dependencies.patch...
Applied patch gnu/packages/patches/yabridge-5.0.4-dependencies.patch cleanly.
warning: squelched 30 whitespace errors
warning: 35 lines add whitespace errors.

index at:
100644 ca06da050d2d54af542c688d4ff9366780880595	gnu/packages/patches/yabridge-5.0.4-dependencies.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.