* [bug#65371] [PATCH telephony-team 02/10] gnu: mmtf-cpp: Update to 1.1.0.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 03/10] gnu: avogadrolibs: Remove msgpack from native-inputs Maxim Cournoyer
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier
* gnu/packages/chemistry.scm (mmtf-cpp): Update to 1.1.0.
[propagated-inputs]: Add msgpack-3.
---
gnu/packages/chemistry.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 05aaa827f8..25b31c7192 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -248,7 +248,7 @@ (define-public libmsym
(define-public mmtf-cpp
(package
(name "mmtf-cpp")
- (version "1.0.0")
+ (version "1.1.0")
(source
(origin
(method git-fetch)
@@ -258,11 +258,13 @@ (define-public mmtf-cpp
(file-name (git-file-name name version))
(sha256
(base32
- "17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l"))))
+ "0rs2f1ppgqz663c3m22p8wsq6z839bj59zy29chci46ypfhwv6ph"))))
(build-system cmake-build-system)
;; Tests require the soon-to-be-deprecated version 1 of the catch-framework.
- (arguments
- '(#:tests? #f))
+ (arguments '(#:tests? #f))
+ ;; There is no support for modern msgpack versions yet (see:
+ ;; https://github.com/rcsb/mmtf-cpp/issues/44).
+ (propagated-inputs (list msgpack-3)) ;included by mmtf/structure_data.hpp
(home-page "https://mmtf.rcsb.org/")
(synopsis "C++ API for the Macromolecular Transmission Format")
(description "This package is a library for the
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 03/10] gnu: avogadrolibs: Remove msgpack from native-inputs.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 02/10] gnu: mmtf-cpp: Update to 1.1.0 Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: " Maxim Cournoyer
` (6 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier
It's now propagated by mmtf-cpp.
* gnu/packages/chemistry.scm (avogadrolibs)
[native-inputs]: Remove msgpack.
---
gnu/packages/chemistry.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 25b31c7192..4d5d3d0195 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -87,7 +87,6 @@ (define-public avogadrolibs
(native-inputs
(list eigen
mmtf-cpp
- msgpack
googletest
pkg-config
pybind11))
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: Remove msgpack from native-inputs.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 02/10] gnu: mmtf-cpp: Update to 1.1.0 Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 03/10] gnu: avogadrolibs: Remove msgpack from native-inputs Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-19 9:53 ` Andreas Enge
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 05/10] gnu: msgpack: Deprecate with msgpack-c Maxim Cournoyer
` (5 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier
It's now propagated by mmtf-cpp.
* gnu/packages/chemistry.scm (python-pymol)
[native-inputs]: Remove msgpack.
---
gnu/packages/chemistry.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 4d5d3d0195..df96a2f5c1 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -575,7 +575,6 @@ (define-public python-pymol
glew
libxml2
mmtf-cpp
- msgpack
python-pyqt
glm
netcdf))
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: Remove msgpack from native-inputs.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: " Maxim Cournoyer
@ 2023-08-19 9:53 ` Andreas Enge
2023-08-21 15:03 ` Maxim Cournoyer
0 siblings, 1 reply; 16+ messages in thread
From: Andreas Enge @ 2023-08-19 9:53 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 65371, Efraim Flashner, Eric Bavier
Hello Maxim,
Am Fri, Aug 18, 2023 at 02:12:55PM -0400 schrieb Maxim Cournoyer:
> It's now propagated by mmtf-cpp.
> * gnu/packages/chemistry.scm (python-pymol)
> [native-inputs]: Remove msgpack.
the patches 2 to 4, to which I was cc-ed, look good to me.
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: Remove msgpack from native-inputs.
2023-08-19 9:53 ` Andreas Enge
@ 2023-08-21 15:03 ` Maxim Cournoyer
0 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-21 15:03 UTC (permalink / raw)
To: Andreas Enge; +Cc: 65371, Efraim Flashner, Eric Bavier
Hello,
Andreas Enge <andreas@enge.fr> writes:
> Hello Maxim,
>
> Am Fri, Aug 18, 2023 at 02:12:55PM -0400 schrieb Maxim Cournoyer:
>> It's now propagated by mmtf-cpp.
>> * gnu/packages/chemistry.scm (python-pymol)
>> [native-inputs]: Remove msgpack.
>
> the patches 2 to 4, to which I was cc-ed, look good to me.
>
> Andreas
Thanks for reviewing these! Will push shortly and update the series
with the remaining ones.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#65371] [PATCH telephony-team 05/10] gnu: msgpack: Deprecate with msgpack-c.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
` (2 preceding siblings ...)
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 04/10] gnu: python-pymol: " Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp Maxim Cournoyer
` (4 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer
* gnu/packages/serialization.scm (msgpack-c): New variable.
(msgpack-cxx): New variable.
(msgpack): Rename to...
(msgpack-3): ... this, and inherit from msgpack-c.
* gnu/packages/vim.scm (eovim) [inputs]: Replace msgpack with msgpack-3.
* gnu/packages/terminals.scm (tmate): Likewise.
* gnu/packages/networking.scm (opendht)
[propagated-inputs]: Replace msgpack with msgpack-cxx.
---
gnu/packages/networking.scm | 2 +-
gnu/packages/serialization.scm | 71 +++++++++++++++++++++++++++-------
gnu/packages/terminals.scm | 6 +--
gnu/packages/vim.scm | 6 +--
4 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 55c938606f..a7cb4f876e 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3847,7 +3847,7 @@ (define-public opendht
fmt
readline))
(propagated-inputs
- (list msgpack ;included in several installed headers
+ (list msgpack-cxx ;included in several installed headers
restinio ;included in opendht/http.h
;; The following are listed in the 'Requires.private' field of
;; opendht.pc:
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 9c114aaf39..9f2aab250e 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -222,8 +223,60 @@ (define-public cereal-1.3.0
(list doxygen gcc-10
(package-source cereal)))))
+(define-public msgpack-c
+ (package
+ (name "msgpack-c")
+ (version "6.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/msgpack/msgpack-c/releases/download/"
+ "c-" version "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1fmf08babfsjq5qkgw034wk2nw6mayxp1qlkm7h55p2jqvigam1n"))
+ (snippet
+ '(let ((p (open-file "msgpack-c.pc.in" "a")))
+ (display "Requires: zlib\n" p)
+ (close-output-port p)))))
+ (build-system cmake-build-system)
+ (arguments (list #:configure-flags #~(list "-DMSGPACK_BUILD_TESTS=ON")))
+ (native-inputs (list googletest))
+ (propagated-inputs (list zlib)) ;zbuffer.h includes zlib.h
+ (home-page "https://www.msgpack.org")
+ (synopsis "Binary serialization library")
+ (description "Msgpack is a library for C that implements binary
+serialization.")
+ (license license:boost1.0)))
+
+(define-public msgpack-cxx
+ (package
+ (inherit msgpack-c)
+ (name "msgpack-cxx")
+ (version "6.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/msgpack/msgpack-c/releases/download/"
+ "cpp-" version "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1rrrf3nskcv994z3pbq6a5z2021piz118rccmm1y7zlf7klygv93"))))
+ (build-system cmake-build-system)
+ (propagated-inputs (list boost zlib)) ;included in headers
+ (description "Msgpack is a library for C++ that implements binary
+serialization.")))
+
+;;; The msgpack package was split into msgpack-c and msgpack-cxx starting from
+;;; version 4.0.0.
(define-public msgpack
+ (deprecated-package "msgpack" msgpack-c))
+
+(define-public msgpack-3
(package
+ (inherit msgpack-c)
(name "msgpack")
(version "3.3.0")
(source
@@ -237,23 +290,13 @@ (define-public msgpack
'(let ((p (open-file "msgpack.pc.in" "a")))
(display
(string-append "Requires: " "zlib" "\n") p)
- (close-output-port p)
- #t))
+ (close-output-port p)))
(sha256
(base32 "0yzhq50ijvwrfkr97knhvn54lj3f4hr3zy39yq8wpf6xll94s4bf"))))
- (build-system cmake-build-system)
- (native-inputs
- (list googletest-1.8 pkg-config))
- (propagated-inputs
- (list zlib)) ;; Msgpack installs two headers (zbuffer.h,
- ;; zbuffer.hpp) which #include <zlib.h>. However, 'guix gc --references'
- ;; does not detect a store reference to zlib since these headers are not
- ;; compiled.
- (home-page "https://www.msgpack.org")
- (synopsis "Binary serialization library")
+ (native-inputs (list googletest-1.8))
(description "Msgpack is a library for C/C++ that implements binary
-serialization.")
- (license license:boost1.0)))
+serialization. This is the legacy version that predates the split into C and
+C++ specific packages.")))
(define-public libmpack
(package
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 5fc72d7937..44641360ba 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1172,10 +1172,8 @@ (define-public tmate
(base32
"0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi"))))
(build-system gnu-build-system)
- (inputs
- (list libevent libssh msgpack ncurses))
- (native-inputs
- (list autoconf automake pkg-config))
+ (inputs (list libevent libssh msgpack-3 ncurses))
+ (native-inputs (list autoconf automake pkg-config))
(home-page "https://tmate.io/")
(synopsis "Terminal sharing application")
(description "tmate is a terminal sharing application that allows you to
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d58b022123..16f73e355f 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -814,10 +814,8 @@ (define-public eovim
(string-append start nvim))))))
(add-before 'build 'set-home
(lambda _ (setenv "HOME" "/tmp"))))))
- (native-inputs
- (list pkg-config))
- (inputs
- (list efl msgpack neovim))
+ (native-inputs (list pkg-config))
+ (inputs (list efl msgpack-3 neovim))
(home-page "https://github.com/jeanguyomarch/eovim/")
(synopsis "EFL GUI for Neovim")
(description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
` (3 preceding siblings ...)
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 05/10] gnu: msgpack: Deprecate with msgpack-c Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-18 18:53 ` Liliana Marie Prikler
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 07/10] gnu: libnatpmp: Use gexps and simplify Maxim Cournoyer
` (3 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371
Cc: Maxim Cournoyer, Liliana Marie Prikler, Maxim Cournoyer,
Raghav Gururajan
* gnu/packages/glib.scm (sdbus-cpp): New variable.
* gnu/packages/patches/sdbus-c++-elogind.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/glib.scm | 43 +++++++++++++
gnu/packages/patches/sdbus-c++-elogind.patch | 63 ++++++++++++++++++++
3 files changed, 107 insertions(+)
create mode 100644 gnu/packages/patches/sdbus-c++-elogind.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index abe8964f4d..de669c1177 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1938,6 +1938,7 @@ dist_patch_DATA = \
%D%/packages/patches/scons-test-environment.patch \
%D%/packages/patches/screen-hurd-path-max.patch \
%D%/packages/patches/scsh-nonstring-search-path.patch \
+ %D%/packages/patches/sdbus-c++-elogind.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/seed-webkit.patch \
%D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a0b85b15d1..588133e93f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1290,6 +1290,49 @@ (define-public dbus-cxx
(home-page "https://dbus-cxx.github.io/")
(license license:gpl3)))
+(define-public sdbus-c++
+ ;; Use the latest commit, which includes unreleased fixes to the pkg-config
+ ;; file.
+ (let ((commit "3e84b254e9603935cb5fc180c4d2214d7024ccbb")
+ (revision "0"))
+ (package
+ (name "sdbus-c++")
+ (version (git-version "1.2.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Kistler-Group/sdbus-cpp")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0xrcp49almi3kwzmwcwv8sayqjxx8m55s5grxarw2hl9jmghwlc3"))
+ (patches (search-patches "sdbus-c++-elogind.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; Avoid the integration test, which requires a system bus.
+ #:test-target "sdbus-c++-unit-tests"
+ #:configure-flags #~(list "-DBUILD_CODE_GEN=ON"
+ "-DBUILD_TESTS=ON"
+ ;; Do not install tests.
+ "-DTESTS_INSTALL_PATH=/tmp"
+ "-DCMAKE_VERBOSE_MAKEFILE=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'do-not-install-tests
+ (lambda _
+ (substitute* "tests/CMakeLists.txt"
+ (("/etc/dbus-1/system.d") "/tmp")))))))
+ (native-inputs (list googletest pkg-config))
+ (inputs (list expat))
+ (propagated-inputs (list elogind)) ;required by sdbus-c++.pc
+ (home-page "https://github.com/Kistler-Group/sdbus-cpp")
+ (synopsis "High-level C++ D-Bus library")
+ (description "@code{sdbus-c++} is a high-level C++ D-Bus library designed
+to provide easy-to-use yet powerful API in modern C++. It adds another layer
+of abstraction on top of @code{sd-bus}, the C D-Bus implementation by systemd.")
+ (license license:lgpl2.1+))))
+
(define-public appstream-glib
(package
(name "appstream-glib")
diff --git a/gnu/packages/patches/sdbus-c++-elogind.patch b/gnu/packages/patches/sdbus-c++-elogind.patch
new file mode 100644
index 0000000000..d01838edbc
--- /dev/null
+++ b/gnu/packages/patches/sdbus-c++-elogind.patch
@@ -0,0 +1,63 @@
+Submitted upstream: https://github.com/Kistler-Group/sdbus-cpp/pull/352
+
+From 8423c44b6c24ebd59db06ad33704265aa81a1c7a Mon Sep 17 00:00:00 2001
+From: Sven Eden <sven.eden@prydeworx.com>
+Date: Thu, 17 Aug 2023 23:16:19 -0400
+Subject: [PATCH] build: Add support for elogind.
+
+* CMakeLists.txt: Fallback to elogind when libsystemd could not be
+found. Set LIBSYSTEMD variable.
+* pkgconfig/sdbus-c++.pc.in (Description): Parameterize with above
+LIBSYSTEMD variable.
+
+Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+---
+ CMakeLists.txt | 11 +++++++++++
+ pkgconfig/sdbus-c++.pc.in | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94f71c7..40c15f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,11 +12,22 @@ include(GNUInstallDirs) # Installation directories for `install` command and pkg
+ # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
+ #-------------------------------
+
++set(LIBSYSTEMD "libsystemd")
++
+ option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
+
+ if(NOT BUILD_LIBSYSTEMD)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236)
++ if(NOT TARGET PkgConfig::Systemd)
++ message(WARNING "libsystemd not found, checking for libelogind instead")
++ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236)
++ if(TARGET PkgConfig::Systemd)
++ set(LIBSYSTEMD "libelogind")
++ string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
++ list(GET VERSION_LIST 0 Systemd_VERSION)
++ endif()
++ endif()
+ if(NOT TARGET PkgConfig::Systemd)
+ message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found "
+ "(if you have systemd in your OS, you may want to install package containing pkgconfig "
+diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in
+index 6ad010a..0703476 100644
+--- a/pkgconfig/sdbus-c++.pc.in
++++ b/pkgconfig/sdbus-c++.pc.in
+@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: @PROJECT_NAME@
+ Description: C++ library on top of sd-bus, a systemd D-Bus library
+-Requires@PKGCONFIG_REQS@: libsystemd
++Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
+
+base-commit: 3e84b254e9603935cb5fc180c4d2214d7024ccbb
+--
+2.41.0
+
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp Maxim Cournoyer
@ 2023-08-18 18:53 ` Liliana Marie Prikler
2023-08-21 14:57 ` Maxim Cournoyer
0 siblings, 1 reply; 16+ messages in thread
From: Liliana Marie Prikler @ 2023-08-18 18:53 UTC (permalink / raw)
To: Maxim Cournoyer, 65371; +Cc: Raghav Gururajan
Am Freitag, dem 18.08.2023 um 14:12 -0400 schrieb Maxim Cournoyer:
> * gnu/packages/glib.scm (sdbus-cpp): New variable.
> * gnu/packages/patches/sdbus-c++-elogind.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> ---
>
> gnu/local.mk | 1 +
> gnu/packages/glib.scm | 43 +++++++++++++
> gnu/packages/patches/sdbus-c++-elogind.patch | 63
> ++++++++++++++++++++
> 3 files changed, 107 insertions(+)
> create mode 100644 gnu/packages/patches/sdbus-c++-elogind.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index abe8964f4d..de669c1177 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1938,6 +1938,7 @@ dist_patch_DATA
> = \
> %D%/packages/patches/scons-test-environment.patch \
> %D%/packages/patches/screen-hurd-path-max.patch \
> %D%/packages/patches/scsh-nonstring-search-path.patch \
> + %D%/packages/patches/sdbus-c++-elogind.patch \
> %D%/packages/patches/sdl-libx11-1.6.patch \
> %D%/packages/patches/seed-webkit.patch \
> %D%/packages/patches/sendgmail-accept-ignored-gsuite-
> flag.patch \
> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> index a0b85b15d1..588133e93f 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -1290,6 +1290,49 @@ (define-public dbus-cxx
> (home-page "https://dbus-cxx.github.io/")
> (license license:gpl3)))
>
> +(define-public sdbus-c++
> + ;; Use the latest commit, which includes unreleased fixes to the
> pkg-config
> + ;; file.
> + (let ((commit "3e84b254e9603935cb5fc180c4d2214d7024ccbb")
> + (revision "0"))
> + (package
> + (name "sdbus-c++")
> + (version (git-version "1.2.0" revision commit))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url
> "https://github.com/Kistler-Group/sdbus-cpp")
> + (commit commit)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> +
> "0xrcp49almi3kwzmwcwv8sayqjxx8m55s5grxarw2hl9jmghwlc3"))
> + (patches (search-patches "sdbus-c++-
> elogind.patch"))))
> + (build-system cmake-build-system)
> + (arguments
> + (list
> + ;; Avoid the integration test, which requires a system bus.
> + #:test-target "sdbus-c++-unit-tests"
> + #:configure-flags #~(list "-DBUILD_CODE_GEN=ON"
> + "-DBUILD_TESTS=ON"
> + ;; Do not install tests.
> + "-DTESTS_INSTALL_PATH=/tmp"
> + "-DCMAKE_VERBOSE_MAKEFILE=ON")
> + #:phases #~(modify-phases %standard-phases
> + (add-after 'unpack 'do-not-install-tests
> + (lambda _
> + (substitute* "tests/CMakeLists.txt"
> + (("/etc/dbus-1/system.d") "/tmp")))))))
Should we perhaps add those to a separate output? Are they useful on
their own?
> + (native-inputs (list googletest pkg-config))
> + (inputs (list expat))
> + (propagated-inputs (list elogind)) ;required by sdbus-c++.pc
> + (home-page "https://github.com/Kistler-Group/sdbus-cpp")
> + (synopsis "High-level C++ D-Bus library")
> + (description "@code{sdbus-c++} is a high-level C++ D-Bus
> library designed
> +to provide easy-to-use yet powerful API in modern C++. It adds
> another layer
> +of abstraction on top of @code{sd-bus}, the C D-Bus implementation
> by systemd.")
> + (license license:lgpl2.1+))))
> +
> (define-public appstream-glib
> (package
> (name "appstream-glib")
> diff --git a/gnu/packages/patches/sdbus-c++-elogind.patch
> b/gnu/packages/patches/sdbus-c++-elogind.patch
> new file mode 100644
> index 0000000000..d01838edbc
> --- /dev/null
> +++ b/gnu/packages/patches/sdbus-c++-elogind.patch
> @@ -0,0 +1,63 @@
> +Submitted upstream:
> https://github.com/Kistler-Group/sdbus-cpp/pull/352
> +
> +From 8423c44b6c24ebd59db06ad33704265aa81a1c7a Mon Sep 17 00:00:00
> 2001
> +From: Sven Eden <sven.eden@prydeworx.com>
> +Date: Thu, 17 Aug 2023 23:16:19 -0400
> +Subject: [PATCH] build: Add support for elogind.
> +
> +* CMakeLists.txt: Fallback to elogind when libsystemd could not be
> +found. Set LIBSYSTEMD variable.
> +* pkgconfig/sdbus-c++.pc.in (Description): Parameterize with above
> +LIBSYSTEMD variable.
> +
> +Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> +---
> + CMakeLists.txt | 11 +++++++++++
> + pkgconfig/sdbus-c++.pc.in | 2 +-
> + 2 files changed, 12 insertions(+), 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 94f71c7..40c15f8 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -12,11 +12,22 @@ include(GNUInstallDirs) # Installation
> directories for `install` command and pkg
> + # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
> + #-------------------------------
> +
> ++set(LIBSYSTEMD "libsystemd")
> ++
> + option(BUILD_LIBSYSTEMD "Build libsystemd static library and
> incorporate it into libsdbus-c++" OFF)
> +
> + if(NOT BUILD_LIBSYSTEMD)
> + find_package(PkgConfig REQUIRED)
> + pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL
> libsystemd>=236)
> ++ if(NOT TARGET PkgConfig::Systemd)
> ++ message(WARNING "libsystemd not found, checking for
> libelogind instead")
Perhaps demote this to INFO?
> ++ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL
> libelogind>=236)
> ++ if(TARGET PkgConfig::Systemd)
> ++ set(LIBSYSTEMD "libelogind")
> ++ string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
> ++ list(GET VERSION_LIST 0 Systemd_VERSION)
> ++ endif()
> ++ endif()
> + if(NOT TARGET PkgConfig::Systemd)
> + message(FATAL_ERROR "libsystemd of version at least 236 is
> required, but was not found "
> + "(if you have systemd in your OS, you
> may want to install package containing pkgconfig "
> +diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in
> +index 6ad010a..0703476 100644
> +--- a/pkgconfig/sdbus-c++.pc.in
> ++++ b/pkgconfig/sdbus-c++.pc.in
> +@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
> +
> + Name: @PROJECT_NAME@
> + Description: C++ library on top of sd-bus, a systemd D-Bus library
> +-Requires@PKGCONFIG_REQS@: libsystemd
> ++Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@
> + Version: @SDBUSCPP_VERSION@
> + Libs: -L${libdir} -l@PROJECT_NAME@
> + Cflags: -I${includedir}
> +
> +base-commit: 3e84b254e9603935cb5fc180c4d2214d7024ccbb
> +--
> +2.41.0
> +
Otherwise LGTM.
Cheers
^ permalink raw reply [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp.
2023-08-18 18:53 ` Liliana Marie Prikler
@ 2023-08-21 14:57 ` Maxim Cournoyer
2024-01-10 3:37 ` bug#65371: " Maxim Cournoyer
0 siblings, 1 reply; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-21 14:57 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 65371, Raghav Gururajan
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Freitag, dem 18.08.2023 um 14:12 -0400 schrieb Maxim Cournoyer:
>> * gnu/packages/glib.scm (sdbus-cpp): New variable.
>> * gnu/packages/patches/sdbus-c++-elogind.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Register it.
>> ---
>>
>> gnu/local.mk | 1 +
>> gnu/packages/glib.scm | 43 +++++++++++++
>> gnu/packages/patches/sdbus-c++-elogind.patch | 63
>> ++++++++++++++++++++
>> 3 files changed, 107 insertions(+)
>> create mode 100644 gnu/packages/patches/sdbus-c++-elogind.patch
>>
>> diff --git a/gnu/local.mk b/gnu/local.mk
>> index abe8964f4d..de669c1177 100644
>> --- a/gnu/local.mk
>> +++ b/gnu/local.mk
>> @@ -1938,6 +1938,7 @@ dist_patch_DATA
>> = \
>> %D%/packages/patches/scons-test-environment.patch \
>> %D%/packages/patches/screen-hurd-path-max.patch \
>> %D%/packages/patches/scsh-nonstring-search-path.patch \
>> + %D%/packages/patches/sdbus-c++-elogind.patch \
>> %D%/packages/patches/sdl-libx11-1.6.patch \
>> %D%/packages/patches/seed-webkit.patch \
>> %D%/packages/patches/sendgmail-accept-ignored-gsuite-
>> flag.patch \
>> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
>> index a0b85b15d1..588133e93f 100644
>> --- a/gnu/packages/glib.scm
>> +++ b/gnu/packages/glib.scm
>> @@ -1290,6 +1290,49 @@ (define-public dbus-cxx
>> (home-page "https://dbus-cxx.github.io/")
>> (license license:gpl3)))
>>
>> +(define-public sdbus-c++
>> + ;; Use the latest commit, which includes unreleased fixes to the
>> pkg-config
>> + ;; file.
>> + (let ((commit "3e84b254e9603935cb5fc180c4d2214d7024ccbb")
>> + (revision "0"))
>> + (package
>> + (name "sdbus-c++")
>> + (version (git-version "1.2.0" revision commit))
>> + (source (origin
>> + (method git-fetch)
>> + (uri (git-reference
>> + (url
>> "https://github.com/Kistler-Group/sdbus-cpp")
>> + (commit commit)))
>> + (file-name (git-file-name name version))
>> + (sha256
>> + (base32
>> +
>> "0xrcp49almi3kwzmwcwv8sayqjxx8m55s5grxarw2hl9jmghwlc3"))
>> + (patches (search-patches "sdbus-c++-
>> elogind.patch"))))
>> + (build-system cmake-build-system)
>> + (arguments
>> + (list
>> + ;; Avoid the integration test, which requires a system bus.
>> + #:test-target "sdbus-c++-unit-tests"
>> + #:configure-flags #~(list "-DBUILD_CODE_GEN=ON"
>> + "-DBUILD_TESTS=ON"
>> + ;; Do not install tests.
>> + "-DTESTS_INSTALL_PATH=/tmp"
>> + "-DCMAKE_VERBOSE_MAKEFILE=ON")
>> + #:phases #~(modify-phases %standard-phases
>> + (add-after 'unpack 'do-not-install-tests
>> + (lambda _
>> + (substitute* "tests/CMakeLists.txt"
>> + (("/etc/dbus-1/system.d") "/tmp")))))))
> Should we perhaps add those to a separate output? Are they useful on
> their own?
My informal policy on tests installation has been "only maybe install
tests if they cannot be made to run at build time", which is not the
case here.
>> + (native-inputs (list googletest pkg-config))
>> + (inputs (list expat))
>> + (propagated-inputs (list elogind)) ;required by sdbus-c++.pc
>> + (home-page "https://github.com/Kistler-Group/sdbus-cpp")
>> + (synopsis "High-level C++ D-Bus library")
>> + (description "@code{sdbus-c++} is a high-level C++ D-Bus
>> library designed
>> +to provide easy-to-use yet powerful API in modern C++. It adds
>> another layer
>> +of abstraction on top of @code{sd-bus}, the C D-Bus implementation
>> by systemd.")
>> + (license license:lgpl2.1+))))
>> +
>> (define-public appstream-glib
>> (package
>> (name "appstream-glib")
>> diff --git a/gnu/packages/patches/sdbus-c++-elogind.patch
>> b/gnu/packages/patches/sdbus-c++-elogind.patch
>> new file mode 100644
>> index 0000000000..d01838edbc
>> --- /dev/null
>> +++ b/gnu/packages/patches/sdbus-c++-elogind.patch
>> @@ -0,0 +1,63 @@
>> +Submitted upstream:
>> https://github.com/Kistler-Group/sdbus-cpp/pull/352
>> +
>> +From 8423c44b6c24ebd59db06ad33704265aa81a1c7a Mon Sep 17 00:00:00
>> 2001
>> +From: Sven Eden <sven.eden@prydeworx.com>
>> +Date: Thu, 17 Aug 2023 23:16:19 -0400
>> +Subject: [PATCH] build: Add support for elogind.
>> +
>> +* CMakeLists.txt: Fallback to elogind when libsystemd could not be
>> +found. Set LIBSYSTEMD variable.
>> +* pkgconfig/sdbus-c++.pc.in (Description): Parameterize with above
>> +LIBSYSTEMD variable.
>> +
>> +Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>> +---
>> + CMakeLists.txt | 11 +++++++++++
>> + pkgconfig/sdbus-c++.pc.in | 2 +-
>> + 2 files changed, 12 insertions(+), 1 deletion(-)
>> +
>> +diff --git a/CMakeLists.txt b/CMakeLists.txt
>> +index 94f71c7..40c15f8 100644
>> +--- a/CMakeLists.txt
>> ++++ b/CMakeLists.txt
>> +@@ -12,11 +12,22 @@ include(GNUInstallDirs) # Installation
>> directories for `install` command and pkg
>> + # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
>> + #-------------------------------
>> +
>> ++set(LIBSYSTEMD "libsystemd")
>> ++
>> + option(BUILD_LIBSYSTEMD "Build libsystemd static library and
>> incorporate it into libsdbus-c++" OFF)
>> +
>> + if(NOT BUILD_LIBSYSTEMD)
>> + find_package(PkgConfig REQUIRED)
>> + pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL
>> libsystemd>=236)
>> ++ if(NOT TARGET PkgConfig::Systemd)
>> ++ message(WARNING "libsystemd not found, checking for
>> libelogind instead")
> Perhaps demote this to INFO?
I agree, but the patch is not entirely mine and more importantly has
already been merged :-).
>> ++ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL
>> libelogind>=236)
>> ++ if(TARGET PkgConfig::Systemd)
>> ++ set(LIBSYSTEMD "libelogind")
>> ++ string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
>> ++ list(GET VERSION_LIST 0 Systemd_VERSION)
>> ++ endif()
>> ++ endif()
>> + if(NOT TARGET PkgConfig::Systemd)
>> + message(FATAL_ERROR "libsystemd of version at least 236 is
>> required, but was not found "
>> + "(if you have systemd in your OS, you
>> may want to install package containing pkgconfig "
>> +diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in
>> +index 6ad010a..0703476 100644
>> +--- a/pkgconfig/sdbus-c++.pc.in
>> ++++ b/pkgconfig/sdbus-c++.pc.in
>> +@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
>> +
>> + Name: @PROJECT_NAME@
>> + Description: C++ library on top of sd-bus, a systemd D-Bus library
>> +-Requires@PKGCONFIG_REQS@: libsystemd
>> ++Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@
>> + Version: @SDBUSCPP_VERSION@
>> + Libs: -L${libdir} -l@PROJECT_NAME@
>> + Cflags: -I${includedir}
>> +
>> +base-commit: 3e84b254e9603935cb5fc180c4d2214d7024ccbb
>> +--
>> +2.41.0
>> +
> Otherwise LGTM.
Thanks for the review!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#65371] [PATCH telephony-team 07/10] gnu: libnatpmp: Use gexps and simplify.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
` (4 preceding siblings ...)
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 06/10] gnu: Add sdbus-cpp Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 08/10] gnu: libnatpmp: Update home page Maxim Cournoyer
` (2 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer
* gnu/packages/networking.scm (libnatpmp) [arguments]: Use gexps. Use gexp
variables and cc-for-target in make flags.
---
gnu/packages/networking.scm | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a7cb4f876e..1b2e26c3f6 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1435,19 +1435,13 @@ (define-public libnatpmp
"0w7wvf4yi8qv659dg9d3ndqvh3bqhgm21gd135spwhq6hhnfv106"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'check)) ; no tests
- #:make-flags
- (let* ((target ,(%current-target-system))
- (gcc (if target
- (string-append target "-gcc")
- "gcc")))
- (list
- (string-append "CC=" gcc)
- (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out"))
- (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")))))
+ (list #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'check)) ; no tests
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "INSTALLPREFIX=" #$output)
+ (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))))
(home-page "http://miniupnp.free.fr/libnatpmp.html")
(synopsis "C library implementing NAT-PMP")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 08/10] gnu: libnatpmp: Update home page.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
` (5 preceding siblings ...)
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 07/10] gnu: libnatpmp: Use gexps and simplify Maxim Cournoyer
@ 2023-08-18 18:12 ` Maxim Cournoyer
2023-08-18 18:13 ` [bug#65371] [PATCH telephony-team 09/10] gnu: libnatpmp: Install missing natpmp_declspec.h header Maxim Cournoyer
2023-08-18 18:13 ` [bug#65371] [PATCH telephony-team 10/10] gnu: jami: Update to 20230619.1 Maxim Cournoyer
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:12 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer
* gnu/packages/networking.scm (libnatpmp) [home-page]: Update.
---
gnu/packages/networking.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1b2e26c3f6..b00306971c 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1442,7 +1442,7 @@ (define-public libnatpmp
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "INSTALLPREFIX=" #$output)
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))))
- (home-page "http://miniupnp.free.fr/libnatpmp.html")
+ (home-page "https://miniupnp.tuxfamily.org/libnatpmp.html")
(synopsis "C library implementing NAT-PMP")
(description
"@code{libnatpmp} is a portable and asynchronous implementation of
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 09/10] gnu: libnatpmp: Install missing natpmp_declspec.h header.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
` (6 preceding siblings ...)
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 08/10] gnu: libnatpmp: Update home page Maxim Cournoyer
@ 2023-08-18 18:13 ` Maxim Cournoyer
2023-08-18 18:13 ` [bug#65371] [PATCH telephony-team 10/10] gnu: jami: Update to 20230619.1 Maxim Cournoyer
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:13 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer
* gnu/packages/networking.scm (libnatpmp) [arguments]: Specify the
"HEADERS=natpmp.h natpmp_declspec.h" make flag.
---
gnu/packages/networking.scm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b00306971c..faeaefba0c 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1440,6 +1440,11 @@ (define-public libnatpmp
(delete 'check)) ; no tests
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
+ ;; Explicitly specify the headers, otherwise only natpmp.h
+ ;; would be installed, referring to the missing
+ ;; natpmp_declspec.h (see:
+ ;; https://github.com/miniupnp/libnatpmp/issues/41).
+ (string-append "HEADERS=natpmp.h natpmp_declspec.h")
(string-append "INSTALLPREFIX=" #$output)
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))))
(home-page "https://miniupnp.tuxfamily.org/libnatpmp.html")
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [bug#65371] [PATCH telephony-team 10/10] gnu: jami: Update to 20230619.1.
2023-08-18 18:12 ` [bug#65371] [PATCH telephony-team 01/10] gnu: opendht: Update to 2.5.5 Maxim Cournoyer
` (7 preceding siblings ...)
2023-08-18 18:13 ` [bug#65371] [PATCH telephony-team 09/10] gnu: libnatpmp: Install missing natpmp_declspec.h header Maxim Cournoyer
@ 2023-08-18 18:13 ` Maxim Cournoyer
8 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2023-08-18 18:13 UTC (permalink / raw)
To: 65371; +Cc: Maxim Cournoyer, Maxim Cournoyer
(%jami-version): Update to 20230619.1.
* gnu/packages/jami.scm (%jami-sources): Update hash. Apply
jami-qml-tests-discovery.patch patch.
(libjami) [inputs]: Replace dbus-c++ with sdbus-c++.
(jami) [arguments]: Delete obsolete change-directory/maybe phase.
Adjust check phase.
* gnu/packages/patches/jami-qml-tests-discovery.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/jami.scm | 34 ++++++-------------
.../patches/jami-qml-tests-discovery.patch | 15 ++++++++
3 files changed, 27 insertions(+), 23 deletions(-)
create mode 100644 gnu/packages/patches/jami-qml-tests-discovery.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index de669c1177..ac6ccc2ab2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1412,6 +1412,7 @@ dist_patch_DATA = \
%D%/packages/patches/isync-openssl3-fix.patch \
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \
%D%/packages/patches/jami-disable-integration-tests.patch \
+ %D%/packages/patches/jami-qml-tests-discovery.patch \
%D%/packages/patches/jami-libjami-headers-search.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index db120f223e..07c25a0601 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -68,7 +68,7 @@ (define-module (gnu packages jami)
#:use-module (guix packages)
#:use-module (guix utils))
-(define %jami-version "20230323.0")
+(define %jami-version "20230619.1")
(define %jami-sources
;; Return an origin object of the tarball release sources archive of the
@@ -85,9 +85,10 @@ (define %jami-sources
'(delete-file-recursively "daemon/contrib/tarballs"))
(sha256
(base32
- "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2"))
+ "0qb8jvgsqak1hbhkksxj2cxkcy6mb46zl904lwhxfgr5992pl33z"))
(patches (search-patches "jami-disable-integration-tests.patch"
- "jami-libjami-headers-search.patch"))))
+ "jami-libjami-headers-search.patch"
+ "jami-qml-tests-discovery.patch"))))
;; Jami maintains a set of patches for some key dependencies (currently
;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream.
@@ -409,7 +410,6 @@ (define-public libjami
(inputs
(list alsa-lib
asio
- dbus-c++
eudev
ffmpeg-jami
guile-3.0
@@ -424,6 +424,7 @@ (define-public libjami
openssl
pjproject-jami
pulseaudio
+ sdbus-c++
speex
speexdsp
webrtc-audio-processing
@@ -467,11 +468,7 @@ (define-public jami
"-DENABLE_LIBWRAP=ON")
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'change-directory/maybe
- (lambda _
- ;; Allow building from the tarball or a git checkout.
- (false-if-exception (chdir "client-qt"))))
- (add-after 'change-directory/maybe 'fix-version-string
+ (add-after 'unpack 'fix-version-string
(lambda _
(substitute* "src/app/version.h"
(("VERSION_STRING")
@@ -488,22 +485,13 @@ (define-public jami
;; The tests require a writable HOME.
(setenv "HOME" "/tmp")
- (display "Running unittests...\n")
- (invoke "tests/unittests" "-mutejamid")
+ (display "Running unit tests...\n")
+ (invoke "tests/unit_tests")
- ;; XXX: There are currently multiple failures with the
- ;; functional tests (see:
- ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/883),
- ;; so the code below is disabled for now.
- ;;
+ ;; XXX: The QML test suite fails, exiting with status code 1 (see:
+ ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/883).
;; (display "Running functional tests...\n")
- ;; ;; This is to allow building from the source tarball or
- ;; ;; directly from the git repository.
- ;; (let ((tests-qml (if (file-exists? "../client-qt/tests")
- ;; "../client-qt/tests/qml"
- ;; "../tests/qml")))
- ;; (invoke "tests/qml_tests" "-mutejamid"
- ;; "-input" tests-qml))
+ ;; (invoke "tests/qml_tests")
))))))
(native-inputs
(list googletest
diff --git a/gnu/packages/patches/jami-qml-tests-discovery.patch b/gnu/packages/patches/jami-qml-tests-discovery.patch
new file mode 100644
index 0000000000..11fd69571c
--- /dev/null
+++ b/gnu/packages/patches/jami-qml-tests-discovery.patch
@@ -0,0 +1,15 @@
+Upstream status: https://review.jami.net/c/jami-client-qt/+/25640
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index d50908cf..587c9d15 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -73,6 +73,8 @@ endif()
+
+ string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
+
++set(QUICK_TEST_SOURCE_DIR "${CMAKE_SOURCE_DIR}tests/qml/src")
++
+ set(QML_TESTS_SOURCE_FILES
+ ${CMAKE_SOURCE_DIR}/tests/qml/main.cpp
+ ${TEST_QML_RESOURCES}
--
2.41.0
^ permalink raw reply related [flat|nested] 16+ messages in thread