From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH 2/3] gnu: utox: Update to 0.11.0. Date: Sun, 18 Dec 2016 20:10:16 +0000 Message-ID: <20161218201017.3219-3-ng0@libertad.pw> References: <20161218201017.3219-1-ng0@libertad.pw> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cIhmu-00084O-JH for guix-devel@gnu.org; Sun, 18 Dec 2016 15:10:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cIhmr-000369-Dc for guix-devel@gnu.org; Sun, 18 Dec 2016 15:10:28 -0500 Received: from aibo.runbox.com ([91.220.196.211]:34223) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cIhmr-00034O-6U for guix-devel@gnu.org; Sun, 18 Dec 2016 15:10:25 -0500 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cIhmo-0002Ix-Fs for guix-devel@gnu.org; Sun, 18 Dec 2016 21:10:22 +0100 In-Reply-To: <20161218201017.3219-1-ng0@libertad.pw> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/messaging.scm (utox): Update to 0.11.0. [source]: Update source uri to new group namespace on github. [build-system]: Change to cmake-build-system. [arguments]: Remove previous content and disable tests, add two new phases. [inputs]: Remove libtoxcore, add c-toxcore. [native-inputs]: Remove it. --- gnu/packages/messaging.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4e3cc3098..aa3d82d63 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -34,6 +34,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) #:use-module (guix build-system perl) + #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) @@ -667,40 +668,47 @@ encrypted messenger protocol.") (define-public utox (package (name "utox") - (version "0.9.8") + (version "0.11.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/GrayHatter/uTox/archive/v" + (uri (string-append "https://github.com/uTox/uTox/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13hfqbwzcgvfbvf9yjm62aqsvxnpqppb50c88sys43m7022yqcsy")))) - (build-system gnu-build-system) + "15s4iwjk1s0kihjqn0f07c9618clbphpr827mds3xddkiwnjz37v")))) + (build-system cmake-build-system) (arguments - '(#:make-flags (list (string-append "PREFIX=" %output) - "CC=gcc") - #:tests? #f ; No tests + '(#:tests? #f ; No test phase. #:phases (modify-phases %standard-phases - ;; No configure script - (delete 'configure)))) + (add-after 'unpack 'fix-freetype-include + (lambda _ + (substitute* "CMakeLists.txt" + (("/usr/include/freetype2") + (string-append (assoc-ref %build-inputs "freetype") + "/include/freetype2"))))) + (add-before 'install 'patch-cmake-find-utox + (lambda _ + (substitute* "../build/cmake_install.cmake" + (("/uTox-0.11.0/utox") + "/build/utox"))))))) (inputs + ;; TODO: Fix the filechoser dialogue, which input + ;; does it need? `(("dbus" ,dbus) ("filteraudio" ,filteraudio) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("libsodium" ,libsodium) - ("libtoxcore" ,libtoxcore) + ("c-toxcore" ,c-toxcore) ("libvpx" ,libvpx) ("libx11" ,libx11) ("libxext" ,libxext) ("libxrender" ,libxrender) ("openal" ,openal) ("v4l-utils" ,v4l-utils))) - (native-inputs - `(("pkg-config" ,pkg-config))) (synopsis "Lightweight Tox client") (description "A lightweight Tox client. Tox is a distributed and secure instant messenger with audio and video chat capabilities.") -- 2.11.0