From 8472c26c254c0381018a3903feb55f31b1ea96f1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Apr 2020 23:01:03 -0400 Subject: gnu: liblinphone: Remove hicolor-icon-theme and murrine inputs. Icon themes and theme engines are best left for the users to select and install themselves. * gnu/packages/linphone.scm (liblinphone)[inputs]: Remove hicolor-icon-theme. [propagated-inputs]: Remove murrine. --- gnu/packages/linphone.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/linphone.scm') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 8962f2001e..e8aeabe419 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -459,7 +459,6 @@ decoding, and rendering.") ("belcard" ,belcard) ("bellesip" ,belle-sip) ("bzrtp", bzrtp) - ("hicolor-icon-theme" ,hicolor-icon-theme) ; Hard-coded for GTK UI ("glib" ,glib) ("gtk2" ,gtk+-2) ("mediastreamer2" ,mediastreamer2) @@ -469,8 +468,6 @@ decoding, and rendering.") ("six" ,python-six) ("sqlite" ,sqlite) ("udev" ,eudev))) - (propagated-inputs - `(("murrine" ,murrine))) ; Required for GTK UI (synopsis "Belledonne Communications Softphone Library") (description "Liblinphone is a high-level SIP library integrating all calling and instant messaging features into an unified -- cgit v1.2.3 From 1ae43257347db6e93c6aac37fa622969f245294c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Apr 2020 23:10:21 -0400 Subject: gnu: liblinphone: Fix the input type of some dependencies. Libraries being linked to such as libxml2, libiconv and zlib should appear as 'inputs' rather than 'native-inputs'. * gnu/packages/linphone.scm (liblinphone)[native-inputs]: Move libiconv, libxml2 and zlib to... [inputs]: ...here. Move eudev, python-pystache and python-six to native-inputs. --- gnu/packages/linphone.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/linphone.scm') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index e8aeabe419..09d5a1121e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -447,27 +447,28 @@ decoding, and rendering.") "")) #t))))) (native-inputs - `(("dot" ,graphviz) + `(("gettext" ,gettext-minimal) + ("udev" ,eudev) ;for libudev.h + ;; For generating the C++ wrappers. + ("dot" ,graphviz) ("doxygen" ,doxygen) - ("gettext" ,gettext-minimal) - ("iconv" ,libiconv) ("python" ,python) - ("xml2" ,libxml2) - ("zlib" ,zlib))) + ("pystache" ,python-pystache) + ("six" ,python-six))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) ("bellesip" ,belle-sip) ("bzrtp", bzrtp) + ("iconv" ,libiconv) ("glib" ,glib) ("gtk2" ,gtk+-2) ("mediastreamer2" ,mediastreamer2) ("notify" ,libnotify) ("ortp" ,ortp) - ("pystache" ,python-pystache) - ("six" ,python-six) ("sqlite" ,sqlite) - ("udev" ,eudev))) + ("xml2" ,libxml2) + ("zlib" ,zlib))) (synopsis "Belledonne Communications Softphone Library") (description "Liblinphone is a high-level SIP library integrating all calling and instant messaging features into an unified -- cgit v1.2.3 From 9c63165d9ee33a7a7e9017d7a36f658b5c2c415c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Apr 2020 00:50:48 -0400 Subject: gnu: liblinphone: Move documentation and tester to separate outputs. * gnu/packages/linphone.scm (liblinphone)[outputs]: Add a "doc" and "tester" outputs. [phases]: Add a separate-outputs phase. Move the glib-or-gtk-compile-schemas and glib-or-gtk-wrap phases after it. --- gnu/packages/linphone.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'gnu/packages/linphone.scm') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 09d5a1121e..e7d3cf7aaf 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -416,6 +416,7 @@ decoding, and rendering.") "/linphone-" version ".tar.gz")) (sha256 (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x")))) + (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target @@ -436,16 +437,37 @@ decoding, and rendering.") (guix build utils)) #:phases (modify-phases %standard-phases - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'install 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) (add-after 'unpack 'patch (lambda _ (substitute* "gtk/main.c" (("#include \"liblinphone_gitversion.h\"") "")) - #t))))) + #t)) + (add-after 'install 'separate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (tester (assoc-ref outputs "tester")) + (tester-name (string-append ,name "_tester"))) + ;; Copy the tester executable. + (mkdir-p (string-append tester "/bin")) + (rename-file (string-append out "/bin/" tester-name) + (string-append tester "/bin/" tester-name)) + ;; Copy the tester data files. + (mkdir-p (string-append tester "/share/")) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name)) + ;; Copy the HTML and XML documentation. + (copy-recursively + (string-append out "/share/doc/linphone-" ,version) + (string-append doc "/share/doc/" ,name "-" ,version)) + (delete-file-recursively + (string-append out "/share/doc/linphone-" ,version)) + #t))) + (add-after 'separate-outputs 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs `(("gettext" ,gettext-minimal) ("udev" ,eudev) ;for libudev.h -- cgit v1.2.3