From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37446) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQiGZ-0004d9-HR for guix-patches@gnu.org; Mon, 20 Apr 2020 22:04:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQiGZ-0001i0-30 for guix-patches@gnu.org; Mon, 20 Apr 2020 22:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQiGY-0001ho-MV for guix-patches@gnu.org; Mon, 20 Apr 2020 22:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQiGY-0005Sk-IN for guix-patches@gnu.org; Mon, 20 Apr 2020 22:04:02 -0400 Subject: bug#40657: gnu: liblinphone: Fix icons. (v2) Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Maxim Cournoyer References: <20200416084226.4dc32c90.raghavgururajan@disroot.org> <20200420015036.70389578.raghavgururajan@disroot.org> Date: Mon, 20 Apr 2020 22:03:10 -0400 In-Reply-To: <20200420015036.70389578.raghavgururajan@disroot.org> (Raghav Gururajan's message of "Mon, 20 Apr 2020 01:50:36 -0400") Message-ID: <87ftcxk335.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Raghav Gururajan Cc: 40657-done@debbugs.gnu.org Hello Raghav, Raghav Gururajan writes: >>>From f9dcbb7c2756f960721cf7194b710de3c4ac22e1 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Mon, 20 Apr 2020 01:47:50 -0400 > Subject: [PATCH] gnu: liblinphone: Fix icons. > > * gnu/packages/linphone.scm (liblinphone): Fix icons. > --- > gnu/packages/linphone.scm | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm > index c9959d7d01..8962f2001e 100644 > --- a/gnu/packages/linphone.scm > +++ b/gnu/packages/linphone.scm > @@ -49,6 +49,7 @@ > #:use-module (guix packages) > #:use-module (guix download) > #:use-module (guix build-system cmake) > + #:use-module (guix build-system glib-or-gtk) > #:use-module (guix build-system gnu)) > > (define-public bcunit > @@ -428,8 +429,17 @@ decoding, and rendering.") > "/lib/glib-2.0/include")) > "-DENABLE_STATIC=NO" ; Not required > "-DENABLE_GTK_UI=YES") ; For Legacy UI > + #:imported-modules (,@%cmake-build-system-modules > + (guix build glib-or-gtk-build-system)) > + #:modules ((guix build cmake-build-system) > + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) > + (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" > @@ -449,6 +459,7 @@ 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) Tested and pushed as commit 41169f21e6. Thank you, Maxim