mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-29 21:41:15 +02:00
gnu: opendht: Update to 3.7.0rc8.
* gnu/packages/patches/opendht-meson-install-headers.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/networking.scm (opendht): Update to 3.7.0rc8. [source] <patches>: Delete. Change-Id: Id1d8b4a095edcaabc92ecb17f7a203e29df21d27
This commit is contained in:
@@ -1996,7 +1996,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/openboardview-use-system-mpc.patch \
|
||||
%D%/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch \
|
||||
%D%/packages/patches/openbox-python3.patch \
|
||||
%D%/packages/patches/opendht-meson-install-headers.patch \
|
||||
%D%/packages/patches/openexr-2-gcc-14.patch \
|
||||
%D%/packages/patches/openfst-for-vosk-fix-unique-ptr.patch \
|
||||
%D%/packages/patches/openjdk-currency-time-bomb.patch \
|
||||
|
||||
@@ -4239,7 +4239,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
|
||||
(define-public opendht
|
||||
(package
|
||||
(name "opendht")
|
||||
(version "3.6.2.3")
|
||||
(version "3.7.0rc8") ;jami depends on this RC
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -4248,9 +4248,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v8miwsslqlqlpp7p210jhxwkblqyc69cgxaq680qhg7h1sf3y2i"))
|
||||
(patches
|
||||
(search-patches "opendht-meson-install-headers.patch"))))
|
||||
"0ysfwrqjh6mpy6zycmd3ljsd63ap8i4psgnr25vp0xqbjrfz6rf6"))))
|
||||
(outputs '("out" "python" "tools" "debug"))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
Upstream-status: <https://github.com/savoirfairelinux/opendht/pull/821>
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index d3c4a500..8d1ed563 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -116,6 +116,13 @@ opendht = library(
|
||||
install: true,
|
||||
)
|
||||
|
||||
+# Install library headers.
|
||||
+install_subdir(
|
||||
+ 'include',
|
||||
+ install_dir: get_option('includedir'),
|
||||
+ strip_directory: true
|
||||
+)
|
||||
+
|
||||
conf_data.set('VERSION', meson.project_version())
|
||||
conf_data.set('prefix', get_option('prefix'))
|
||||
conf_data.set('exec_prefix', get_option('prefix'))
|
||||
@@ -145,6 +152,11 @@ if get_option('c').enabled()
|
||||
install: true,
|
||||
)
|
||||
|
||||
+ install_headers(
|
||||
+ 'c/opendht_c.h',
|
||||
+ subdir: 'opendht'
|
||||
+ )
|
||||
+
|
||||
configure_file(
|
||||
input: 'opendht-c.pc.in',
|
||||
output: 'opendht-c.pc',
|
||||
Reference in New Issue
Block a user