From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kJcBNj3MzV7qFAAA0tVLHw (envelope-from ) for ; Wed, 27 May 2020 02:11:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id yEPgMT3MzV6oUAAAB5/wlQ (envelope-from ) for ; Wed, 27 May 2020 02:11:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3A825940308 for ; Wed, 27 May 2020 02:11:09 +0000 (UTC) Received: from localhost ([::1]:40958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdlX8-0002ao-O5 for larch@yhetil.org; Tue, 26 May 2020 22:11:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdlX5-0002ah-24 for guix-patches@gnu.org; Tue, 26 May 2020 22:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdlX4-00066J-PH for guix-patches@gnu.org; Tue, 26 May 2020 22:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jdlX4-0004Fb-IR for guix-patches@gnu.org; Tue, 26 May 2020 22:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41555] [PATCH] gnu: xaos: Update to 4.0. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 May 2020 02:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41555@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159054544416310 (code B ref -1); Wed, 27 May 2020 02:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2020 02:10:44 +0000 Received: from localhost ([127.0.0.1]:47582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdlWl-0004F0-K5 for submit@debbugs.gnu.org; Tue, 26 May 2020 22:10:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:43224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdlWW-0004Ee-9p for submit@debbugs.gnu.org; Tue, 26 May 2020 22:10:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdlWW-0002Sg-5L for guix-patches@gnu.org; Tue, 26 May 2020 22:10:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdlWU-0005QA-2J for guix-patches@gnu.org; Tue, 26 May 2020 22:10:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5EF7D2400FB for ; Wed, 27 May 2020 04:10:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1590545422; bh=yQQXNmoBwGYLdHf5JIgMPqHUrX8AYFQHSmb7PpyXMv8=; h=From:To:Cc:Subject:Date:From; b=RHjTlimk1IPTQtTS0Ptm88xjaOTUlb3YGaUUBv3chCCfyy0mzbWAoS2Gv9hz5MJdz PCvvxgs/VDfTWgCycknBgxr1WMYffqikssgfk2T/r+DBLWK3ogQbPqxKoADbIhHSQn Y3I60+brVTgX/M/jCs2dvPdQUtyubuTBJylGqsWi153wddD7IkwOknWiAKrhgf7OD5 SOhofVNJ6O4ynlmJ9YiJBGllTcmk4PlZzFaUdGbMLwYMdPo28hq0dW3cdBO13PDGCY eRddW4ZgPUUX14a0dP+ypK8EvzuZEb/dsySChqEahDGXfbpEJ62mkZX4drZR09KWcJ wd6yGPDQhbXCA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49WvRw1RJjz6tmD; Wed, 27 May 2020 04:10:20 +0200 (CEST) From: Kei Kebreau Date: Tue, 26 May 2020 22:10:08 -0400 Message-Id: <20200527021008.29726-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=kkebreau@posteo.net; helo=mout02.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/26 22:10:22 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=RHjTlimk; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.09 X-TUID: Ky7mxDOC6+JJ * gnu/packages/maths.scm (xaos): Update to 4.0. [source]: Use git-fetch. [native-inputs]: Add qtbase and qttools. [arguments]: Remove #:make-flags options; replace 'configure' phase and add 'install-data' phase. [home-page]: Update URL. --- gnu/packages/maths.scm | 50 +++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3424aaa15e..2e648e3665 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4036,30 +4036,64 @@ evaluates expressions using the standard order of operations.") (define-public xaos (package (name "xaos") - (version "3.6") + (version "4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xaos/XaoS/" version - "/xaos-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xaos-project/XaoS") + (commit (string-append "release-" version)))) (sha256 (base32 - "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq")))) + "00110p5xscjsmn7avfqgydn656zbmdj3l3y2fpv9b4ihzpid8n7a")))) (build-system gnu-build-system) - (native-inputs `(("gettext" ,gettext-minimal))) + (native-inputs `(("gettext" ,gettext-minimal) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs `(("libx11" ,libx11) ("zlib" ,zlib) ("libpng" ,libpng) ("gsl" ,gsl))) + ;; The upstream project file ("XaoS.pro") and the Makefile it generates are + ;; not enough for this package to install properly. These phases fix that. (arguments `(#:tests? #f ;no "check" target - #:make-flags '("LOCALEDIR=$DATAROOTDIR/locale"))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (substitute* "XaoS.pro" + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin"))) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/xaos.desktop" + (string-append share "/applications"))) + #t))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, continuous manner. It also includes tutorials that help to explain how fractals are built. It can generate many different fractal types such as the Mandelbrot set.") - (home-page "https://www.gnu.org/software/xaos/") + (home-page "https://xaos-project.github.io/") (license license:gpl2+))) (define-public hypre -- 2.26.2