From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:02:57 2023 Received: (at submit) by debbugs.gnu.org; 30 Jun 2023 22:02:57 +0000 Received: from localhost ([127.0.0.1]:55914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMCf-0002uT-2T for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:02:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:58636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMCc-0002uJ-Qx for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:02:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFMCb-00026P-W8 for guix-patches@gnu.org; Fri, 30 Jun 2023 18:02:54 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMCT-00017Y-Ld for guix-patches@gnu.org; Fri, 30 Jun 2023 18:02:48 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 998AE9F6; Fri, 30 Jun 2023 22:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jpQtziXjK/Aq/jjuy/dG7ZDYic+iTz1nLA5UM0kEajM=; b=op0wr9Y+nKLwF4SyO5AYTWIoI09eLp7DGSBv8MmCn8oipURHWCXFLxnUrsaeBAoWNDkpZe aYTk3rX/zLC/M/oxne3Qa5OSJf5zXd9oI/9W5i+1MtZk0tkXnw5cl2HC3ethAdmv1wl6aS Ym4YIO1YptDUVwUzqvyQ1ulRngJ/Ca7xdjRA31o7zscoN/I/m2TlyzzPj+N7lYs8xeSXKp OmP/TztJGXH4u3bXPb3fmQsnYfJqo38jV7nvz1hq2UHsLM3/JaHxWXasflAMUrCRsdlaXo iL2PVewAhFwAdo5yyu8vCZNvIzIOmmtdwSaIcAps/BeqzeJC33+0qXef8buUoMlC7Ms9EB 02os6/j+3Mpnx8bD9fK6Bcd2hTHhcS9eZ1UFyWHXHgzCoBBufnBxByGgeapw6MaCTlWNRt UhjYOSTEtxm/1KaJuZNcusrUrydugO3A6QOfa429N46dxX5Eqcr0B9kgrAQOjfQIlBT0se nnbPW32ZDqNuuA6/zSMkiymtV2svT9tZlHMkgxMDqlxlw5g+henl/T92e5vgAS4T8D9Yyu 1KL60VxjJpPDIzzZ/5wFE672eOudfajElVR78gFE9Ddi4GtgBppBRCy2LyrRLNP9Qv+0fi /rYrPmLf0aYe/Bv9hu1O9tmANAa4zhTo17FkiuiuneUXTtZCoi5b0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jpQtziXjK/Aq/jjuy/dG7ZDYic+iTz1nLA5UM0kEajM=; b=Mrq6ln3jB24kxf9y50lv+ffgOjxlkHTKuh1yl8EfGr1s393EgYGrlsX3JbLnNkD11sz891 QZ7F6K9uVdNq2vCA== From: Ahmad Draidi To: guix-patches@gnu.org Subject: [PATCH 0/6] Update and rework arcan Date: Sat, 1 Jul 2023 02:01:38 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.105.48.212; envelope-from=a.r.draidi@redscript.org; helo=rainycloud.ext.redscript.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello Guix, Since the Arcan project is under heavy development, sometimes major changes have to be performed to the packaging from one version to another. This patch series updates arcan to 0.6.2.1, builds the package with all features (which have changed), fixes arcan paths handling for Guix, switches to new style arguments, reformats the package since we removed a level of parentheses, and finally, it removes the arcan-wayland package, which was previously a separate package upstream. Let me know if you have any comments. Thanks, Ahmad Ahmad Draidi (6): gnu: arcan: Update to 0.6.2.1. gnu: arcan: Build all features. gnu: arcan: Fix paths handling. gnu: arcan: Use new style arguments. gnu: arcan: Restyle format. gnu: Remove arcan-wayland. gnu/packages/arcan.scm | 255 ++++++++++++++++++----------------------- 1 file changed, 109 insertions(+), 146 deletions(-) base-commit: ac86174e22fcd762893bd4515786b1376af9397b -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:07:32 2023 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:32 +0000 Received: from localhost ([127.0.0.1]:55920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMH5-000318-Mv for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:32 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:48726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMH3-00030v-6J for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:30 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 084E42B4E; Fri, 30 Jun 2023 22:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fr/bUas3YatdRRV+tnfJXBr7masxmCI62tYnUNraIkc=; b=QrMcF7/S3DyB7CE49Ku/Hpeh8UflNCTYzPcA8KGeIyy/WTEuLXIPemmrZdlQGuelWeBWCT uenUGMzzQyYV+OXzw57360AZq6oQ8A9t6hZBLNkIIDcivC0Czei7LPJHrxrOS8MQP71de9 6ArCl9yeIdlhI9tLccZOm0cdDyrt5mZlY0jDPNP0msGRkvvH0lcmxhthKCnGrG4aN9L45j 4SXxggwGLcaJT3bBStSEYxPaMGwUoKMhFnUhFnyBicow9/IEfDgHG/x8vxSzStntJhOEik e2IWAdogelaqPHiv7QCBn+uZTzGEFgKzBs55+EXQ+rtvXydsQNLnD2Us66robgxS1k0G4t jMCrV5TU0CLYFD74uA2NPZwGmgppwYSPglhjNCAU6pi9Gp8uWwvJ3NLuDucRFnKCuZLdFI v/rSZm3OZ5an7HMWu/vhDhfK+/J1ha82tXjoF5iQEnH0ofk/ciANDJfIriw6q/NRH7bBrA PJO+CG1IGiDVow4LFK5PPuT1UEbHCuYYjQVJ0WTAbZW4G/9nV9bYj9R/3zn1H73SXHRwB4 9XqgzZJLZI9MkgjgkGbDxCxnGWd8hrhVMRjjsmsHrwPOiwwB7nTA55wnLKNn78o1W9ZjIb qKlF43CKLxnvxeeEEEgHPjBeDkeF/OXcJrkrjEnr2UD80oNP9Plss= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fr/bUas3YatdRRV+tnfJXBr7masxmCI62tYnUNraIkc=; b=/6v5fCeR0Z32chQRkkiIos4RHvKpZDp++AuSZWiVQlzk3DmamQFE4Z+UkKG3VStnU0xjlH lkkir8PO4a4UZ9Dw== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH 1/6] gnu: arcan: Update to 0.6.2.1. Date: Sat, 1 Jul 2023 02:07:06 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan): Update to 0.6.2.1. [use-modules]: Remove no longer used package imports and add ones for new dependencies. Add '(guix gexp)' for snippet. [source]: Use version instead of commit, and add snippet to remove some bundled packages. [arguments]: Remove 'fix-cmake-paths' phase since it's no longer needed. [inputs]: Remove apr, glib, glu, lzip, pcre. Add bash-minimal, espeak, gumbo-parser, jbig2dec, libjpeg-turbo, libseccomp, libvnc, mupdf, openjpeg, sdl2, wayland, wayland-protocols, xcb-util, xcb-util-wm, zlib. Replace ffmpeg-4 with ffmpeg. Change luajit label to fix lint. Update vendored openal to 0.6.2. Sort inputs by name. [description]: Change description to closely match upstream for accuracy. [license]: Add new and missing licenses. --- gnu/packages/arcan.scm | 77 +++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 7483777ff0..f4eecb3364 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2023 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,50 +21,58 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (gnu packages apr) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) - #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ocr) - #:use-module (gnu packages pcre) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages speech) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vnc) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public arcan - (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") - (revision "1")) (package (name "arcan") - (version (git-version "0.5.5.2" revision commit)) + (version "0.6.2.1") (source (origin (method git-fetch) (file-name (git-file-name name version)) (uri (git-reference (url "https://github.com/letoram/arcan") - (commit commit))) + (commit version))) (sha256 - (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw")))) + (base32 "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc")) + (modules '((guix build utils))) + (snippet + ;; Remove some bundled packages + #~(begin + (delete-file-recursively "external/git") + (delete-file-recursively "external/lua") + (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_C_FLAGS=-fcommon" @@ -73,15 +82,6 @@ (define-public arcan "-DSHMIF_TUI_ACCEL=on") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-cmake-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/platform/cmake/modules/FindGBMKMS.cmake" - (("/usr/local/include/libdrm") - (search-input-directory inputs "include/libdrm"))) - (substitute* "src/platform/cmake/modules/FindAPR.cmake" - (("/usr/local/apr/include/apr-1") - (search-input-directory inputs "include/apr-1"))) - #t)) ;; Normally, it tries to fetch patched openal with git ;; but copying files manually in the right place seems to work too. (add-after 'unpack 'prepare-static-openal @@ -122,34 +122,44 @@ (define-public arcan (separator #f) (files '("share/arcan/scripts"))))) (inputs - `(("apr" ,apr) - ("ffmpeg" ,ffmpeg-4) + `(("bash-minimal" ,bash-minimal) + ("espeak" ,espeak) + ("ffmpeg" ,ffmpeg) ("freetype" ,freetype) - ("glib" ,glib) - ("glu" ,glu) + ("gumbo-parser" ,gumbo-parser) ("harfbuzz" ,harfbuzz) + ("jbig2dec" ,jbig2dec) + ("leptonica" ,leptonica) ("libdrm" ,libdrm) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libseccomp" ,libseccomp) ("libusb" ,libusb) + ("libvnc" ,libvnc) ("libxkbcommon" ,libxkbcommon) - ("lua" ,luajit) - ("lzip" ,lzip) + ("luajit" ,luajit) + ("mupdf" ,mupdf) ("openal" ,openal) - ("pcre" ,pcre) + ("openjpeg" ,openjpeg) + ("sdl2" ,sdl2) ("sqlite" ,sqlite) ("tesseract-ocr" ,tesseract-ocr) - ("leptonica" ,leptonica) ("vlc" ,vlc) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("xcb-util" ,xcb-util) + ("xcb-util-wm" ,xcb-util-wm) + ("zlib" ,zlib) ;; To build arcan_lwa, we need a patched version of openal. ;; https://github.com/letoram/arcan/wiki/packaging ("arcan-openal" ,(origin (method git-fetch) - (file-name "arcan-openal-0.5.4") + (file-name "arcan-openal-0.6.2") (uri (git-reference (url "https://github.com/letoram/openal") - (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef"))) + (commit "0.6.2"))) (sha256 (base32 - "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2")))))) + "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) (native-inputs (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") @@ -157,13 +167,18 @@ (define-public arcan (description "Arcan is a development framework for creating virtually anything from user interfaces for specialized embedded applications all the way to full-blown desktop environments. At its heart lies a multimedia -engine programmable using Lua.") +engine with a Lua scripting interface.") ;; https://github.com/letoram/arcan/blob/master/COPYING - (license (list license:gpl2+ + (license (list license:asl2.0 + license:bsd-3 + license:cc-by3.0 + license:expat + license:gpl2+ license:lgpl2.0 license:lgpl2.0+ license:public-domain - license:bsd-3))))) + license:silofl1.1 + license:zlib)))) (define-public arcan-sdl (package -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:07:42 2023 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:42 +0000 Received: from localhost ([127.0.0.1]:55924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHG-00031X-9h for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:42 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:41362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHD-00031I-SF for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:40 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id CEB012B4E; Fri, 30 Jun 2023 22:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NPMpAPz/19/ahLgLEjugXs7yDl0zEl6BMT88cJiBJS8=; b=o3dKL+Uc9F6CjctwWn2tOgMW/F+H7B74OdgCopsJrbD3W1ln/CluGoUVRSQ1I8ily8xN0o ccQzdVKA0Cq8p8BidMrvrwGz8Fe1GFWwwq4kYJopmPxUUM1l760rKB21nlfH7xBIUx8djS XshDwVH1UavVBVjUYtpK6FY9AmAUnTG1QDqZzyTnVhz9vulJCyOVlwdpeZKnMjhpRRBxHx vXyLDhmAPhDERMQCAPV7q0FQgy7hThtMDh8WZgzgWPrzoTIM8/vkfOXzT8vHRwCiUzKTIy O1S7GvblDgdCfoYstxHo5ZpYei0RuQ8/lR1hb0Nl49P2aHLh6Dd1uRgr5xLXthonV6oS4D gdPo0nGatjMagwj6+JV6VBSByfqxQslC3BpTxu3fo96obtu12/9xt9xnICFTlVWV14zW79 8e/HMsKkSeFDOLMQMukRwsBdDYbsE5W+3ZvF7sYSsDYFHjCeMvN+bq5KnLnGJDMfYq6V4c BLxXD5T/yZHrtVISLk/nIYfdfwkfJe9DbFxZTEKuyogVWMsX8hWperUEUFIZS7p1FKZ0iq 9qrsq+PvMUykao84zgFKH7ti8KawbcUOp21NOKAPYzUEiI9oPstA7O1z7tzHcmrv6F9Q6Q cobBJ+tlplO47x+zg3G2ytooWWGwqM53Qkobve1ioRpsm6Z3HFrSI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NPMpAPz/19/ahLgLEjugXs7yDl0zEl6BMT88cJiBJS8=; b=vxCZGDvTjmELPJxiZMhtjSd3PNy/6cRKQ7Zs6uizKInKKkgdte1kmBzsELK0G+Ihk1qomy Z4zP8spD2Xpb60Ag== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH 2/6] gnu: arcan: Build all features. Date: Sat, 1 Jul 2023 02:07:07 +0400 Message-Id: <8574825bcdb9d85ea62771a7671b8dc2d4c57c18.1688161433.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan): Build all features. [arguments]: Use #:configure-flags "-DBUILD_PRESET=everything" to build all features, and "-DDISTR_TAG='Guix'" to tag the builds. [synopsis]: Remove '(egl-dri)' since it indicates a specific feature. --- gnu/packages/arcan.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index f4eecb3364..cfd72f6e55 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -75,11 +75,8 @@ (define-public arcan (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_C_FLAGS=-fcommon" - "-DVIDEO_PLATFORM=egl-dri" "-DBUILTIN_LUA=off" - "-DSTATIC_OPENAL=off""-DENABLE_LWA=on" - "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" - "-DSHMIF_TUI_ACCEL=on") + `(#:configure-flags '("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") #:phases (modify-phases %standard-phases ;; Normally, it tries to fetch patched openal with git @@ -163,7 +160,7 @@ (define-public arcan (native-inputs (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") - (synopsis "Display server, multimedia framework and game engine (egl-dri)") + (synopsis "Display server, multimedia framework and game engine") (description "Arcan is a development framework for creating virtually anything from user interfaces for specialized embedded applications all the way to full-blown desktop environments. At its heart lies a multimedia -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:07:48 2023 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:48 +0000 Received: from localhost ([127.0.0.1]:55928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHL-00031q-NX for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:48 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:41370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHI-00031O-Id for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:44 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 3ACD23854; Fri, 30 Jun 2023 22:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hj6ebMp4hK66n+NySaoSYY8gJdTb1nxhHjaTXl8IMM8=; b=OXM9OWXUBuCzaNKmT2tVIa2zUBCXqzFzw/nAXoLC7vqRQKtJsYwVHS8bNlPT7nSKNzfhv8 2f2V4fUXbZevuRzlcZUGl6/WNlSVGavVSTcWvHJTN5tFWu0l3T25YspGvKm/K+qsqQlGxF Gac2R8WCrL6jWno0EsQsolQmbtcFOwM1fgfRwvSO72VUxdDnUA20FBy0MRDCg9es7TSc3C mJVlqHsWNbrAnVM3vbscBmzb/1jud3uldWFHU+pluNBG6hsXaBP8GAqgzx96i/US2fFB4v qBTDbiPkw/eoAbR5Ryrq1v+5Ytox2LTqBAQpABEAOjvCsxERyMU3Oe1epdyI1O3Jdjh6jn usqO159XFM3pBVsA4SgCxsX15nE8gp/ELyryIuQFAVg16hkSHNDSN35zCoEq9CQD7amaXD FqGbehrk1ZdIqyWMQ/pDTD+OlNtHf9aB213gVqAa4snT2+BIxUr/Hxe8GTYIO0DMeD8nla KtMYkupxMpsjOpJqEidQTXIfmCILxdB/aWgzT96egay4KU76NJ09zFlpJj74Fs5X65Ryql Koh+cu7MnEIYJv4ZNl6Ivljf/JHMzjvLt2Jwpl7yl/PQa3dshKi9y+plxL6xUWPsyjEoso laRdLDaIY8XdVoXdtF7hPBBRFi6xKnX7JdbDh8XV/zABKNp8a+A7I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hj6ebMp4hK66n+NySaoSYY8gJdTb1nxhHjaTXl8IMM8=; b=4SaDPxRGfkVVXw0OiLNknsJtMPeq0bQpmb3jVVvhUrewEk3QxzoqslLKI9lKYu5ETDOXw9 fFIIidYl14zMwDCw== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH 3/6] gnu: arcan: Fix paths handling. Date: Sat, 1 Jul 2023 02:07:08 +0400 Message-Id: <88537d4db68bd306c1f3efae8b6ed52290ca66e2.1688161433.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This patch removes the wrapper and the propagated environment variables (through 'native-search-paths') and instead patches the paths inside the source code. This fixes path handling, which seems to be broken now. It also allows us to use 'setuid', which is required for some features, and lets the app use its internal path handling criteria, which some dependent apps expect. * gnu/packages/arcan.scm (arcan): Fix paths handling. [arguments]: Add 'patch-paths' phase. Remove 'wrap-program' phase. [native-search-paths]: Remove. --- gnu/packages/arcan.scm | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index cfd72f6e55..159c6d2190 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -79,6 +79,11 @@ (define-public arcan "-DDISTR_TAG='Guix'") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/platform/posix/paths.c" + (("/usr/local") + (assoc-ref outputs "out"))))) ;; Normally, it tries to fetch patched openal with git ;; but copying files manually in the right place seems to work too. (add-after 'unpack 'prepare-static-openal @@ -94,30 +99,8 @@ (define-public arcan (add-before 'configure 'chdir (lambda _ (chdir "src") - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/arcan") - `("ARCAN_RESOURCEPATH" ":" suffix - (,(string-append out "/share/arcan/resources"))) - `("ARCAN_STATEBASEPATH" ":" = - ("$HOME/.arcan/resources/savestates")) - `("ARCAN_STATEPATH" ":" = - ("$HOME/.arcan/resources/savestates")) - `("ARCAN_BINPATH" ":" = - (,(string-append out "/bin/arcan_frameserver"))))) #t))) #:tests? #f)) - (native-search-paths - (list (search-path-specification - (variable "ARCAN_APPLBASEPATH") - (separator #f) - (files '("share/arcan/appl"))) - (search-path-specification - (variable "ARCAN_SCRIPTPATH") - (separator #f) - (files '("share/arcan/scripts"))))) (inputs `(("bash-minimal" ,bash-minimal) ("espeak" ,espeak) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:07:51 2023 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:51 +0000 Received: from localhost ([127.0.0.1]:55932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHP-000326-6B for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:51 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:41382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHM-00031f-NE for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:49 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id B8EF52B4E; Fri, 30 Jun 2023 22:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N3niClNUvMuSM01PsFQkafNT0CmkVd9SblwpRJBXLzI=; b=XB/z1gLoBFfjziFW5O4UWbpTHIN70GkqY6YkekQLSrxcXmjY5gRYEqli6886nmPmiJJUuG CTABji4M8y3q75XoVjNZKnuns50dKvN/UeU1E/Sg3Y0MIRKjA+t3mwUiz1QpT/tMf22yca gAou0/hqPde4DgMuMUSYxEfKKUGsgc2HvrqOA4byWutRPnGjws5kJ07o4zjUT3EB9jftUX duvJgMzQ18vyWymyEuSJgPf2SoPlBnh58q3t5uDeho46dPXkOR/7bF8l+md0OnHY5KB0Av ELjTNxCozUp3NoyQKJbfbfVd87SVSU2bbYAPanTWeVELyI4bCf54N6x4zd3gSeXHzyWfzJ OIHw/JkghZ8Ehay8W+eLE0aKV/zG+SRIOPrVeILK50K85h5rBfFheYQW1Ml/kgIEM0D9gm 4VZVKs5j0N4jbx/m6NvW2ZeFzMg/WPk12DJjdFKl+dy33OkfVTXtyMdvkenjLvlhhws5GD BmjarmDRz+Uq6AJ/S3z1fT8dEWmJB369U70N1mw0Ww4Ks/JsoTJm91ydg5df41BRpkGTm2 I99YQxtzThtjQDi79XTnfmEwuqpCrxGvU4V+CaqnYnOvISojAUbA+aaihwlGxewajit72f 9CpRMwhR+3znkz/CDeG2qvo8fa4+2T7VQbPKvnyKBsWgDp2GQZ2JE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N3niClNUvMuSM01PsFQkafNT0CmkVd9SblwpRJBXLzI=; b=HLU8NULvpqmDg7uIPWnfx4fKgs9lMvDNHIFnyAi2UiFHnmWR6p/4O3PLukCNZNd4tiaDht Y/xW40Ysqt2MbqBQ== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH 4/6] gnu: arcan: Use new style arguments. Date: Sat, 1 Jul 2023 02:07:09 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan)[arguments]: Use new style arguments. --- gnu/packages/arcan.scm | 50 ++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 159c6d2190..9c6092bb9e 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -75,32 +75,30 @@ (define-public arcan (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_PRESET=everything" - "-DDISTR_TAG='Guix'") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/platform/posix/paths.c" - (("/usr/local") - (assoc-ref outputs "out"))))) - ;; Normally, it tries to fetch patched openal with git - ;; but copying files manually in the right place seems to work too. - (add-after 'unpack 'prepare-static-openal - (lambda* (#:key inputs #:allow-other-keys) - (let ((arcan-openal (assoc-ref inputs "arcan-openal"))) - (copy-recursively arcan-openal "external/git/openal")) - #t)) - (add-after 'prepare-static-openal 'generate-man - (lambda _ - (with-directory-excursion "doc" - (invoke "ruby" "docgen.rb" "mangen")) - #t)) - (add-before 'configure 'chdir - (lambda _ - (chdir "src") - #t))) - #:tests? #f)) + (list #:configure-flags #~'("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/platform/posix/paths.c" + (("/usr/local") + (assoc-ref outputs "out"))))) + ;; Normally, it tries to fetch patched openal with git + ;; but copying files manually in the right place seems to work too. + (add-after 'unpack 'prepare-static-openal + (lambda* (#:key inputs #:allow-other-keys) + (let ((arcan-openal (assoc-ref inputs + "arcan-openal"))) + (copy-recursively arcan-openal + "external/git/openal")) #t)) + (add-after 'prepare-static-openal 'generate-man + (lambda _ + (with-directory-excursion "doc" + (invoke "ruby" "docgen.rb" "mangen")) #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") #t))) + #:tests? #f)) (inputs `(("bash-minimal" ,bash-minimal) ("espeak" ,espeak) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:07:58 2023 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:58 +0000 Received: from localhost ([127.0.0.1]:55936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHV-00032Q-JL for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:58 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:46380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHS-000324-WE for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:55 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 0242B3854; Fri, 30 Jun 2023 22:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTkehNy+q/2h3pBLOPXDMK5jgTgykm5zZmXZsRY/zeU=; b=NI1ZVXbeX8g8O0cM5f0jKlfnv+n8OH8bOPoHUTMtmUoshIRCs9gFbgGTBKwt37w/eWCphx EQx+tZQOzjG8yxNyedSAtTrvyXknRyswIK/gsMq70MdM2m/8Sc3JDUhxd68dlTn1U0CBlR iaulHmJhexOYu6c/Bwy92866z7yUc/ugl/HXO8CxpmxW3n1TSjmjUvgbznBl/yBhJu6Ih/ pFcfzaJzIRaFixCBkNtckMlJ7/NhVgX3SVl0VS8WzGMSLhf35FWbjKU+PXI0zP+dU+YgQz HOf0zisDygmxYMUmiOvfNAW2mS5dwxEUZeLIFIwRRtvZTbwTIRww4KpJTnDcgBHLhnvv0y 5fh2wbtk6+Mo0EtEvFpRgTyVs/lJ6Gdud/BeFF5iretnmGFC5cPdhbQ8Cf7nplVsJ1pA1n aRV5G2Ni3FjM6lL4OLflL1chCxZ0tcj3Yy9v/xSwYRxeTfGZTZmBMSISEHuf6/YHg/KLQZ Sz2PUArQS3o0gtA4u/737scceXE58WkZ6W+zbO4wXLDUp5JIvzo52P7sQlI2KZuFDZqdP2 mmACgb3QQX8kjJXVAU6pT3lSmS+Su41fZHNvZrrTBEC21+FHukwy6WcgEpUiozWjV18+lv lFKSg2g2afpSTtJ9lELgSSdsCeiNjod6CwFdXNNZUwed5nPWtAYMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTkehNy+q/2h3pBLOPXDMK5jgTgykm5zZmXZsRY/zeU=; b=RwRsxRZJnxWYFaSay6oOxakssLKfdCg302yORFYeB1Z6G0ft36hnRrjE8yMT1WgkBm2UQC TIk/pNLh6u3AzOAw== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH 5/6] gnu: arcan: Restyle format. Date: Sat, 1 Jul 2023 02:07:10 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan): Run 'guix style' over the package and manually break some long lines. --- gnu/packages/arcan.scm | 200 +++++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 99 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 9c6092bb9e..05d2f58fc2 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -55,108 +55,110 @@ (define-module (gnu packages arcan) #:use-module (srfi srfi-1)) (define-public arcan - (package - (name "arcan") - (version "0.6.2.1") - (source (origin - (method git-fetch) - (file-name (git-file-name name version)) - (uri (git-reference - (url "https://github.com/letoram/arcan") - (commit version))) - (sha256 - (base32 "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc")) - (modules '((guix build utils))) - (snippet - ;; Remove some bundled packages - #~(begin - (delete-file-recursively "external/git") - (delete-file-recursively "external/lua") - (delete-file-recursively "external/sqlite"))))) - (build-system cmake-build-system) - (arguments - (list #:configure-flags #~'("-DBUILD_PRESET=everything" - "-DDISTR_TAG='Guix'") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/platform/posix/paths.c" - (("/usr/local") - (assoc-ref outputs "out"))))) - ;; Normally, it tries to fetch patched openal with git - ;; but copying files manually in the right place seems to work too. - (add-after 'unpack 'prepare-static-openal - (lambda* (#:key inputs #:allow-other-keys) - (let ((arcan-openal (assoc-ref inputs - "arcan-openal"))) - (copy-recursively arcan-openal - "external/git/openal")) #t)) - (add-after 'prepare-static-openal 'generate-man - (lambda _ - (with-directory-excursion "doc" - (invoke "ruby" "docgen.rb" "mangen")) #t)) - (add-before 'configure 'chdir - (lambda _ - (chdir "src") #t))) - #:tests? #f)) - (inputs - `(("bash-minimal" ,bash-minimal) - ("espeak" ,espeak) - ("ffmpeg" ,ffmpeg) - ("freetype" ,freetype) - ("gumbo-parser" ,gumbo-parser) - ("harfbuzz" ,harfbuzz) - ("jbig2dec" ,jbig2dec) - ("leptonica" ,leptonica) - ("libdrm" ,libdrm) - ("libjpeg-turbo" ,libjpeg-turbo) - ("libseccomp" ,libseccomp) - ("libusb" ,libusb) - ("libvnc" ,libvnc) - ("libxkbcommon" ,libxkbcommon) - ("luajit" ,luajit) - ("mupdf" ,mupdf) - ("openal" ,openal) - ("openjpeg" ,openjpeg) - ("sdl2" ,sdl2) - ("sqlite" ,sqlite) - ("tesseract-ocr" ,tesseract-ocr) - ("vlc" ,vlc) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) - ("xcb-util" ,xcb-util) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ;; To build arcan_lwa, we need a patched version of openal. - ;; https://github.com/letoram/arcan/wiki/packaging - ("arcan-openal" ,(origin - (method git-fetch) - (file-name "arcan-openal-0.6.2") - (uri (git-reference - (url "https://github.com/letoram/openal") - (commit "0.6.2"))) - (sha256 - (base32 - "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) - (native-inputs - (list pkg-config ruby)) ; For documentation and testing - (home-page "https://arcan-fe.com") - (synopsis "Display server, multimedia framework and game engine") - (description "Arcan is a development framework for creating virtually + (package + (name "arcan") + (version "0.6.2.1") + (source (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/arcan") + (commit version))) + (sha256 + (base32 + "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc")) + (modules '((guix build utils))) + (snippet + ;; Remove some bundled packages + #~(begin + (delete-file-recursively "external/git") + (delete-file-recursively "external/lua") + (delete-file-recursively "external/sqlite"))))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~'("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/platform/posix/paths.c" + (("/usr/local") + (assoc-ref outputs "out"))))) + ;; Normally, it tries to fetch patched openal with git + ;; but copying files manually in the right place seems + ;; to work too. + (add-after 'unpack 'prepare-static-openal + (lambda* (#:key inputs #:allow-other-keys) + (let ((arcan-openal (assoc-ref inputs + "arcan-openal"))) + (copy-recursively arcan-openal + "external/git/openal")) #t)) + (add-after 'prepare-static-openal 'generate-man + (lambda _ + (with-directory-excursion "doc" + (invoke "ruby" "docgen.rb" "mangen")) #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") #t))) + #:tests? #f)) + (inputs `(("bash-minimal" ,bash-minimal) + ("espeak" ,espeak) + ("ffmpeg" ,ffmpeg) + ("freetype" ,freetype) + ("gumbo-parser" ,gumbo-parser) + ("harfbuzz" ,harfbuzz) + ("jbig2dec" ,jbig2dec) + ("leptonica" ,leptonica) + ("libdrm" ,libdrm) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libseccomp" ,libseccomp) + ("libusb" ,libusb) + ("libvnc" ,libvnc) + ("libxkbcommon" ,libxkbcommon) + ("luajit" ,luajit) + ("mupdf" ,mupdf) + ("openal" ,openal) + ("openjpeg" ,openjpeg) + ("sdl2" ,sdl2) + ("sqlite" ,sqlite) + ("tesseract-ocr" ,tesseract-ocr) + ("vlc" ,vlc) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("xcb-util" ,xcb-util) + ("xcb-util-wm" ,xcb-util-wm) + ("zlib" ,zlib) + ;; To build arcan_lwa, we need a patched version of openal. + ;; https://github.com/letoram/arcan/wiki/packaging + ("arcan-openal" + ,(origin + (method git-fetch) + (file-name "arcan-openal-0.6.2") + (uri (git-reference (url + "https://github.com/letoram/openal") + (commit "0.6.2"))) + (sha256 + (base32 + "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) + (native-inputs (list pkg-config ruby)) ;For documentation and testing + (home-page "https://arcan-fe.com") + (synopsis "Display server, multimedia framework and game engine") + (description + "Arcan is a development framework for creating virtually anything from user interfaces for specialized embedded applications all the way to full-blown desktop environments. At its heart lies a multimedia engine with a Lua scripting interface.") - ;; https://github.com/letoram/arcan/blob/master/COPYING - (license (list license:asl2.0 - license:bsd-3 - license:cc-by3.0 - license:expat - license:gpl2+ - license:lgpl2.0 - license:lgpl2.0+ - license:public-domain - license:silofl1.1 - license:zlib)))) + ;; https://github.com/letoram/arcan/blob/master/COPYING + (license (list license:asl2.0 + license:bsd-3 + license:cc-by3.0 + license:expat + license:gpl2+ + license:lgpl2.0 + license:lgpl2.0+ + license:public-domain + license:silofl1.1 + license:zlib)))) (define-public arcan-sdl (package -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 30 18:08:02 2023 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:08:02 +0000 Received: from localhost ([127.0.0.1]:55942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHa-000330-7h for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:46396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHW-00032F-MC for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:59 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id A82D3388C; Fri, 30 Jun 2023 22:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C4VoYYpDT/HdRWO8pvLDX3ENK3gJyF2cxDvtq+XHpeA=; b=uTfNabluffSKg2jFRmLJZxAC6/+LCLTOCSfnMXY+4wHDnpWH+YTV0SOL+vXCbKKNRa6LDE QCfpCBgdLvhdSOetSB8yS7zc29PuHG4eTvA0tTgpt6JFwCznn69rAVacLnP9J96vNA8E0W TihnzvCkSAEP0scp/XJQw1Ld851x9T1QHHKLaAHDvzGPHYG2ELpkrjLR/BvmzhJOSKhhQ+ 6M4iBt1PeibhvOVoObFVKBsgz+SykQqzfgIv/QfxlQwlP6OqF6ve3obwfHZZ5n5uELl/0X HOZN9+EMtawj2cplUAyNnffrC4oX+7e+o9q21xIieAhIu3j9S4PgqAqpsxfp5xX3GsG5te WaaTsJhhOrH52J4JNWf78kPmQTBiWFw9EsQrmtMp8D61BqgzyFde8OoUglXNSpA4GUo1nx Xz5VEicmhbSOjeTqYuTph08aJDkGzW0BeRrXu+cPNLs+6lYDRlRKXxpngsKkGi8NOGSg81 13K8CV2N96gZQcdkXaWtoPckh0+c4SfMwMBHUWAWxCwA5OVKmecnX/OHZNejSCNkBxEJBl ldq/H0dqv0Lnx9vvbCmWDmypEIaEj+VSdStUS5RAxeKOaGz0wo0SRVrLupowp4AtwgoVbC Wrp7WKe+MgKkMSx2uGBZ8aXwB6sAGHxrKlAM0uyKtsVZkj04bG70s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C4VoYYpDT/HdRWO8pvLDX3ENK3gJyF2cxDvtq+XHpeA=; b=y61YL50aDKQj3miNzSd1tN52vH84uFSnsbgGCSPfv2DhlQviVErKvA2Nfs2HmUXmpjT5zO Z+l53JrVV5gi7yBw== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH 6/6] gnu: Remove arcan-wayland. Date: Sat, 1 Jul 2023 02:07:11 +0400 Message-Id: <25d18f87d518a85e6f62050e2f58f322b3827265.1688161433.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This package has been merged into arcan in upstream. * gnu/packages/arcan.scm (arcan-wayland): Remove variable. --- gnu/packages/arcan.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 05d2f58fc2..53a1f75411 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -235,35 +235,3 @@ (define-public xarcan to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session as a window under Arcan.") (license license:expat)))) - -(define-public arcan-wayland - (package - (inherit arcan) - (name "arcan-wayland") - (native-inputs - (list pkg-config)) - (inputs - (list arcan - libseccomp - libxkbcommon - mesa - wayland - wayland-protocols)) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "src/tools/waybridge") - #t)) - (add-after 'unpack 'fix-cmake-find-shmif - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake" - (("/usr/local") (assoc-ref inputs "arcan"))) - #t))))) - (synopsis "Wayland protocol service for Arcan") - (description "Arcan-wayland (waybridge) bridges Wayland connections -with an Arcan connection point. It allows Wayland compatible clients -to connect and render using Arcan.") - (license license:bsd-3))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:25:44 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:44 +0000 Received: from localhost ([127.0.0.1]:44012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUALw-0004Ie-2n for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:44 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:46300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUALs-0004IL-1x for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:42 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 532FF1B07; Thu, 10 Aug 2023 18:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=gR0mEsv5RBtQzzHh+TgqTYub9krcNQeEHsWzS/To2Fk=; b=bgGRmLH3oqQjOu5wMOIrZ8qRrKoIV9B30b3YrtlOTggwuDltq9cjFWVjkQw/hKkhev2jsx C8dbGQ6/cAwswQmTgfFoQdRc2XeXW9ngHkKA2K7T8W9ow0JmjgKGlWQPiDsdHXbzA33tKc JQTpA5H6qRnN1UyRYo4Lakl4CAp5fMJF7cDVvuygTkFzCBAMHwDC9Ec6pFWnOCKOkLP448 BfCkQhzFTQlrqcvVYgxXLAFkoEWmKUHdX6pvX9qWS13U41i9PGyF8AyPVxHlujrPWbGxAn Eo1Ahr+W7Hjg34vM7K7FUaJ7dsQGezQj1kAc7+56AYs4TB7jp7Ul78vGTshdP0zeJhtmSN SbYfoMEWBcU6ZfW31JuMG0HJxIHDi04HJv28Zf7YVceQzhTIpOAXPV5PaOYK77Vn/27/5r r8QPgmwB+VCCEE8pC2Jl9aXgkTdoXEe1LK3ytDMc9D1ho80yY0yirTF6f320ajHBoz6Gbi PpBtP9b7QHG2YN95AXjBILCaz24jP75Y+RTNYWOPJeywGOoL9VMaujFLB+K9BTlAY6Rhez 7uaaZO3dqOmBYgkRL/ZjXqn7AcJOzySHT5hBFuB0C/bNuoLMKgo2eArEHd1sbh71ZYzUtG D+3M8Vq0kbrsTgb1gEGEEfv95mec28aqEG9eC4kKGqekEgb19LAAw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=gR0mEsv5RBtQzzHh+TgqTYub9krcNQeEHsWzS/To2Fk=; b=oTpm72OuyPH2GPIhlkFSZEjKmIHKvIsl49QYhDyIm1iCGZxX4NRk56iF0gml7s7lcKcKzD RSghO/9xgrle/bDQ== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 0/6] Update and rework arcan Date: Thu, 10 Aug 2023 22:16:32 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Guix, Version 2 of this patch series deprecates "arcan-wayland" with an alias to "arcan"instead of removing it. Ahmad Draidi (6): gnu: arcan: Update to 0.6.2.1. gnu: arcan: Build all features. gnu: arcan: Fix paths handling. gnu: arcan: Use new style arguments. gnu: arcan: Restyle format. gnu: arcan-wayland: Deprecate in favor of "arcan". gnu/packages/arcan.scm | 255 ++++++++++++++++++----------------------- 1 file changed, 111 insertions(+), 144 deletions(-) base-commit: b2c28de020483a52f0a4f118ea40da17c2c9e5a2 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:25:50 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:50 +0000 Received: from localhost ([127.0.0.1]:44016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM1-0004Iz-BG for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:50 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:49248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUALz-0004IW-1t for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:48 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 87F9721D3; Thu, 10 Aug 2023 18:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KP/H+TzW+9VXuSPDshhdwA9y/jTUrXSM7gCEI5GIlBA=; b=ezvLzDpIA8YkOM5EBO6pTz59znYW/YWLMxWwbNfrVhA2r1IZsdi0ARXts5J72XfDvF+P6S p/XK/+avLaU2T53WwgTjIyR93ZfO7JC5QOGJmBj2WAAPWs451wqbEnQa80JhRFfEQkofyv mt5GIy61mb2GToNa+gOr2zR7ROomr9yRQn9t42d/vaaOoGPy3p+8MFhngEkrJWvrOMPBAw 4nNs/kh4DCxuKp6ySYEVPwJ88sGn7Q/wwfu+s424Z6qhjoMTpmBIffuzo2GdDPK/Rx1r8c X+8N1KD7Y43i/eo2b2GjZwlX9V+oYSnSmgFtaZdHV3itboULpe/2R+Og1nGkskHieC85Mb gfpMlAbHNa8MHFiNbYEVjgZgoPmOcxSg3wvlUYPxp6JsyLeJojgTRYqVPdHrDOGFZpbZAj kYG4bH7O4s80BytXl+1a/ONsNWSnLVMdOxbrYvfNrn6q/pqhep6+Ry9QBFyBk3llRlwFh/ fz8YM5OKMptg8lAUX25mIyORfGuQfOle2lQ53xsoG1ZBcBfHcQt1EiCRbp+AnOiCVb3Y1X 305gIpwO+h9YrADVC0jH0gmrM2yRF/VKsQw7q8rYYlIMGyS017Um5aPGi5Pam0duAXaVeq HdDtg7uhDzFnR/hdnunvaZvjJQ5ZE0+phs/EYZocu7rDooeyWXJS8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KP/H+TzW+9VXuSPDshhdwA9y/jTUrXSM7gCEI5GIlBA=; b=/t2C8gSOXuLiNAERsSGRBAEZoo99y7fQfAtbgSEGOphOtk52MhHdUHaQj/DmUeCNxvhlAe lu/+D42BHkvgzUCg== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 1/6] gnu: arcan: Update to 0.6.2.1. Date: Thu, 10 Aug 2023 22:16:33 +0400 Message-ID: <61b6ea7a9d903a772585da35c18d30014055d634.1691691398.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan): Update to 0.6.2.1. [use-modules]: Remove no longer used package imports and add ones for new dependencies. Add '(guix gexp)' for snippet. [source]: Use version instead of commit, and add snippet to remove some bundled packages. [arguments]: Remove 'fix-cmake-paths' phase since it's no longer needed. [inputs]: Remove apr, glib, glu, lzip, pcre. Add bash-minimal, espeak, gumbo-parser, jbig2dec, libjpeg-turbo, libseccomp, libvnc, mupdf, openjpeg, sdl2, wayland, wayland-protocols, xcb-util, xcb-util-wm, zlib. Replace ffmpeg-4 with ffmpeg. Change luajit label to fix lint. Update vendored openal to 0.6.2. Sort inputs by name. [description]: Change description to closely match upstream for accuracy. [license]: Add new and missing licenses. --- gnu/packages/arcan.scm | 77 +++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 7483777ff0..f4eecb3364 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2023 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,50 +21,58 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (gnu packages apr) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) - #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ocr) - #:use-module (gnu packages pcre) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages speech) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vnc) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public arcan - (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") - (revision "1")) (package (name "arcan") - (version (git-version "0.5.5.2" revision commit)) + (version "0.6.2.1") (source (origin (method git-fetch) (file-name (git-file-name name version)) (uri (git-reference (url "https://github.com/letoram/arcan") - (commit commit))) + (commit version))) (sha256 - (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw")))) + (base32 "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc")) + (modules '((guix build utils))) + (snippet + ;; Remove some bundled packages + #~(begin + (delete-file-recursively "external/git") + (delete-file-recursively "external/lua") + (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_C_FLAGS=-fcommon" @@ -73,15 +82,6 @@ (define-public arcan "-DSHMIF_TUI_ACCEL=on") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-cmake-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/platform/cmake/modules/FindGBMKMS.cmake" - (("/usr/local/include/libdrm") - (search-input-directory inputs "include/libdrm"))) - (substitute* "src/platform/cmake/modules/FindAPR.cmake" - (("/usr/local/apr/include/apr-1") - (search-input-directory inputs "include/apr-1"))) - #t)) ;; Normally, it tries to fetch patched openal with git ;; but copying files manually in the right place seems to work too. (add-after 'unpack 'prepare-static-openal @@ -122,34 +122,44 @@ (define-public arcan (separator #f) (files '("share/arcan/scripts"))))) (inputs - `(("apr" ,apr) - ("ffmpeg" ,ffmpeg-4) + `(("bash-minimal" ,bash-minimal) + ("espeak" ,espeak) + ("ffmpeg" ,ffmpeg) ("freetype" ,freetype) - ("glib" ,glib) - ("glu" ,glu) + ("gumbo-parser" ,gumbo-parser) ("harfbuzz" ,harfbuzz) + ("jbig2dec" ,jbig2dec) + ("leptonica" ,leptonica) ("libdrm" ,libdrm) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libseccomp" ,libseccomp) ("libusb" ,libusb) + ("libvnc" ,libvnc) ("libxkbcommon" ,libxkbcommon) - ("lua" ,luajit) - ("lzip" ,lzip) + ("luajit" ,luajit) + ("mupdf" ,mupdf) ("openal" ,openal) - ("pcre" ,pcre) + ("openjpeg" ,openjpeg) + ("sdl2" ,sdl2) ("sqlite" ,sqlite) ("tesseract-ocr" ,tesseract-ocr) - ("leptonica" ,leptonica) ("vlc" ,vlc) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("xcb-util" ,xcb-util) + ("xcb-util-wm" ,xcb-util-wm) + ("zlib" ,zlib) ;; To build arcan_lwa, we need a patched version of openal. ;; https://github.com/letoram/arcan/wiki/packaging ("arcan-openal" ,(origin (method git-fetch) - (file-name "arcan-openal-0.5.4") + (file-name "arcan-openal-0.6.2") (uri (git-reference (url "https://github.com/letoram/openal") - (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef"))) + (commit "0.6.2"))) (sha256 (base32 - "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2")))))) + "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) (native-inputs (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") @@ -157,13 +167,18 @@ (define-public arcan (description "Arcan is a development framework for creating virtually anything from user interfaces for specialized embedded applications all the way to full-blown desktop environments. At its heart lies a multimedia -engine programmable using Lua.") +engine with a Lua scripting interface.") ;; https://github.com/letoram/arcan/blob/master/COPYING - (license (list license:gpl2+ + (license (list license:asl2.0 + license:bsd-3 + license:cc-by3.0 + license:expat + license:gpl2+ license:lgpl2.0 license:lgpl2.0+ license:public-domain - license:bsd-3))))) + license:silofl1.1 + license:zlib)))) (define-public arcan-sdl (package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:25:53 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:53 +0000 Received: from localhost ([127.0.0.1]:44020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM5-0004JH-5h for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:53 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:49260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM2-0004Im-7a for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:50 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 44B1A1B07; Thu, 10 Aug 2023 18:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b50PSEey0vO1kgwRjDtpGuql8gx58Kxh7FdODf1kq5k=; b=I7L6B06/Lgt2bCwsbpZF4zgbxbeJx6VH5hhSQHYBaIH0dMeesySX16ujcFIUu94Okv6cgO HgJQZ5YlMKi92mhDcQEtQdDnwWaP20h3iXZjXdjynboAXmFT7WxGqGEoqsr6IiTZA5gJUK cFgf/6sWgxc9hPB51nmTbYdOdrKiUcodQYn/xjzv2OnFSiSsExBVIJOkBPnGh6VBOrPMh0 1YkPmQemoyXFXnznDC28gNuyBDVaZ0fbScZfbgtbi+cqoR78Igg3bgTjgvHzYGMAHDV66X 4R9N7wCC5d0UUIJIx01eh3Yr8l/PXUIL/pIg0bCvKkM5Kpd1/j9OS49PMhWwsdk3eV12D/ ytizTC1V0T+o9ugL3np4JVLKA946KD4Ov3fX6czjxZSxWSAU+cd6JZKBZfsc4tObfFh97B MPdFUIF1ulAkcwpj8KrSFXejIWQEOVI3ynilpJhea2i2YEkwOAY6M3Ra/JKg8FjejkO32Z HaJsqNDLVcGecJPRnMjhPCbsYS5YofEtpwpPWxaBXlW46uZvle6j7OcZkuZPYsJ2i/hp8+ juRz5zAxfD/bkcYVGReJ+yq6c5KkBCDEYdA0iQ2WAgwQrEBjNFePInbXxzXn2Fy5h2y55d NFLhL8IkYkC6/Xlgd4gnDmA2Q//O9G67tjZuS4op+dW6PKePgptZk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b50PSEey0vO1kgwRjDtpGuql8gx58Kxh7FdODf1kq5k=; b=kZiuh3wIA0mc6QG182yWeCGaGfF61XPG/A91T71kmSNBytbH90cFiU4WrvnrRM1vWVEiZQ VSlC801jOCO+J4CA== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 2/6] gnu: arcan: Build all features. Date: Thu, 10 Aug 2023 22:16:34 +0400 Message-ID: <13349fbed96787c12e76cfa5804fe24641546937.1691691398.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan): Build all features. [arguments]: Use #:configure-flags "-DBUILD_PRESET=everything" to build all features, and "-DDISTR_TAG='Guix'" to tag the builds. [synopsis]: Remove '(egl-dri)' since it indicates a specific feature. --- gnu/packages/arcan.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index f4eecb3364..cfd72f6e55 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -75,11 +75,8 @@ (define-public arcan (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_C_FLAGS=-fcommon" - "-DVIDEO_PLATFORM=egl-dri" "-DBUILTIN_LUA=off" - "-DSTATIC_OPENAL=off""-DENABLE_LWA=on" - "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" - "-DSHMIF_TUI_ACCEL=on") + `(#:configure-flags '("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") #:phases (modify-phases %standard-phases ;; Normally, it tries to fetch patched openal with git @@ -163,7 +160,7 @@ (define-public arcan (native-inputs (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") - (synopsis "Display server, multimedia framework and game engine (egl-dri)") + (synopsis "Display server, multimedia framework and game engine") (description "Arcan is a development framework for creating virtually anything from user interfaces for specialized embedded applications all the way to full-blown desktop environments. At its heart lies a multimedia -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:25:55 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:56 +0000 Received: from localhost ([127.0.0.1]:44024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM7-0004JY-IM for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:55 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM5-0004Ir-On for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:54 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id BAAB421D7; Thu, 10 Aug 2023 18:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LQIItoTDslyJ9eN/MRKpELZLsnU6y8EJh3zTgY5D6Gc=; b=NKgCseQiqfHvGzlzNcCahA2+IYyUmuQYLDubHu2JGYEZZWIm6wlHX5LfQEFDz65LH5TXLH KxDTc5MjL9scmpHT1Di1318/lBMIBZl0pGeIlSBcBc+JMIdSqJmM78ngn9+VL/go9fmm0H h+zk6+m8NYRZDB8Z9ToS+eors6X4uSVHBmDZsBv9UFlM4YWSH3nmh05azzjhwPqrNXd6cZ lDXnh0kM0n+yA+P9g2fegBEAZUFFYZXfu4KWeeAsRIICRmOoeVNxjPlGZIFzXDDOH4o4ik o69k60qEooD/dC41XuRh9XbZEKSPWmv8WTZeu95tIa2qIOuqbW5jHE+uelGiZWNOXaWyW+ 4fta8JKLSQcohb3+i2ihdFxbNgdF2tgAaqmHlAezz9A0ag0vnYPeSy/wye5qcUO7PMfnRQ w+eG1HFFrN87u5NGtlyLhpE35sxhi0fjq7Jf6edy3I751A/IumRPDVTsger3urWM8GnRH3 nEONEgo6XBqO03fFSiBrMQFcU5Y31gP6EOWkjqSZ41auGY6qlDVMWJX6MIx8MH/5PGbMXi PQIsVOh2aklydjKtXiYHDTdTx2uwL4I6IbUnmCAlyZCq9l78zDOKhgc+rdiZBkXAUHMh2R fjogJ91GxKD9HseKsGuKCJoI8ETaKjb5csxMIn17ZW069Ruow6phA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LQIItoTDslyJ9eN/MRKpELZLsnU6y8EJh3zTgY5D6Gc=; b=twqTYqzGbiea7szcl/Mw0KdkV57m+jmkmh/hhBMRFimMt4my7+YDP6utgcDyGL24fKZ5/U VNzhxDZb6tIiGHAg== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 3/6] gnu: arcan: Fix paths handling. Date: Thu, 10 Aug 2023 22:16:35 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This patch removes the wrapper and the propagated environment variables (through 'native-search-paths') and instead patches the paths inside the source code. This fixes path handling, which seems to be broken now. It also allows us to use 'setuid', which is required for some features, and lets the app use its internal path handling criteria, which some dependent apps expect. * gnu/packages/arcan.scm (arcan): Fix paths handling. [arguments]: Add 'patch-paths' phase. Remove 'wrap-program' phase. [native-search-paths]: Remove. --- gnu/packages/arcan.scm | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index cfd72f6e55..159c6d2190 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -79,6 +79,11 @@ (define-public arcan "-DDISTR_TAG='Guix'") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/platform/posix/paths.c" + (("/usr/local") + (assoc-ref outputs "out"))))) ;; Normally, it tries to fetch patched openal with git ;; but copying files manually in the right place seems to work too. (add-after 'unpack 'prepare-static-openal @@ -94,30 +99,8 @@ (define-public arcan (add-before 'configure 'chdir (lambda _ (chdir "src") - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/arcan") - `("ARCAN_RESOURCEPATH" ":" suffix - (,(string-append out "/share/arcan/resources"))) - `("ARCAN_STATEBASEPATH" ":" = - ("$HOME/.arcan/resources/savestates")) - `("ARCAN_STATEPATH" ":" = - ("$HOME/.arcan/resources/savestates")) - `("ARCAN_BINPATH" ":" = - (,(string-append out "/bin/arcan_frameserver"))))) #t))) #:tests? #f)) - (native-search-paths - (list (search-path-specification - (variable "ARCAN_APPLBASEPATH") - (separator #f) - (files '("share/arcan/appl"))) - (search-path-specification - (variable "ARCAN_SCRIPTPATH") - (separator #f) - (files '("share/arcan/scripts"))))) (inputs `(("bash-minimal" ,bash-minimal) ("espeak" ,espeak) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:25:58 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:58 +0000 Received: from localhost ([127.0.0.1]:44030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM9-0004Jw-TU for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:58 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM8-0004JD-FK for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:56 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 7B41D21D3; Thu, 10 Aug 2023 18:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L0pl86ucC5tXYqkbHh3W/YkYU1nXMGvCJIoqgR1m3nE=; b=Cb/Htjo8hGOHw7zqPZiNEoRqfBCvOSYnQ+RvBAl8dSgvm9nipb5dmLA6VmuVIMp3aJVmNd OBA321sRio9WHrsIJ69cbowLa2+P8vLHxcuFL1zDZ9QSBGfWoPeOr+9lR0+nSglyxISUdQ X3algk5RI6n9YAyWFwGCqSR/RZ25G9gdArj4bDjrk+G4xRQ6C1dKyZq5bAmSHIPWofCxHx pg5+59CLIptfZAr4/QadaXXDC7P6x/4EEtlMJeQF3DvdaCLhR/DKPcwtHXu5hDScDUw7yN J8xJEPD/i+jurjn0SrBFZ1J7isy13/ytIQYkXEZGDKgegmBsjk7tMen8PhGyeSyJ/L/nAV uMzA105ZZL7cDyVSod6VXqTCgf9CsWND3aWzg1as9Ag6M77tSIr2JSCnDVd+IRZB/D2Jec 2UHBs6rEGq8GubJ/1+wznrlYkHpWK+IK5hc/op+bWEvFuQSbT3p1nPBD39q5gRTiSpTtsB mEup7d62SuT1DIfIebmadLNytbvHyXvOLfuLFRf4a/6yvKIy9WF6erGWVk6PXhxSIK8RCE 2twPi1Fz9Fia7vwdDDwjaqjFFn0egFvl5NXYMkoliiL1OI5u3lcnsvCO9Gmk+AfeaTMBQ4 A6Kf0SDOIbsxwWszk8L537jGVhi5iwWIWSsAGcyONve8sPO0br5D8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L0pl86ucC5tXYqkbHh3W/YkYU1nXMGvCJIoqgR1m3nE=; b=Feu/dt3XHiaGKiYhe5WXSbmtlc8wQLsN3jvNWWxbPpE8BM1HDY/HWBGmrkrlIcMrUj5faA iChVYkKPu8XaHLAQ== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 4/6] gnu: arcan: Use new style arguments. Date: Thu, 10 Aug 2023 22:16:36 +0400 Message-ID: <667739ec06929fa054cae6c439d3567fd3e9a9da.1691691398.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan)[arguments]: Use new style arguments. --- gnu/packages/arcan.scm | 50 ++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 159c6d2190..9c6092bb9e 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -75,32 +75,30 @@ (define-public arcan (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_PRESET=everything" - "-DDISTR_TAG='Guix'") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/platform/posix/paths.c" - (("/usr/local") - (assoc-ref outputs "out"))))) - ;; Normally, it tries to fetch patched openal with git - ;; but copying files manually in the right place seems to work too. - (add-after 'unpack 'prepare-static-openal - (lambda* (#:key inputs #:allow-other-keys) - (let ((arcan-openal (assoc-ref inputs "arcan-openal"))) - (copy-recursively arcan-openal "external/git/openal")) - #t)) - (add-after 'prepare-static-openal 'generate-man - (lambda _ - (with-directory-excursion "doc" - (invoke "ruby" "docgen.rb" "mangen")) - #t)) - (add-before 'configure 'chdir - (lambda _ - (chdir "src") - #t))) - #:tests? #f)) + (list #:configure-flags #~'("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/platform/posix/paths.c" + (("/usr/local") + (assoc-ref outputs "out"))))) + ;; Normally, it tries to fetch patched openal with git + ;; but copying files manually in the right place seems to work too. + (add-after 'unpack 'prepare-static-openal + (lambda* (#:key inputs #:allow-other-keys) + (let ((arcan-openal (assoc-ref inputs + "arcan-openal"))) + (copy-recursively arcan-openal + "external/git/openal")) #t)) + (add-after 'prepare-static-openal 'generate-man + (lambda _ + (with-directory-excursion "doc" + (invoke "ruby" "docgen.rb" "mangen")) #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") #t))) + #:tests? #f)) (inputs `(("bash-minimal" ,bash-minimal) ("espeak" ,espeak) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:26:03 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:26:03 +0000 Received: from localhost ([127.0.0.1]:44032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAMA-0004Jy-8g for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:26:03 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM9-0004JD-4X for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:57 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 533B221D7; Thu, 10 Aug 2023 18:25:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GtmFJFvZawr7wwcpL72bPY/nRbbS6+GQer4afRXc4bk=; b=ldDddpN8qJaiSgrPpN1rCkn0o0eWCtVcg+hV6XisqBkyGD701zIztF6ie/kzR9gS4TJ65C Ylmnn3q4vBqrxk9VnfjWgv8QtmVPdF5bLG1qiT80w+WnCQ2FcuhOdj/WYOMaIFAdErZBKG FfCB9xLw6uhn/rLTtibNJrLqBsgV8EZTFZG0OeaL04JzyWMpw1gm0GsTRgTo3S9ZycLKfL fVvbqdYJ5FkA4x21IOKDw5svVwhcsCa2GTEvY9IvxHaRhgGu4P2rGvkvgcVXzq+xkOsx/j l2XJd8Gkm2JCt51Cuv4EE04TanVjEmyys0+FYm/569q4oCrhoByGb7VKHD0ol4AYFFOM6Y xG6Hi0HzbVibwTuStHwO2bRdMcGIpmYNa2IPw2K2UzKKxf3gxghO14duzOb3yq4zD9K0La i8TO7IhQOwQFg1ogOg/1zhDs35MBTjYsTGbtfWsS1tSagrthbVwUvvdJgC1oowxSrKeGwl EhCeX015A1AbkLk/gYD+81eKaoLW9JzaIln69d4+0Gubd8hTHWlQukVOhuSfPTmUlctoMH cMgs6IIn18SWqZ+/8/jn1tTYhFNX8qEHLcaTqtBBVNEopqMdYsy1EnlqsbGQKimJl6ssaP 1/LOwpZrKW+WFS4PP9T5e8veVz+HMOoVwa2eamQ2iZ/JnrHcfj0v0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GtmFJFvZawr7wwcpL72bPY/nRbbS6+GQer4afRXc4bk=; b=IpOwYZ/lc2AycvkUgF/O7oZwod/mlC6E3arkqkjrEUKuoSALfJIZkZ007xZpBxrgKSqBsP TV6VZ6Bvym+0bTAQ== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 6/6] gnu: arcan-wayland: Deprecate in favor of "arcan". Date: Thu, 10 Aug 2023 22:16:38 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan-wayland): Rewrite as a deprecated alias for "arcan". --- gnu/packages/arcan.scm | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 05d2f58fc2..c2a1071e96 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -236,34 +236,6 @@ (define-public xarcan as a window under Arcan.") (license license:expat)))) +;; Package was merged into arcan in upstream (define-public arcan-wayland - (package - (inherit arcan) - (name "arcan-wayland") - (native-inputs - (list pkg-config)) - (inputs - (list arcan - libseccomp - libxkbcommon - mesa - wayland - wayland-protocols)) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "src/tools/waybridge") - #t)) - (add-after 'unpack 'fix-cmake-find-shmif - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake" - (("/usr/local") (assoc-ref inputs "arcan"))) - #t))))) - (synopsis "Wayland protocol service for Arcan") - (description "Arcan-wayland (waybridge) bridges Wayland connections -with an Arcan connection point. It allows Wayland compatible clients -to connect and render using Arcan.") - (license license:bsd-3))) + (deprecated-package "arcan-wayland" arcan)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 10 14:26:03 2023 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:26:04 +0000 Received: from localhost ([127.0.0.1]:44037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAMF-0004Ki-77 for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:26:03 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAMB-0004JS-9i for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:59 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 486A121D9; Thu, 10 Aug 2023 18:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=emAQJtiUH9idOwji4smPz9uF8veMLdP5GBeZdr9DQgY=; b=xF+Q7pM+WkfN1nfsVtj1WiTRI8J6mBeHi4qjkBvKZQ0HN402yQUtueGkZtxAYIU5a5DAWx t3cs1f1VGkhzIkVMQhLZLFJdkm5TDcBjV4wlOAuGj4thPDTAQjmgnb53UC1T5RWkdfKyyn fwoy8UissYSvecxCyyCF3FiLzft0HrPPQZRtaba9X6Lxov5Pzg9xvT/cZ6llweNucypIzw 2B9z6yHqrhcI5boYqeSiky/iZicj922Kt9foWS+YlZJTJO5IDzXMr0Ylk5UV96a+eJAOqL k8rUsLhgSK8APkGvuoyhGUh4F65xNLH4eNUyd9/oAAGo3qjF5ZJZsytqGMpKyxFqpgLXKh tPezD/5SSQISlblLNqzuaSjJwd4hedypjL+27RDEFaWNZfoxb3h6I47mdVVXHaQBt74POD I4eIUGY1mK1TCvSU/CS0iB7rGCB5klJSP/jxOO15OQnvsq0PXxmMHf6hqdrmUQ/kMrMCIk Tc9m1L1uAwOsA9AR+v6k/6oRQDrwjhHWetCvGx7PDZzdr6TPgMzmR6rKknt3ZPvwbPPc5H OTlNGmZ4ZDSKPOmiN/ONk02fJaCYWLjSQ+RLb4Db8badaxzPceXEHopIfN8bGTrTaPA1tt QledcCoYkHSE8FWUAIXJ9f1xXVaCtKAUAmscYdNfE9EKP79Zau7as= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=emAQJtiUH9idOwji4smPz9uF8veMLdP5GBeZdr9DQgY=; b=qC8ZJ8edwvcKsjmgyJq9oBUi4fvooVdkatZe8UK24smNKN5iwJJI8F/Bg2V1OQqAJdN+ck C6OrRsk3fSHh3TDA== From: Ahmad Draidi To: 64387@debbugs.gnu.org Subject: [PATCH v2 5/6] gnu: arcan: Restyle format. Date: Thu, 10 Aug 2023 22:16:37 +0400 Message-ID: <9fdea3fa7c68a55e26ac21d73941c8bc8f07c687.1691691398.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64387 Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/arcan.scm (arcan): Run 'guix style' over the package and manually break some long lines. --- gnu/packages/arcan.scm | 200 +++++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 99 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 9c6092bb9e..05d2f58fc2 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -55,108 +55,110 @@ (define-module (gnu packages arcan) #:use-module (srfi srfi-1)) (define-public arcan - (package - (name "arcan") - (version "0.6.2.1") - (source (origin - (method git-fetch) - (file-name (git-file-name name version)) - (uri (git-reference - (url "https://github.com/letoram/arcan") - (commit version))) - (sha256 - (base32 "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc")) - (modules '((guix build utils))) - (snippet - ;; Remove some bundled packages - #~(begin - (delete-file-recursively "external/git") - (delete-file-recursively "external/lua") - (delete-file-recursively "external/sqlite"))))) - (build-system cmake-build-system) - (arguments - (list #:configure-flags #~'("-DBUILD_PRESET=everything" - "-DDISTR_TAG='Guix'") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/platform/posix/paths.c" - (("/usr/local") - (assoc-ref outputs "out"))))) - ;; Normally, it tries to fetch patched openal with git - ;; but copying files manually in the right place seems to work too. - (add-after 'unpack 'prepare-static-openal - (lambda* (#:key inputs #:allow-other-keys) - (let ((arcan-openal (assoc-ref inputs - "arcan-openal"))) - (copy-recursively arcan-openal - "external/git/openal")) #t)) - (add-after 'prepare-static-openal 'generate-man - (lambda _ - (with-directory-excursion "doc" - (invoke "ruby" "docgen.rb" "mangen")) #t)) - (add-before 'configure 'chdir - (lambda _ - (chdir "src") #t))) - #:tests? #f)) - (inputs - `(("bash-minimal" ,bash-minimal) - ("espeak" ,espeak) - ("ffmpeg" ,ffmpeg) - ("freetype" ,freetype) - ("gumbo-parser" ,gumbo-parser) - ("harfbuzz" ,harfbuzz) - ("jbig2dec" ,jbig2dec) - ("leptonica" ,leptonica) - ("libdrm" ,libdrm) - ("libjpeg-turbo" ,libjpeg-turbo) - ("libseccomp" ,libseccomp) - ("libusb" ,libusb) - ("libvnc" ,libvnc) - ("libxkbcommon" ,libxkbcommon) - ("luajit" ,luajit) - ("mupdf" ,mupdf) - ("openal" ,openal) - ("openjpeg" ,openjpeg) - ("sdl2" ,sdl2) - ("sqlite" ,sqlite) - ("tesseract-ocr" ,tesseract-ocr) - ("vlc" ,vlc) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) - ("xcb-util" ,xcb-util) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ;; To build arcan_lwa, we need a patched version of openal. - ;; https://github.com/letoram/arcan/wiki/packaging - ("arcan-openal" ,(origin - (method git-fetch) - (file-name "arcan-openal-0.6.2") - (uri (git-reference - (url "https://github.com/letoram/openal") - (commit "0.6.2"))) - (sha256 - (base32 - "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) - (native-inputs - (list pkg-config ruby)) ; For documentation and testing - (home-page "https://arcan-fe.com") - (synopsis "Display server, multimedia framework and game engine") - (description "Arcan is a development framework for creating virtually + (package + (name "arcan") + (version "0.6.2.1") + (source (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/arcan") + (commit version))) + (sha256 + (base32 + "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc")) + (modules '((guix build utils))) + (snippet + ;; Remove some bundled packages + #~(begin + (delete-file-recursively "external/git") + (delete-file-recursively "external/lua") + (delete-file-recursively "external/sqlite"))))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~'("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/platform/posix/paths.c" + (("/usr/local") + (assoc-ref outputs "out"))))) + ;; Normally, it tries to fetch patched openal with git + ;; but copying files manually in the right place seems + ;; to work too. + (add-after 'unpack 'prepare-static-openal + (lambda* (#:key inputs #:allow-other-keys) + (let ((arcan-openal (assoc-ref inputs + "arcan-openal"))) + (copy-recursively arcan-openal + "external/git/openal")) #t)) + (add-after 'prepare-static-openal 'generate-man + (lambda _ + (with-directory-excursion "doc" + (invoke "ruby" "docgen.rb" "mangen")) #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") #t))) + #:tests? #f)) + (inputs `(("bash-minimal" ,bash-minimal) + ("espeak" ,espeak) + ("ffmpeg" ,ffmpeg) + ("freetype" ,freetype) + ("gumbo-parser" ,gumbo-parser) + ("harfbuzz" ,harfbuzz) + ("jbig2dec" ,jbig2dec) + ("leptonica" ,leptonica) + ("libdrm" ,libdrm) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libseccomp" ,libseccomp) + ("libusb" ,libusb) + ("libvnc" ,libvnc) + ("libxkbcommon" ,libxkbcommon) + ("luajit" ,luajit) + ("mupdf" ,mupdf) + ("openal" ,openal) + ("openjpeg" ,openjpeg) + ("sdl2" ,sdl2) + ("sqlite" ,sqlite) + ("tesseract-ocr" ,tesseract-ocr) + ("vlc" ,vlc) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("xcb-util" ,xcb-util) + ("xcb-util-wm" ,xcb-util-wm) + ("zlib" ,zlib) + ;; To build arcan_lwa, we need a patched version of openal. + ;; https://github.com/letoram/arcan/wiki/packaging + ("arcan-openal" + ,(origin + (method git-fetch) + (file-name "arcan-openal-0.6.2") + (uri (git-reference (url + "https://github.com/letoram/openal") + (commit "0.6.2"))) + (sha256 + (base32 + "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) + (native-inputs (list pkg-config ruby)) ;For documentation and testing + (home-page "https://arcan-fe.com") + (synopsis "Display server, multimedia framework and game engine") + (description + "Arcan is a development framework for creating virtually anything from user interfaces for specialized embedded applications all the way to full-blown desktop environments. At its heart lies a multimedia engine with a Lua scripting interface.") - ;; https://github.com/letoram/arcan/blob/master/COPYING - (license (list license:asl2.0 - license:bsd-3 - license:cc-by3.0 - license:expat - license:gpl2+ - license:lgpl2.0 - license:lgpl2.0+ - license:public-domain - license:silofl1.1 - license:zlib)))) + ;; https://github.com/letoram/arcan/blob/master/COPYING + (license (list license:asl2.0 + license:bsd-3 + license:cc-by3.0 + license:expat + license:gpl2+ + license:lgpl2.0 + license:lgpl2.0+ + license:public-domain + license:silofl1.1 + license:zlib)))) (define-public arcan-sdl (package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 05 20:40:15 2023 Received: (at 64387-done) by debbugs.gnu.org; 6 Sep 2023 00:40:15 +0000 Received: from localhost ([127.0.0.1]:60061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdgad-0003m9-HH for submit@debbugs.gnu.org; Tue, 05 Sep 2023 20:40:15 -0400 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:60668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdgaZ-0003lp-2g for 64387-done@debbugs.gnu.org; Tue, 05 Sep 2023 20:40:13 -0400 Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-414e78cdc11so323781cf.0 for <64387-done@debbugs.gnu.org>; Tue, 05 Sep 2023 17:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693960805; x=1694565605; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=RAk0doecIBzQ72OxgIPxomtjA+LX2BjLtPBLnW2+pWw=; b=j7BN2b1iW2evT1cBgBN0ElwnSuzlhQDZ44DhmwG44gb4CUSspNIuRX7KNQSxMAcUIh Oy7htoFW+WY8KLo9X6vKu7vLoSrhVIRs/jAzxJYNjxz2mtO89ID7y7sYR0pcV5SXzDqJ TjHRVuLzd07V3HSe2DW9tZ3alU1aTQyHjBSC8y5g18nkLeX+wlY/CzgCjKNqDkaMUAIC S7zIj50n3DJ790HTuY5Z19oTCl2uFqJ2jd196hieCSb4nNqF5/Xl6vTC2sD7iohc6dpr 6i8gKSwrZ+nzAEAGutAFeQ4OB7dKK3ogLI4TF1l5dtIvl2l+c/LIDpti86o+NDSltDjh AkNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693960805; x=1694565605; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RAk0doecIBzQ72OxgIPxomtjA+LX2BjLtPBLnW2+pWw=; b=CiLzBog6DYOXtE+GKq9Zoo8aOHBtAshyaYcCvIFcRJB+5KdaEwHrNmTSra2EHBKv4U ZBrHgd3XP5Ca3iakeAWWE7ZReckJStf1q0MBMI2q3OkAlR/uXJpYHmpguDB7M1/GRPGw 9cGpiKGcQ2gJZgbQTUrfQm/LiOuVTgn94Fkg+TR4BjZf5S7EHzsuI6FR5FwykbIW24Zy 08ObD2JDtQd8jhpwc1111xI3LWo/QQh8lnQuEHkqfhFbeXLb3FtTU6fBxSrxw8wcrGlf Wmp8I8IavbTUj1m4LUIJl80RC3lDXXYn0e5C6FLSMwHyLoPo8/Kg2rk92JxeWugHeQrq QovQ== X-Gm-Message-State: AOJu0Yy5LfjHcIZmEBbteA0eTXAndyMlCKwsUDa759LUWT/90EeG/3eh GrRDhf9NNJsAQbsqDXIdDds= X-Google-Smtp-Source: AGHT+IGnS80Z3baovAqVvpEmfivHT+R+MqWuFaO4l5FPPoSbZs2v0DJFjmklAAv7AE6LcDM1BMaPww== X-Received: by 2002:a05:622a:15c8:b0:40f:ef8e:9ac7 with SMTP id d8-20020a05622a15c800b0040fef8e9ac7mr18329294qty.48.1693960804742; Tue, 05 Sep 2023 17:40:04 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id jd19-20020a05622a719300b00400a99b8b38sm4816600qtb.78.2023.09.05.17.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 17:40:04 -0700 (PDT) From: Maxim Cournoyer To: Ahmad Draidi Subject: Re: bug#64387: [PATCH 0/6] Update and rework arcan References: Date: Tue, 05 Sep 2023 20:40:02 -0400 In-Reply-To: (Ahmad Draidi's message of "Thu, 10 Aug 2023 22:16:38 +0400") Message-ID: <87msy0f82l.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Ahmad! Well crafted! I've installed the series. -- Thanks, Maxim Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 MANY_TO_CC Sent to 10+ recipients -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:833 listed in] [list.dnswl.org] X-Debbugs-Envelope-To: 64387-done Cc: me@tobias.gr, zimon.toutoune@gmail.com, paren@disroot.org, ludo@gnu.org, 64387-done@debbugs.gnu.org, rekado@elephly.net, rg@raghavgururajan.name, jgart@dismail.de, othacehe@gnu.org, guix@cbaines.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Ahmad! Well crafted! I've installed the series. -- Thanks, Maxim Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:833 listed in] [list.dnswl.org] 3.0 MANY_TO_CC Sent to 10+ recipients -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Ahmad! Well crafted! I've installed the series. -- Thanks, Maxim From unknown Tue Jun 17 22:25:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 04 Oct 2023 11:24:42 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator