From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 14:58:03 2022 Received: (at submit) by debbugs.gnu.org; 27 Jul 2022 18:58:03 +0000 Received: from localhost ([127.0.0.1]:56996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmEN-0005eQ-5x for submit@debbugs.gnu.org; Wed, 27 Jul 2022 14:58:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:43764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmEK-0005dz-6x for submit@debbugs.gnu.org; Wed, 27 Jul 2022 14:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGmEI-0004ID-Oc for guix-patches@gnu.org; Wed, 27 Jul 2022 14:58:00 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:41931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGmEE-0003c0-Su for guix-patches@gnu.org; Wed, 27 Jul 2022 14:57:57 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 04E4E40058 for ; Wed, 27 Jul 2022 18:57:50 +0000 (UTC) From: Tomasz Jeneralczyk To: guix-patches@gnu.org Subject: [PATCH 0/6] Add hydrus network and its dependencies Date: Wed, 27 Jul 2022 20:57:18 +0200 Message-Id: X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=172.81.176.235; envelope-from=tj@schwi.pl; helo=outgoing1.lunanode.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NO_DNS_FOR_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.9 (/) X-Debbugs-Envelope-To: submit Cc: Tomasz Jeneralczyk 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.9 (-) This patch series will add hydrus network along with all dependencies it needs and fixes to already existing packages. The hydrus-network package added in the last patch depends on all previous patches to work, so I want to sent it all in one go. Hydrus is something I wanted to use and decided to package, but this sent me on a deep rabbit hole of packaging new software and fixing what's already present. There are still problems with swftools and hydrus that I couldn't resolve, but those are minor and I'll dedicate time to fixing them in the future. I provided more details in relevant commit messages and source comments. Tomasz Jeneralczyk (6): gnu: Add swftools. gnu: Add python-xvfbwrapper. gnu: Add python-mpv. gnu: Add opencv-with-python. gnu: Update python-cloudscraper. gnu: Add hydrus-network. gnu/packages/animation.scm | 93 ++++++++++++++++++++++ gnu/packages/image-processing.scm | 12 +++ gnu/packages/image-viewers.scm | 127 ++++++++++++++++++++++++++++++ gnu/packages/python-check.scm | 22 ++++++ gnu/packages/python-web.scm | 10 +-- gnu/packages/python-xyz.scm | 62 +++++++++++++++ 6 files changed, 321 insertions(+), 5 deletions(-) base-commit: ecb91c993dcce7e6c3faa0d156013dac42380cc6 -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 15:00:49 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:00:49 +0000 Received: from localhost ([127.0.0.1]:57006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmH2-0005lh-WD for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:00:49 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmH0-0005lW-Us for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:00:47 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id AEEBA4005F for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:00:46 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH 1/6] gnu: Add swftools. Date: Wed, 27 Jul 2022 21:00:23 +0200 Message-Id: <4bf3ae305cb32d5977c99b3bc644eabfcefb245f.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) This package will built all of swftools' tools but one: PDF2SWF, so I purposefuly commented it out of description. Swftools includes the source tarball of an old version of xpdf and I have not been successful in replacing it with the version distributed in guix. However I believe the near-completeness of the package warrants a release. Also updated copyright and used modules. *gnu/packages/animation.scm (swftools): Add variable. --- gnu/packages/animation.scm | 93 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c281772563..3078f586cf 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020, 2021 Vinicius Monego +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ (define-module (gnu packages animation) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages mp3) #:use-module (gnu packages networking) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -496,3 +498,94 @@ (define-public pencil2d lets you create traditional hand-drawn animations (cartoons) using both bitmap and vector graphics.") (license license:gpl2))) + +(define-public swftools + ;; Last release of swftools was 0.9.2 on 2012-04-21 - it is really old and + ;; does not compile with what's available in guix, master on the other hand works. + (let ((commit "772e55a271f66818b06c6e8c9b839befa51248f4") + (revision "1")) + (package + (name "swftools") + (version (git-version "0.9.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/matthiaskramm/swftools") + (commit commit))) + (sha256 + (base32 "0a8a29rn7gpxnba3spnvkpdgr7mdlssvr273mzw5b2wjvbzard3w")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; To fix a linking error I followed the workaround in: + ;; https://github.com/matthiaskramm/swftools/issues/178 + ;; and implented it as a two-step snippet because substitute* + ;; does not match multiline regexes. + (substitute* "lib/lame/quantize.c" + ;; move inline keywords to the same line as their function headers + (("^inline.*\n") "inline ")) + (substitute* "lib/lame/quantize.c" + ;; make this particular function not inline + (("inline (void bitpressure_strategy1)" _ f) f)))))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f)) ; no rule for check + (inputs (list zlib freetype giflib libjpeg-turbo lame)) + (home-page "http://www.swftools.org") + (synopsis "Collection of utilities for working with Adobe Flash files") + (description "SWFTools is a collection of utilities for working with +Adobe Flash files (SWF files). The tool collection includes programs for +reading SWF files, combining them, and creating them from other content (like +images, sound files, videos or sourcecode). The current collection is + comprised of the programs detailed below: + +@itemize +@comment PDF2SWF is not currentlybeing build alongside other tools. The next +@comment two lines should be uncommented if this will ever get fixed. +@comment @item +@comment @command{PDF2SWF} A PDF to SWF Converter. + +@item +@command{SWFCombine} A multi-function tool for inserting, contatenating, +stacking and changing parameters in SWFs. + +@item +@command{SWFStrings} Scans SWFs for text data. +@item +@command{SWFDump} Prints out various informations about SWFs. + +@item +@command{JPEG2SWF} Takes one or more JPEG pictures and generates a SWF +slideshow from them. + +@item +@command{PNG2SWF} Like JPEG2SWF, only for PNGs. + +@item +@command{GIF2SWF} Converts GIFs to SWF. Also able to handle animated gifs. + +@item +@command{WAV2SWF} Converts WAV audio files to SWFs, using the L.A.M.E. MP3 + encoder library. + +@item +@command{Font2SWF} Converts font files (TTF, Type1) to SWF. + +@item +@command{SWFBBox} Allows to read out, optimize and readjust SWF bounding boxes. + +@item +@command{SWFC} A tool for creating SWF files from simple script files. Supports +both ActionScript 2.0 aand 3.0. + +@item +@command{SWFExtract} Allows to extract Movieclips, Sounds, Images etc. from SWF + files. + +@item +@command{AS3Compile} A standalone ActionScript 3.0 compiler. Mostly compatible + with Flex. +@end itemize") + (license license:gpl2)))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 15:00:57 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:00:57 +0000 Received: from localhost ([127.0.0.1]:57009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHB-0005m2-HV for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:00:57 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmH9-0005lu-Rz for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:00:56 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 9D69F4005C for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:00:55 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH 2/6] gnu: Add python-xvfbwrapper. Date: Wed, 27 Jul 2022 21:00:24 +0200 Message-Id: <0c2730a83a8e03fdc14b6f15cb86428bbca77308.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Also updates copyright. * gnu/packages/python-check.scm (python-xvfbwrapper): New variable. --- gnu/packages/python-check.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index af0e5be28b..e5d9600490 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Felix Gruber +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -2373,3 +2374,24 @@ (define-public python-pycotap attachments). @end itemize") (license license:expat))) + +(define-public python-xvfbwrapper + (package + (name "python-xvfbwrapper") + (version "0.2.9") + (source (origin + (method url-fetch) + (uri (pypi-uri "xvfbwrapper" version)) + (sha256 + (base32 + "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w")))) + (build-system python-build-system) + (propagated-inputs (list xorg-server-for-tests)) + (home-page "https://github.com/cgoldberg/xvfbwrapper") + (synopsis "Python module for controlling virtual displays with Xvfb") + (description + "Xvfb (X virtual framebuffer) is a display server implementing +the X11 display server protocol. It runs in memory and does not require a +physical display. Only a network layer is necessary. Xvfb is useful for +running acceptance tests on headless servers.") + (license license:expat))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 15:01:04 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:01:04 +0000 Received: from localhost ([127.0.0.1]:57014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHH-0005mz-SE for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:04 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHG-0005mR-36 for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:02 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id C5D314005F for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:01:01 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH 3/6] gnu: Add python-mpv. Date: Wed, 27 Jul 2022 21:00:25 +0200 Message-Id: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Author states that the license of the library is inherited from libmpv, which can be either GPLv2 or LPGLv2.1. That's why the package's license is set to be the same as mpv's. One of the tests had to be disabled because it would neither fail or pass, blocking all other tests from running and the package from finishing its build process. I have no clue on why it happens. Rarely some tests fail without any apparent reason. This is possibly related to: https://github.com/jaseg/python-mpv/issues/209 Also add copyright. * gnu/packages/python-xyz.scm (python-mpv): Add variable. --- gnu/packages/python-xyz.scm | 62 +++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac7c0d6066..5bc40ecaea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -124,6 +124,7 @@ ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -30203,3 +30204,64 @@ (define-public python-bsdiff4 binary diff utility. It also provides two command-line tools, @code{bsdiff4} and @code{bspatch4}.") (license license:bsd-2))) + +(define-public python-mpv + (package + (name "python-mpv") + (version "v1.0.1") + (source + (origin + ;; python-mpv from pypi does not include the tests directory. + (method git-fetch) + (uri (git-reference + (url "https://github.com/jaseg/python-mpv") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10w6j3n62ap45sf6q487kz8z6g58sha37i14fa2hhng794z7a8jh")) + (modules '((guix build utils))) + (snippet + (with-extensions (list mpv) + #~(begin + ;; Without an absolute path it is not able find and + ;; load the libmpv library. + (substitute* "mpv.py" + (("(sofile = )(.*)" _ pre post) + (string-append pre "\"" #$mpv "/lib/\" + " post))) + ;; One of the tests never completes, so neutering it using + ;; early return allows other test to run without issue. + (substitute* "tests/test_mpv.py" + ;; Note the typo in "prooperty" - this was fixed later in + ;; upstream but has no effect on whether the tests hangs or not. + (("test_wait_for_prooperty_event_overflow.*" line) + ;; The long whitespace between \n and return is to match the + ;; identation level, which is significant in python. + (string-append line "\n return\n")))))))) + (build-system python-build-system) + (arguments + (list #:phases + (with-imported-modules '((guix build utils)) + #~(modify-phases %standard-phases + (add-before 'check 'prepare-for-tests + (lambda _ + ;; Fontconfig throws errors when it has no cache dir to use. + (setenv "XDG_CACHE_HOME" (getcwd)) + ;; Some tests fail without a writable and readable HOME. + (setenv "HOME" (getcwd)))))))) + (native-inputs + (list python-xvfbwrapper)) ; needed for tests only + (inputs (list mpv)) + (propagated-inputs (list python-pillow)) ; for raw screenshots + (home-page "https://github.com/jaseg/python-mpv") + (synopsis "Python interface to the mpv media player") + (description + "python-mpv is a ctypes-based python interface to the mpv media player. +It gives you more or less full control of all features of the player, just +as the lua interface does.") + ;; From the project's README: + ;; python-mpv inherits the underlying libmpv's license, which can be either + ;; GPLv2 or later (default) or LGPLv2.1 or later. For details, see the mpv + ;; copyright page. + (license (package-license mpv)))) + -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 15:01:07 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:01:07 +0000 Received: from localhost ([127.0.0.1]:57017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHL-0005nF-BR for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:07 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHK-0005n8-Gs for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:06 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 483A54005F for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:01:06 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH 4/6] gnu: Add opencv-with-python. Date: Wed, 27 Jul 2022 21:00:26 +0200 Message-Id: <6aa37f20d813d0849a7de27ca5fc674c73e298e9.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Also add copyright. * gnu/packages/image-processing.scm (opencv-with-python): Add variable. --- gnu/packages/image-processing.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index bcb1d7a2f6..9496155ec7 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -657,6 +658,17 @@ (define-public opencv (home-page "https://opencv.org/") (license license:bsd-3))) +(define-public opencv-with-python + (package + (inherit opencv) + (name "opencv-with-python") + (arguments + (let* ((args (package-arguments opencv))) + (assoc-set! args #:configure-flags + (append (list "-DBUILD_opencv_python3=ON") + (assoc-ref args #:configure-flags))) + args)))) + (define-public vips (package (name "vips") -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 15:01:13 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:01:13 +0000 Received: from localhost ([127.0.0.1]:57020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHQ-0005nd-NQ for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:13 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHO-0005nP-Hx for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:11 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 5CACB4005F for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:01:10 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH 5/6] gnu: Update python-cloudscraper. Date: Wed, 27 Jul 2022 21:00:27 +0200 Message-Id: <696590f60e67256e9fd6a641b3ab6f83816be9ac.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Neither 1.2.58 nor 1.2.60 version of python-cloudscraper requires compatibility with python2 afaik. This removes possible collisions with packages that depend on the mainstream version of python-pyparsing. * gnu/packages/python-web.scm (python-cloudscraper): Update to 1.2.60 * gnu/packages/python-web.scm (python-cloudscraper)[propagated-inputs]: Change python-pyparsing to its mainstream version --- gnu/packages/python-web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7c5e5651c8..42e501d3dd 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -6243,17 +6244,16 @@ (define-public python-http-ece (define-public python-cloudscraper (package (name "python-cloudscraper") - (version "1.2.58") + (version "1.2.60") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/VeNoMouS/cloudscraper") - ;; Corresponds to 1.2.58 - (commit "f3a3d067ea8b5238e9a0948aed0c3fa0d9c29b96"))) + (commit "1.2.60"))) (file-name (git-file-name name version)) (sha256 - (base32 "18fbp086imabjxly04rrchbf6n6m05bpd150zxbw7z2w3mjnpsqd")) + (base32 "00cmxgwdm0x1j4a4ipwvpzih735hdzidljbijk1b3laj3dgvnvsm")) (modules '((guix build utils))) (snippet '(with-directory-excursion "cloudscraper" @@ -6293,7 +6293,7 @@ (define-public python-cloudscraper python-requests python-requests-toolbelt python-responses - python-pyparsing-2.4.7)) + python-pyparsing)) (native-inputs (list python-pytest)) (home-page "https://github.com/venomous/cloudscraper") -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 15:01:17 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 19:01:18 +0000 Received: from localhost ([127.0.0.1]:57023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHV-0005o0-89 for submit@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:17 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:42910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGmHS-0005nq-PC for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 15:01:15 -0400 Received: from mail2.lunanode.net (mail2.lunanode.net [158.69.21.179]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 91A1B4005F for <56803@debbugs.gnu.org>; Wed, 27 Jul 2022 19:01:14 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH 6/6] gnu: Add hydrus-network. Date: Wed, 27 Jul 2022 21:00:28 +0200 Message-Id: <9622a5d87b172e7f9ae838da45f15eb0ba95e374.1658946720.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Hydrus-network has a weekly release cycle and is meant to be used from its own directory so I artificially spread it out to comply with guix's expectations. Three binaries from inputs are copied into a directory hydrus knows about: * ffmpeg - works as expected * swftools - does not do anything neither on guix or Arch linux - possibly an unfinished feature, but I left it in, in case it gets fixed in a future version. * miniupnpc - times out on my system, but it should work otherwise. I was not able to build the program's help files. Updating python-pymdown-extensions to its latest version might be the solution, but this would require also packaging its new build system that is not present in guix yet. I decided to cut short there. Also adds copyright and new used modules. * gnu/packages/image-viewers.scm (hydrus-network): Add variable. --- gnu/packages/image-viewers.scm | 127 +++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8d4d2351c3..9574384761 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 dissent ;;; Copyright © 2022 Michael Rohleder +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages image-viewers) #:use-module (guix build-system qt) #:use-module (gnu packages autotools) #:use-module (gnu packages algebra) + #:use-module (gnu packages animation) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -84,14 +86,20 @@ (define-module (gnu packages image-viewers) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages suckless) #:use-module (gnu packages terminals) + #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages)) @@ -973,3 +981,122 @@ (define-public xzgv (description "xzgv is a fast image viewer that provides extensive keyboard support.") (license license:gpl2+))) + +(define-public hydrus-network + (package + (name "hydrus-network") + (version "492") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hydrusnetwork/hydrus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cyc499is97r8wri0y86yw6kpfcvc0a1yslr8g8sk4vhlly8gnra")))) + (build-system python-build-system) + (arguments + (list + #:phases + (with-imported-modules '((guix build utils)) + #~(let ((bin-dir "/libexec/hydrus") + (static-dir "/share/hydrus/static")) + (modify-phases %standard-phases + ;; Hydrus is a python program but does not uses setup.py or any + ;; other build system to build itself - it's delivered ready to + ;; run from the source. + (replace 'check + (lambda _ + (setenv "DISPLAY" ":0") + (setenv "XDG_CACHE_HOME" (getcwd)) + (setenv "HOME" (getcwd)) + (system "Xvfb &") + (invoke "python" "test.py"))) + (delete 'build) + (add-before 'install 'patch-variables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "hydrus/core/HydrusConstants.py" + (("STATIC_DIR = (.*)\n") + (string-append "STATIC_DIR = \"" out static-dir "\"")) + (("BIN_DIR = (.*)\n") + (string-append "BIN_DIR = \"" out bin-dir "\"\n")))))) + (replace 'install + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (client-path (string-append out "/bin/hydrus")) + (server-path (string-append out "/bin/hydrus-server"))) + (copy-recursively "static" + (string-append out static-dir)) + (copy-recursively "hydrus" + (string-append out + "/lib/python" + (python-version python) + "/site-packages/hydrus")) + (mkdir (string-append out "/bin")) + (copy-file "client.py" client-path) + (chmod client-path #o0555) + (copy-file "server.py" server-path) + (chmod server-path #o0555)))) + ;; Hydrus searches for some binaries at bin-dir so it's important + ;; to put them there so it can find and use them. + (add-after 'install 'pupulate-libexec + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out/bin-dir (string-append out bin-dir))) + (mkdir-p out/bin-dir) + (copy-file + (string-append (assoc-ref inputs "swftools") "/bin/swfrender") + (string-append out/bin-dir "/swfrender_linux")) + (copy-file + (string-append (assoc-ref inputs "ffmpeg") "/bin/ffmpeg") + (string-append out/bin-dir "/ffmpeg")) + (copy-file + (string-append (assoc-ref inputs "miniupnpc") "/bin/upnpc") + (string-append out/bin-dir "/miniupnpc")))))))))) + ;; All native-inputs are only needed for the the check phase + (native-inputs + (list + python-nose + python-mock + python-httmock + xorg-server-for-tests)) + ;; All python packages were taken from static/build_files/linux/requirements.txt + (propagated-inputs + (list + python-beautifulsoup4 + python-cbor2 + python-chardet + python-cloudscraper + python-html5lib + python-lxml + python-lz4 + python-numpy + opencv-with-python ; drop-in replacement for opencv-python-headless + python-pillow + python-psutil + python-pylzma + python-pyopenssl + python-pyside-2 + python-pysocks + python-mpv + python-pyyaml + python-qtpy + python-requests + python-send2trash + python-service-identity + python-six + python-twisted)) + (inputs (list swftools ffmpeg miniupnpc)) + (synopsis "Organize your media with tags like a dektop booru") + (description + "The hydrus network client is an application written for +internet-fluent media nerds who have large image/swf/webm collections. +It browses with tags instead of folders, a little like a booru on your desktop. +Advanced users can share tags and files anonymously through custom servers that +any user may run. Everything is free and privacy is the first concern.") + (home-page "https://hydrusnetwork.github.io/hydrus/") + (license license:wtfpl2))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 18:05:36 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 22:05:36 +0000 Received: from localhost ([127.0.0.1]:57175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGp9r-0002yg-WA for submit@debbugs.gnu.org; Wed, 27 Jul 2022 18:05:36 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:47064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGp9p-0002yT-KW for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 18:05:34 -0400 Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16] ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by michel.telenet-ops.be with bizsmtp id 0N5X2800E20ykKC06N5XnE; Thu, 28 Jul 2022 00:05:32 +0200 Message-ID: <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> Date: Thu, 28 Jul 2022 00:05:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Tomasz Jeneralczyk , 56803@debbugs.gnu.org References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> From: Maxime Devos Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. In-Reply-To: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------P5Y0nnsU5om0xyok5Ahq0NEF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1658959532; bh=L1d6FbRGxN82n0raXHEOf1azd4k+YSzmGYEHBf4NkyA=; h=Date:To:References:From:Subject:In-Reply-To; b=c0BESsq7VOcqLwFejZWofM1yHXzg468VjhNtqpo4QGOLaGm1+kr5zr7+MTHJ0wO1m +pfK5dTdgHX3Kp/0Cd1Mlge/NlTELY5lCggznwQIYBo2eC/h4e51q8urdonYJw5adA I1Bu5Co8vmTbPC9zO+a4DU9aIjKXKuHL/VoCQ70sYgastfcnY2vMEQGX+JQQeDI4pq id0Q68ZvvE4l6qTimLGrG0HSvWAA1Z8czyimnBrHZYLLl5KPYYDH2Wzw8cCJXRc7YZ DjnTqX5R9KD0G8G0OyJNNrODWJHH5PnX+r5+A3MjhHNJjC+fkKA4lb5N9Ub07MJLqT mRBkbGFoIosHg== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56803 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 is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------P5Y0nnsU5om0xyok5Ahq0NEF Content-Type: multipart/mixed; boundary="------------3Yzf8YJAiCcPfX6C2pICQg2w"; protected-headers="v1" From: Maxime Devos To: Tomasz Jeneralczyk , 56803@debbugs.gnu.org Message-ID: <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> In-Reply-To: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> --------------3Yzf8YJAiCcPfX6C2pICQg2w Content-Type: multipart/mixed; boundary="------------kPZ0atLlY56JiAjyiLSsuHC4" --------------kPZ0atLlY56JiAjyiLSsuHC4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 DQpPbiAyNy0wNy0yMDIyIDIxOjAwLCBUb21hc3ogSmVuZXJhbGN6eWsgd3JvdGU6DQo+ICsg ICAgICAgICh3aXRoLWV4dGVuc2lvbnMgKGxpc3QgbXB2KQ0KDQpJSVVDLCB0aGF0J3MgZm9y IHVzaW5nIEd1aWxlIG1vZHVsZXMgZGVmaW5lZCBpbiBwYWNrYWdlcyAtLSBidXQgbXB2IGlz IA0Kbm90IGEgR3VpbGUgcGFja2FnZSwgc28gSSBleHBlY3QgdGhhdCB0aGUgc3Vycm91bmRp bmcgd2l0aC1leHRlbnNpb25zIA0KY2FuIGJlIGRyb3BwZWQuDQoNCj4gKyAgICAgKGxldCog KChhcmdzIChwYWNrYWdlLWFyZ3VtZW50cyBvcGVuY3YpKSkNCj4gKyAgICAgICAoYXNzb2Mt c2V0ISBhcmdzICM6Y29uZmlndXJlLWZsYWdzDQo+ICsgICAgICAgICAgICAgICAgICAgKGFw cGVuZCAobGlzdCAiLURCVUlMRF9vcGVuY3ZfcHl0aG9uMz1PTiIpDQo+ICsgICAgICAgICAg ICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmIGFyZ3MgIzpjb25maWd1cmUtZmxhZ3MpKSkN Ckxvb2sgZm9yIHN1YnN0aXR1dGUta2V5d29yZC1hcmd1bWVudHMsIHdoaWNoIGlzbid0IHN0 YXRlZnVsIGFuZCBoZW5jZSANCnRoZXJlIGlzIGxlc3MgcmlzayBvZiBhY2NpZGVudGFsbHkg bW9kaWZ5aW5nIHRoZSBhcmd1bWVudHMgb2YgdGhlIHBhcmVudCANCnBhY2thZ2UuwqAgQWxz bywgYW55IHJlYXNvbiBmb3Igbm90IGFkZGluZyB0aGlzIHRvIHRoZSBvcmlnaW5hbCBwYWNr YWdlPyANCihQb3NzaWJseSB0aGVyZSBpcyBvbmUpLg0KDQo+ICsgICAgICAgICAgICAgIChy ZXBsYWNlICdjaGVjaw0KPiArICAgICAgICAgICAgICAgIChsYW1iZGEgXw0KPiArICAgICAg ICAgICAgICAgICAgKHNldGVudiAiRElTUExBWSIgIjowIikNCj4gKyAgICAgICAgICAgICAg ICAgIChzZXRlbnYgIlhER19DQUNIRV9IT01FIiAoZ2V0Y3dkKSkNCj4gKyAgICAgICAgICAg ICAgICAgIChzZXRlbnYgIkhPTUUiIChnZXRjd2QpKQ0KPiArICAgICAgICAgICAgICAgICAg KHN5c3RlbSAiWHZmYiAmIikNCj4gKyAgICAgICAgICAgICAgICAgIChpbnZva2UgInB5dGhv biIgInRlc3QucHkiKSkpDQpSdW4gIi4vcHJlLWluc3QtZW52IGd1aXggbGludCBoeWRydXMt bmV0d29yayIsIGl0IHdpbGwgaGF2ZSBhIHJlbWFyayANCmFib3V0IHRoaXMuwqAgQWxzbywg dGVjaG5pY2FsbHkgdGhpcyBpcyByYWN5IC0tIGl0J3MgcG9zc2libGUgZm9yIHB5dGhvbiAN CnRvIHN0YXJ0IGJlZm9yZSBYdmZiIGlzIHJlYWR5IHRob3VnaCBzbyBmYXIgdGhpcyBkb2Vz bid0IHNlZW0gdG8gaGF2ZSANCmNhdXNlZCB0cm91YmxlIGZvciBvdGhlciBwYWNrYWdlcyB5 ZXQgQUZBSUsgLS0gSSByZWNvbW1lbmQgInh2ZmItcnVuIiANCiItLSIgInB5dGhvbiIgInRl c3QucHkiIGluc3RlYWQuDQoNCihJIGp1c3Qgc2Nyb2xsZWQgcXVpY2tseSB0aHJvdWdoIHRo ZSBwYXRjaGVzLCBhIG1vcmUgZnVsbCByZXZpZXcgd2lsbCANCmhhdmUgdG8gY29tZSBsYXRl ci4pDQoNCkdyZWV0aW5ncywNCk1heGltZS4NCg0K --------------kPZ0atLlY56JiAjyiLSsuHC4 Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc" Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2 ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc /gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4 LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0 k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D =3DOVqp -----END PGP PUBLIC KEY BLOCK----- --------------kPZ0atLlY56JiAjyiLSsuHC4-- --------------3Yzf8YJAiCcPfX6C2pICQg2w-- --------------P5Y0nnsU5om0xyok5Ahq0NEF Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYuG2qwUDAAAAAAAKCRBJ4+4iGRcl7kdE AP9geAYCbxqg0gQUDeYL29po0HUgdm0mWB+8usKkGXoWlgEA/35MAM+ePgpTXh6FnlG+r66NHhxR ELobaOs565hEHQg= =puLI -----END PGP SIGNATURE----- --------------P5Y0nnsU5om0xyok5Ahq0NEF-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 27 18:09:51 2022 Received: (at 56803) by debbugs.gnu.org; 27 Jul 2022 22:09:52 +0000 Received: from localhost ([127.0.0.1]:57188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGpDz-00035j-NF for submit@debbugs.gnu.org; Wed, 27 Jul 2022 18:09:51 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:35232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGpDx-00035b-Qe for 56803@debbugs.gnu.org; Wed, 27 Jul 2022 18:09:50 -0400 Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16] ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by albert.telenet-ops.be with bizsmtp id 0N9o2800A20ykKC06N9oQU; Thu, 28 Jul 2022 00:09:48 +0200 Message-ID: <7574bd1e-eea6-dda6-6239-74da1fc367ff@telenet.be> Date: Thu, 28 Jul 2022 00:09:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. Content-Language: en-US To: Tomasz Jeneralczyk , 56803@debbugs.gnu.org References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> From: Maxime Devos In-Reply-To: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------of4i7abVPm1Rxxouc8KwKmJi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1658959788; bh=QUbPEu1IJUx3hTE47Lq7Zg/uGA3luSPfceYAHRgLyl8=; h=Date:Subject:To:References:From:In-Reply-To; b=L+GFd00EfM6Uhs1hmqJmY2rZiiLY3TBvVJKQIi5I6yjVVjZD2oxi95AX1WMsvTvSe AosZEHVN2bINI5V7SSbKveGqkC61UyNwtA5CpEOCPuZmJQM54/l5rWgdZclRVPcOIe ABWvJXHhWbqTS7t5pYP9o4A7O53NI0x51wr1K8SA3+WOW4FXYYjflVClfg5NZKRM4H TIKPuGe8XsVoW3XN2PgTOKdMf27rbHVXb62G0NL/GuKNeF6oKc4W3YXLna2mK53peD GDI7yWv/friYb77z4bRWnvQKUEqRDX4tCZt98w6IS789Ja6PSmts0j8ZZY+pnZAY2a ETGu1EkmZZbgg== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56803 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 is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------of4i7abVPm1Rxxouc8KwKmJi Content-Type: multipart/mixed; boundary="------------aRny6AOZkvqjbHqk7bZJ4yVV"; protected-headers="v1" From: Maxime Devos To: Tomasz Jeneralczyk , 56803@debbugs.gnu.org Message-ID: <7574bd1e-eea6-dda6-6239-74da1fc367ff@telenet.be> Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> In-Reply-To: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> --------------aRny6AOZkvqjbHqk7bZJ4yVV Content-Type: multipart/mixed; boundary="------------ge5UFcXe1GxOulkOQxla0rrq" --------------ge5UFcXe1GxOulkOQxla0rrq Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 DQpPbiAyNy0wNy0yMDIyIDIxOjAwLCBUb21hc3ogSmVuZXJhbGN6eWsgd3JvdGU6DQo+IE9u ZSBvZiB0aGUgdGVzdHMgaGFkIHRvIGJlIGRpc2FibGVkIGJlY2F1c2UgaXQgd291bGQgbmVp dGhlciBmYWlsIG9yIHBhc3MsDQo+IGJsb2NraW5nIGFsbCBvdGhlciB0ZXN0cyBmcm9tIHJ1 bm5pbmcgYW5kIHRoZSBwYWNrYWdlIGZyb20gZmluaXNoaW5nIGl0cyBidWlsZA0KPiBwcm9j ZXNzLiBJIGhhdmUgbm8gY2x1ZSBvbiB3aHkgaXQgaGFwcGVucy4NCg0KVGhpcyBzb3VuZHMg bGlrZSBzb21ldGhpbmcgdXBzdHJlYW0gc2hvdWxkIGJlIGluZm9ybWVkIGFib3V0LCBvdGhl cndpc2UgDQp0aGV5IHdvdWxkbid0IGtub3cgdGhlcmUgaXMgc29tZXRoaW5nIHRvIGZpeC4N Cg0KR3JlZXRpbmdzLA0KTWF4aW1lDQoNCg== --------------ge5UFcXe1GxOulkOQxla0rrq Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc" Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2 ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc /gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4 LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0 k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D =3DOVqp -----END PGP PUBLIC KEY BLOCK----- --------------ge5UFcXe1GxOulkOQxla0rrq-- --------------aRny6AOZkvqjbHqk7bZJ4yVV-- --------------of4i7abVPm1Rxxouc8KwKmJi Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYuG3qwUDAAAAAAAKCRBJ4+4iGRcl7mOl AP4t02bnsTN7+VKU0+cwYlRZdLsiPin+blN7gubcsW5D1QEAwIN4yp44rjhqTPS6HZUfFasYujIf Nq47rVsXKBSZpgQ= =w7IB -----END PGP SIGNATURE----- --------------of4i7abVPm1Rxxouc8KwKmJi-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 10:58:32 2022 Received: (at 56803) by debbugs.gnu.org; 28 Jul 2022 14:58:32 +0000 Received: from localhost ([127.0.0.1]:59247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oH4y7-0000Le-Hz for submit@debbugs.gnu.org; Thu, 28 Jul 2022 10:58:32 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:45255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oH4y4-0000LV-NC for 56803@debbugs.gnu.org; Thu, 28 Jul 2022 10:58:30 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 9A7704007A; Thu, 28 Jul 2022 14:58:27 +0000 (UTC) MIME-Version: 1.0 Date: Thu, 28 Jul 2022 14:58:19 +0000 From: Tomasz Jeneralczyk To: Maxime Devos Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. In-Reply-To: <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <3bdaf7497d56169b334ef85b65694fea@schwi.pl> X-Sender: tj@schwi.pl Content-Type: multipart/mixed; boundary="=_089606f5ec9c38546543cf0d5185d072" X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: 56803@debbugs.gnu.org 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: -0.6 (/) --=_089606f5ec9c38546543cf0d5185d072 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8; format=flowed On 2022-07-27 22:05, Maxime Devos wrote: > On 27-07-2022 21:00, Tomasz Jeneralczyk wrote: > IIUC, that's for using Guile modules defined in packages -- but mpv is > not a Guile package, so I expect that the surrounding with-extensions > can be dropped. You're right. I dropped it with no negative consequences. > This sounds like something upstream should be informed about, otherwise > they wouldn't know there is something to fix. I had a friend on arch linux run those tests and everything worked just fine, so it might have something to do with guix itself or an incomplete package definition. In any case, I'll make sure to write a proper bug report in the upstream repo later. > Look for substitute-keyword-arguments, which isn't stateful and hence > there is less risk of accidentally modifying the arguments of the > parent package.  Also, any reason for not adding this to the original > package? (Possibly there is one). Thanks, this macro is not documented in manual, but it looks much nicer now. The reason I made a new package is simply because someone on irc recommended me to do as such. Though your question made me realize that just adding one flag worked because all the necessary packages to build python buildings were in opencv package already... maybe originally it was intended for the python bindings to be included in opencv? And so I added the flag to opencv and removed my original package - it works all the same. > Run "./pre-inst-env guix lint hydrus-network", it will have a remark > about this.  Also, technically this is racy -- it's possible for > python to start before Xvfb is ready though so far this doesn't seem > to have caused trouble for other packages yet AFAIK -- I recommend > "xvfb-run" "--" "python" "test.py" instead. I though I missed something so I ran lint again, but it only said there's a new version of hydrus available. Nevertheless I changed the invocation to what you recommended. I also updated hydrus to version 493. > (I just scrolled quickly through the patches, a more full review will > have to come later.) Thank you for all your comments so far. I made changes but I wont send them as patches until I fix all the problems or get a confirmation that there's nothing more to do. However I'm attaching a "preview" diff of the changes I'll want to iclude in v2 of my patches. I suppose I should only send v2 of the ones I changed, right?. --=_089606f5ec9c38546543cf0d5185d072 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=wip-changes-0.diff Content-Disposition: attachment; filename=wip-changes-0.diff; size=5343 ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9pbWFnZS1wcm9jZXNzaW5nLnNjbSBiL2dudS9wYWNr YWdlcy9pbWFnZS1wcm9jZXNzaW5nLnNjbQppbmRleCA5NDk2MTU1ZWM3Li42NDE3MjMzMjQ1IDEw MDY0NAotLS0gYS9nbnUvcGFja2FnZXMvaW1hZ2UtcHJvY2Vzc2luZy5zY20KKysrIGIvZ251L3Bh Y2thZ2VzL2ltYWdlLXByb2Nlc3Npbmcuc2NtCkBAIC01MTEsNiArNTExLDggQEAgKGRlZmluZS1w dWJsaWMgb3BlbmN2CiAgICAgICAgICAgICAgOzsgRElTUEFUQ0ggaXMgdGhlIGxpc3Qgb2Ygb3B0 aW9uYWwgZGlzcGF0Y2hlcy4KICAgICAgICAgICAgICAiLURDUFVfQkFTRUxJTkU9U1NFMiIKIAor ICAgICAgICAgICAgICItREJVSUxEX29wZW5jdl9weXRob24zPU9OIgorCiAgICAgICAgICAgICAg LEAobWF0Y2ggKCVjdXJyZW50LXN5c3RlbSkKICAgICAgICAgICAgICAgICAgKCJ4ODZfNjQtbGlu dXgiCiAgICAgICAgICAgICAgICAgICAnKCItRENQVV9ESVNQQVRDSD1ORU9OO1ZGUFYzO0ZQMTY7 U1NFO1NTRTI7U1NFMztTU1NFMztTU0U0XzE7U1NFNF8yO1BPUENOVDtBVlg7RlAxNjtBVlgyO0ZN QTM7QVZYXzUxMkY7QVZYNTEyX1NLWCIKQEAgLTY1OCwxNyArNjYwLDYgQEAgKGRlZmluZS1wdWJs aWMgb3BlbmN2CiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9vcGVuY3Yub3JnLyIpCiAgICAgKGxp Y2Vuc2UgbGljZW5zZTpic2QtMykpKQogCi0oZGVmaW5lLXB1YmxpYyBvcGVuY3Ytd2l0aC1weXRo b24KLSAgKHBhY2thZ2UKLSAgICAoaW5oZXJpdCBvcGVuY3YpCi0gICAgKG5hbWUgIm9wZW5jdi13 aXRoLXB5dGhvbiIpCi0gICAgKGFyZ3VtZW50cwotICAgICAobGV0KiAoKGFyZ3MgKHBhY2thZ2Ut YXJndW1lbnRzIG9wZW5jdikpKQotICAgICAgIChhc3NvYy1zZXQhIGFyZ3MgIzpjb25maWd1cmUt ZmxhZ3MKLSAgICAgICAgICAgICAgICAgICAoYXBwZW5kIChsaXN0ICItREJVSUxEX29wZW5jdl9w eXRob24zPU9OIikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgYXJncyAj OmNvbmZpZ3VyZS1mbGFncykpKQotICAgICAgIGFyZ3MpKSkpCi0KIChkZWZpbmUtcHVibGljIHZp cHMKICAgKHBhY2thZ2UKICAgICAobmFtZSAidmlwcyIpCmRpZmYgLS1naXQgYS9nbnUvcGFja2Fn ZXMvaW1hZ2Utdmlld2Vycy5zY20gYi9nbnUvcGFja2FnZXMvaW1hZ2Utdmlld2Vycy5zY20KaW5k ZXggOTU3NDM4NDc2MS4uNGViYzg5MTQyNyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2ltYWdl LXZpZXdlcnMuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9pbWFnZS12aWV3ZXJzLnNjbQpAQCAtOTg1 LDcgKzk4NSw3IEBAIChkZWZpbmUtcHVibGljIHh6Z3YKIChkZWZpbmUtcHVibGljIGh5ZHJ1cy1u ZXR3b3JrCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImh5ZHJ1cy1uZXR3b3JrIikKLSAgICAodmVy c2lvbiAiNDkyIikKKyAgICAodmVyc2lvbiAiNDkzIikKICAgICAoc291cmNlCiAgICAgIChvcmln aW4KICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKQEAgLTk5NSw3ICs5OTUsNyBAQCAoZGVmaW5l LXB1YmxpYyBoeWRydXMtbmV0d29yawogICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUg bmFtZSB2ZXJzaW9uKSkKICAgICAgICAoc2hhMjU2CiAgICAgICAgIChiYXNlMzIKLSAgICAgICAg ICIwY3ljNDk5aXM5N3I4d3JpMHk4Nnl3NmtwZmN2YzBhMXlzbHI4ZzhzazR2aGxseThnbnJhIikp KSkKKyAgICAgICAgICIxcnIybXgzY3hqbWtiZ3FkcDc4Mjd5bDNzbXBncmpzNThsam1oeDFrMWM3 cGE1Y2FjNHhpIikpKSkKICAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0pCiAg ICAgKGFyZ3VtZW50cwogICAgICAobGlzdApAQCAtMTAxMiw4ICsxMDEyLDcgQEAgKGRlZmluZS1w dWJsaWMgaHlkcnVzLW5ldHdvcmsKICAgICAgICAgICAgICAgICAgIChzZXRlbnYgIkRJU1BMQVki ICI6MCIpCiAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJYREdfQ0FDSEVfSE9NRSIgKGdldGN3 ZCkpCiAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJIT01FIiAoZ2V0Y3dkKSkKLSAgICAgICAg ICAgICAgICAgIChzeXN0ZW0gIlh2ZmIgJiIpCi0gICAgICAgICAgICAgICAgICAoaW52b2tlICJw eXRob24iICJ0ZXN0LnB5IikpKQorICAgICAgICAgICAgICAgICAgKGludm9rZSAieHZmYi1ydW4i ICJweXRob24iICJ0ZXN0LnB5IikpKQogICAgICAgICAgICAgICAoZGVsZXRlICdidWlsZCkKICAg ICAgICAgICAgICAgKGFkZC1iZWZvcmUgJ2luc3RhbGwgJ3BhdGNoLXZhcmlhYmxlcwogICAgICAg ICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKQEAg LTEwNjAsMTAgKzEwNTksMTAgQEAgKGRlZmluZS1wdWJsaWMgaHlkcnVzLW5ldHdvcmsKICAgICA7 OyBBbGwgbmF0aXZlLWlucHV0cyBhcmUgb25seSBuZWVkZWQgZm9yIHRoZSB0aGUgY2hlY2sgcGhh c2UKICAgICAobmF0aXZlLWlucHV0cwogICAgICAobGlzdAorICAgICAgeHZmYi1ydW4KICAgICAg IHB5dGhvbi1ub3NlCiAgICAgICBweXRob24tbW9jawotICAgICAgcHl0aG9uLWh0dG1vY2sKLSAg ICAgIHhvcmctc2VydmVyLWZvci10ZXN0cykpCisgICAgICBweXRob24taHR0bW9jaykpCiAgICAg OzsgQWxsIHB5dGhvbiBwYWNrYWdlcyB3ZXJlIHRha2VuIGZyb20gc3RhdGljL2J1aWxkX2ZpbGVz L2xpbnV4L3JlcXVpcmVtZW50cy50eHQKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKICAgICAgKGxp c3QKQEAgLTEwNzUsNyArMTA3NCw3IEBAIChkZWZpbmUtcHVibGljIGh5ZHJ1cy1uZXR3b3JrCiAg ICAgICBweXRob24tbHhtbAogICAgICAgcHl0aG9uLWx6NAogICAgICAgcHl0aG9uLW51bXB5Ci0g ICAgICBvcGVuY3Ytd2l0aC1weXRob24gOyBkcm9wLWluIHJlcGxhY2VtZW50IGZvciBvcGVuY3Yt cHl0aG9uLWhlYWRsZXNzCisgICAgICBvcGVuY3YgICAgICAgICAgICAgICAgICAgICA7IGRyb3At aW4gcmVwbGFjZW1lbnQgZm9yIG9wZW5jdi1weXRob24taGVhZGxlc3MKICAgICAgIHB5dGhvbi1w aWxsb3cKICAgICAgIHB5dGhvbi1wc3V0aWwKICAgICAgIHB5dGhvbi1weWx6bWEKZGlmZiAtLWdp dCBhL2dudS9wYWNrYWdlcy9weXRob24teHl6LnNjbSBiL2dudS9wYWNrYWdlcy9weXRob24teHl6 LnNjbQppbmRleCA1YmM0MGVjYWVhLi5kZGZiMmIxMmE0IDEwMDY0NAotLS0gYS9nbnUvcGFja2Fn ZXMvcHl0aG9uLXh5ei5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B5dGhvbi14eXouc2NtCkBAIC0z MDIyMiwyMiArMzAyMjIsMjEgQEAgKGRlZmluZS1wdWJsaWMgcHl0aG9uLW1wdgogICAgICAgICAg IjEwdzZqM242MmFwNDVzZjZxNDg3a3o4ejZnNThzaGEzN2kxNGZhMmhobmc3OTR6N2E4amgiKSkK ICAgICAgICAobW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpCiAgICAgICAgKHNuaXBwZXQK LSAgICAgICAgKHdpdGgtZXh0ZW5zaW9ucyAobGlzdCBtcHYpCi0gICAgICAgICAgI34oYmVnaW4K LSAgICAgICAgICAgICAgOzsgV2l0aG91dCBhbiBhYnNvbHV0ZSBwYXRoIGl0IGlzIG5vdCBhYmxl IGZpbmQgYW5kCi0gICAgICAgICAgICAgIDs7IGxvYWQgdGhlIGxpYm1wdiBsaWJyYXJ5LgotICAg ICAgICAgICAgICAoc3Vic3RpdHV0ZSogIm1wdi5weSIKLSAgICAgICAgICAgICAgICAoKCIoc29m aWxlID0gKSguKikiIF8gcHJlIHBvc3QpCi0gICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5k IHByZSAiXCIiICMkbXB2ICIvbGliL1wiICsgIiBwb3N0KSkpCi0gICAgICAgICAgICAgIDs7IE9u ZSBvZiB0aGUgdGVzdHMgbmV2ZXIgY29tcGxldGVzLCBzbyBuZXV0ZXJpbmcgaXQgdXNpbmcKLSAg ICAgICAgICAgICAgOzsgZWFybHkgcmV0dXJuIGFsbG93cyBvdGhlciB0ZXN0IHRvIHJ1biB3aXRo b3V0IGlzc3VlLgotICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogInRlc3RzL3Rlc3RfbXB2LnB5 IgotICAgICAgICAgICAgICAgIDs7IE5vdGUgdGhlIHR5cG8gaW4gInByb29wZXJ0eSIgLSB0aGlz IHdhcyBmaXhlZCBsYXRlciBpbgotICAgICAgICAgICAgICAgIDs7IHVwc3RyZWFtIGJ1dCBoYXMg bm8gZWZmZWN0IG9uIHdoZXRoZXIgdGhlIHRlc3RzIGhhbmdzIG9yIG5vdC4KLSAgICAgICAgICAg ICAgICAoKCJ0ZXN0X3dhaXRfZm9yX3Byb29wZXJ0eV9ldmVudF9vdmVyZmxvdy4qIiBsaW5lKQot ICAgICAgICAgICAgICAgICA7OyBUaGUgbG9uZyB3aGl0ZXNwYWNlIGJldHdlZW4gXG4gYW5kIHJl dHVybiBpcyB0byBtYXRjaCB0aGUKLSAgICAgICAgICAgICAgICAgOzsgaWRlbnRhdGlvbiBsZXZl bCwgd2hpY2ggaXMgc2lnbmlmaWNhbnQgaW4gcHl0aG9uLgotICAgICAgICAgICAgICAgICAoc3Ry aW5nLWFwcGVuZCBsaW5lICJcbiAgICAgICAgcmV0dXJuXG4iKSkpKSkpKSkKKyAgICAgICAgI34o YmVnaW4KKyAgICAgICAgICAgIDs7IFdpdGhvdXQgYW4gYWJzb2x1dGUgcGF0aCBpdCBpcyBub3Qg YWJsZSBmaW5kIGFuZAorICAgICAgICAgICAgOzsgbG9hZCB0aGUgbGlibXB2IGxpYnJhcnkuCisg ICAgICAgICAgICAoc3Vic3RpdHV0ZSogIm1wdi5weSIKKyAgICAgICAgICAgICAgKCgiKHNvZmls ZSA9ICkoLiopIiBfIHByZSBwb3N0KQorICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgcHJl ICJcIiIgIyRtcHYgIi9saWIvXCIgKyAiIHBvc3QpKSkKKyAgICAgICAgICAgIDs7IE9uZSBvZiB0 aGUgdGVzdHMgbmV2ZXIgY29tcGxldGVzLCBzbyBuZXV0ZXJpbmcgaXQgdXNpbmcKKyAgICAgICAg ICAgIDs7IGVhcmx5IHJldHVybiBhbGxvd3Mgb3RoZXIgdGVzdCB0byBydW4gd2l0aG91dCBpc3N1 ZS4KKyAgICAgICAgICAgIChzdWJzdGl0dXRlKiAidGVzdHMvdGVzdF9tcHYucHkiCisgICAgICAg ICAgICAgIDs7IE5vdGUgdGhlIHR5cG8gaW4gInByb29wZXJ0eSIgLSB0aGlzIHdhcyBmaXhlZCBs YXRlciBpbgorICAgICAgICAgICAgICA7OyB1cHN0cmVhbSBidXQgaGFzIG5vIGVmZmVjdCBvbiB3 aGV0aGVyIHRoZSB0ZXN0cyBoYW5ncyBvciBub3QuCisgICAgICAgICAgICAgICgoInRlc3Rfd2Fp dF9mb3JfcHJvb3BlcnR5X2V2ZW50X292ZXJmbG93LioiIGxpbmUpCisgICAgICAgICAgICAgICA7 OyBUaGUgbG9uZyB3aGl0ZXNwYWNlIGJldHdlZW4gXG4gYW5kIHJldHVybiBpcyB0byBtYXRjaCB0 aGUKKyAgICAgICAgICAgICAgIDs7IGlkZW50YXRpb24gbGV2ZWwsIHdoaWNoIGlzIHNpZ25pZmlj YW50IGluIHB5dGhvbi4KKyAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGxpbmUgIlxuICAg ICAgICByZXR1cm5cbiIpKSkpKSkpCiAgICAgKGJ1aWxkLXN5c3RlbSBweXRob24tYnVpbGQtc3lz dGVtKQogICAgIChhcmd1bWVudHMKICAgICAgKGxpc3QgIzpwaGFzZXMK --=_089606f5ec9c38546543cf0d5185d072-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 11:10:10 2022 Received: (at 56803) by debbugs.gnu.org; 9 Aug 2022 15:10:11 +0000 Received: from localhost ([127.0.0.1]:44483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLQry-0003cJ-JK for submit@debbugs.gnu.org; Tue, 09 Aug 2022 11:10:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLQru-0003bm-NQ for 56803@debbugs.gnu.org; Tue, 09 Aug 2022 11:10:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLQro-00088Q-2t; Tue, 09 Aug 2022 11:10:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=56yBVN9TZLsQq3+A2fMAiiXvm+gJv1+2z1rEOFXLLtY=; b=j4Ax0bkzZ3+nqAvTQcR2 uPcAvtPk1B9qIuwAqaPWz0Syx/b69jke16s5XKFkEF+HsWXnjmEqeV8vcuBRYfFK2oKzVCXq8GB5d wAW/k2hnKmO4iXDr3Mh6ZqqqCsUX0TZw5nolV67o6wrLf+nPunpQ8iBOeYO09mNCwOccsz/SuktkT cp3URie5JPlRQPrWNNqSAjD0LA5JG/bp1KSYxQdwATBwSQNMh8LZiuks9nsWJVWUkB2OWiuWeXy1B szITSla1+aoPi1M1cDTwmSTFJ6f9LBmHz6WkYz0KudPZ7EwHXWuK4ET9ccwkdziIMJrutEHfZVISY vAVHwS3G2/hQTQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=52766 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLQrm-0005hK-Qn; Tue, 09 Aug 2022 11:09:59 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomasz Jeneralczyk Subject: Re: bug#56803: [PATCH 0/6] Add hydrus network and its dependencies References: <9622a5d87b172e7f9ae838da45f15eb0ba95e374.1658946720.git.tj@schwi.pl> Date: Tue, 09 Aug 2022 17:09:56 +0200 In-Reply-To: <9622a5d87b172e7f9ae838da45f15eb0ba95e374.1658946720.git.tj@schwi.pl> (Tomasz Jeneralczyk's message of "Wed, 27 Jul 2022 21:00:28 +0200") Message-ID: <87pmh95u7v.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56803 Cc: 56803@debbugs.gnu.org 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: -3.3 (---) Hi Tomasz, Tomasz Jeneralczyk skribis: > Hydrus-network has a weekly release cycle and is meant to be used from it= s own > directory so I artificially spread it out to comply with guix's expectati= ons. > > Three binaries from inputs are copied into a directory hydrus knows about: > * ffmpeg - works as expected > * swftools - does not do anything neither on guix or Arch linux - possi= bly > an unfinished feature, but I left it in, in case it gets fixed in a fut= ure version. > * miniupnpc - times out on my system, but it should work otherwise. > > I was not able to build the program's help files. Updating > python-pymdown-extensions to its latest version might be the solution, but > this would require also packaging its new build system that is not presen= t in > guix yet. I decided to cut short there. Perhaps these comments, or some of them, should go as comments in the source? That will prove helpful next time you or someone else tries to work on the package. > + (with-imported-modules '((guix build utils)) This is unnecessary as (guix build utils) is always present on the build side. > + (replace 'install > + (lambda* (#:key outputs inputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (python (assoc-ref inputs "python")) > + (client-path (string-append out "/bin/hydrus")) > + (server-path (string-append out "/bin/hydrus-se= rver"))) Nitpick: GNU and Guix convention is to use the term =E2=80=9Cpath=E2=80=9D = to denote a search path (like $PATH, etc.) and to use =E2=80=9Cfile name=E2=80=9D (or = =E2=80=9Cfile=E2=80=9D) to denote a file name, as is the case here. In this case it might be enough to write =E2=80=98client=E2=80=99 instead of =E2=80=98client-path=E2=80=99, and similarly for =E2=80=98server-path=E2=80= =99. > + ;; Hydrus searches for some binaries at bin-dir so it's im= portant > + ;; to put them there so it can find and use them. In general, the solution here, rather than copy files like the =E2=80=98ffm= peg=E2=80=99 executable, would be to patch Hydrus so that it contains the absolute file name of =E2=80=98ffmpeg=E2=80=99 as returned by (search-input-file inp= uts "/bin/ffmpeg"). How does that sound? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 11:14:26 2022 Received: (at 56803) by debbugs.gnu.org; 9 Aug 2022 15:14:26 +0000 Received: from localhost ([127.0.0.1]:44489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLQw6-0003iY-9E for submit@debbugs.gnu.org; Tue, 09 Aug 2022 11:14:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLQw4-0003iI-SB for 56803@debbugs.gnu.org; Tue, 09 Aug 2022 11:14:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40378) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLQvv-0000Mk-DZ; Tue, 09 Aug 2022 11:14:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=kVKAOZOm1SB91vXjY4Sv+rtEB9ISu1rLA8AAUqwyIsc=; b=FyWBaDOt0icm0UwZWsW0 BKuw6bHjYDoOYHpL9iN0dyIP4o+YetjtFRzHIC9tnfAmGa6QKVlxF4PxKEe4D9TL+jHqilVBnxiUk 7qWVmJMrM0qN21m0iFtoJuuk9eyo5F9zRXnq3wBMGHEfOu/l/DHqeqhhkj2BuY/XUUA+TMI28DJrf /UfAf5VvQhC+anWJn9rK5HS42w7KcPDuxL9RR4eKS6AX8QMAuKca6R25MtImMpM+yjw2A276QKc1N 9oYiTCP3LBkaC5L4dQU8JSqZPNdTgJte8blInx9ylayASfl8NKiLHt45Eg5LHUxYd+PFUp/wGewCK roVbJGvHMAx1Hw==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=34864 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLQvu-0006Iq-P3; Tue, 09 Aug 2022 11:14:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomasz Jeneralczyk Subject: Re: bug#56803: [PATCH 0/6] Add hydrus network and its dependencies References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> Date: Tue, 09 Aug 2022 17:14:13 +0200 In-Reply-To: <3bdaf7497d56169b334ef85b65694fea@schwi.pl> (Tomasz Jeneralczyk's message of "Thu, 28 Jul 2022 14:58:19 +0000") Message-ID: <87lerx5u0q.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56803 Cc: Maxime Devos , 56803@debbugs.gnu.org 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: -3.3 (---) Hi, Tomasz Jeneralczyk skribis: > + #~(begin > + ;; Without an absolute path it is not able find and > + ;; load the libmpv library. > + (substitute* "mpv.py" > + (("(sofile =3D )(.*)" _ pre post) > + (string-append pre "\"" #$mpv "/lib/\" + " post))) In addition, this substitution should be done in a phase rather than in a snippet, because (1) the result of =E2=80=98guix build -S=E2=80=99 should= be platform-independent and thus not include the file name of =E2=80=98mpv=E2= =80=99 for a particular system, and (2) the reference to variable =E2=80=98mpv=E2=80=99 = at the top level can cause problems due to circular dependencies among modules. For clarity, could you resent the whole series with those changes, squashing the relevant amendments? Thanks in advance, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 12:59:08 2022 Received: (at 56803) by debbugs.gnu.org; 9 Aug 2022 16:59:08 +0000 Received: from localhost ([127.0.0.1]:44668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLSZP-0002MH-Ok for submit@debbugs.gnu.org; Tue, 09 Aug 2022 12:59:08 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:58884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLSZM-0002M7-Sk for 56803@debbugs.gnu.org; Tue, 09 Aug 2022 12:59:05 -0400 Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16] ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by laurent.telenet-ops.be with bizsmtp id 5Uz12800920ykKC01Uz16U; Tue, 09 Aug 2022 18:59:01 +0200 Message-ID: <731ebece-4f1b-2f1a-819e-095068d0791c@telenet.be> Date: Tue, 9 Aug 2022 18:59:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. Content-Language: en-US To: Tomasz Jeneralczyk References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> From: Maxime Devos In-Reply-To: <3bdaf7497d56169b334ef85b65694fea@schwi.pl> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------aN5r4Eak6iQ8XB029sjVymXM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1660064341; bh=cc0UByDXsaAsGwyvh5+yMEHd27mxUNxHSHwSRbGpFfk=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=AESBpgAiyWfgJFbYEJM79DZw9WCLqUeIhlWsWNO/xsN0raiqNUDwLkcjNNiHIOprc ghMtYxeeh/YsyYS+qWJVCmCI4Uo1+OMoYJAOQby05dnHVcNPm18L1ycqc1uChK+Rjz DwU2HpF4ZPVoMow/9vVRbBrILIHYrfOTTdnDYR1/e+c7R8+dSWV3uH2kGRsjZQC0f2 2meQyWLXVR2nWcmvmylOeoj9BvNQxWfQnXdU9UayGH/g0J3aSqrqHTnUfunz1av2Zx k5mCMvL28qN7X4NFN+I++9pEWRepeP9Zr9u6lbDpklXHDencEFTSwPQ2xV0evzVY1A wpuVhqXD1Q4iw== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56803 Cc: 56803@debbugs.gnu.org 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 is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------aN5r4Eak6iQ8XB029sjVymXM Content-Type: multipart/mixed; boundary="------------ka0e3IPgmOOQMNWxOkDcRByw"; protected-headers="v1" From: Maxime Devos To: Tomasz Jeneralczyk Cc: 56803@debbugs.gnu.org Message-ID: <731ebece-4f1b-2f1a-819e-095068d0791c@telenet.be> Subject: Re: [bug#56803] [PATCH 3/6] gnu: Add python-mpv. References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> In-Reply-To: <3bdaf7497d56169b334ef85b65694fea@schwi.pl> --------------ka0e3IPgmOOQMNWxOkDcRByw Content-Type: multipart/mixed; boundary="------------gr5WXmkqkZNBaPxlxQ6x4AXR" --------------gr5WXmkqkZNBaPxlxQ6x4AXR Content-Type: multipart/alternative; boundary="------------o4MjbaOLwgnHXvupsY0Sjaiu" --------------o4MjbaOLwgnHXvupsY0Sjaiu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 DQpPbiAyOC0wNy0yMDIyIDE2OjU4LCBUb21hc3ogSmVuZXJhbGN6eWsgd3JvdGU6DQo+DQo+ PiBSdW4gIi4vcHJlLWluc3QtZW52IGd1aXggbGludCBoeWRydXMtbmV0d29yayIsIGl0IHdp bGwgaGF2ZSBhIHJlbWFyaw0KPj4gYWJvdXQgdGhpcy7CoCBBbHNvLCB0ZWNobmljYWxseSB0 aGlzIGlzIHJhY3kgLS0gaXQncyBwb3NzaWJsZSBmb3INCj4+IHB5dGhvbiB0byBzdGFydCBi ZWZvcmUgWHZmYiBpcyByZWFkeSB0aG91Z2ggc28gZmFyIHRoaXMgZG9lc24ndCBzZWVtDQo+ PiB0byBoYXZlIGNhdXNlZCB0cm91YmxlIGZvciBvdGhlciBwYWNrYWdlcyB5ZXQgQUZBSUsg LS0gSSByZWNvbW1lbmQNCj4+ICJ4dmZiLXJ1biIgIi0tIiAicHl0aG9uIiAidGVzdC5weSIg aW5zdGVhZC4NCj4gSSB0aG91Z2ggSSBtaXNzZWQgc29tZXRoaW5nIHNvIEkgcmFuIGxpbnQg YWdhaW4sIGJ1dCBpdCBvbmx5IHNhaWQgDQo+IHRoZXJlJ3MgYSBuZXcgdmVyc2lvbiBvZiBo eWRydXMgYXZhaWxhYmxlLg0KPiBOZXZlcnRoZWxlc3MgSSBjaGFuZ2VkIHRoZSBpbnZvY2F0 aW9uIHRvIHdoYXQgeW91IHJlY29tbWVuZGVkLiBJIGFsc28gDQo+IHVwZGF0ZWQgaHlkcnVz IHRvIHZlcnNpb24gNDkzLiANCg0KTG9va3MgbGlrZSB0aGUgbGludGVyIGlnbm9yZWQgaHlk cnVzLW5ldHdvcmsgYmVjYXVzZSBpdCBkb2Vzbid0IA0KdW5kZXJzdGFuZCB0aGUgJ2xldCcg Y29uc3RydWN0IC4uLiB3b3JrIGZvciBsYXRlciAobm90IHRoaXMgcGF0Y2ggDQpzZXJpZXMp IC4uLg0KDQpHcmVldGluZ3MsDQpNYXhpbWUuDQoNCg== --------------o4MjbaOLwgnHXvupsY0Sjaiu Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On 28-07-2022 16:58, Tomasz Jeneralczy= k wrote:

Run "./pre-inst-env guix lint hydrus-network", it will have a remark
about this.=C2=A0 Also, technically this is racy -- it's possible= for
python to start before Xvfb is ready though so far this doesn't seem
to have caused trouble for other packages yet AFAIK -- I recommend
"xvfb-run" "--" "python" "test.py" instead.
I though I missed something so I ran lint again, but it only said there's a new version of hydrus available.
Nevertheless I changed the invocation to what you recommended. I also updated hydrus to version 493.

Looks like the linter ignored hydrus-network because it doesn't understand the 'let' construct ... work for later (not this patch series) ...

Greetings,
Maxime.

--------------o4MjbaOLwgnHXvupsY0Sjaiu-- --------------gr5WXmkqkZNBaPxlxQ6x4AXR Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc" Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2 ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc /gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4 LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0 k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D =3DOVqp -----END PGP PUBLIC KEY BLOCK----- --------------gr5WXmkqkZNBaPxlxQ6x4AXR-- --------------ka0e3IPgmOOQMNWxOkDcRByw-- --------------aN5r4Eak6iQ8XB029sjVymXM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYvKSVAUDAAAAAAAKCRBJ4+4iGRcl7vxP AP9PgVlGyims2jMK+jZphCwdBKrEKlSsw19naPYOGDWMrAD/V1jkjtnOTw570NEYxstkKqtma4uJ 596UT85+1rb8Ig0= =cvHO -----END PGP SIGNATURE----- --------------aN5r4Eak6iQ8XB029sjVymXM-- From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 13 10:34:59 2022 Received: (at 56803) by debbugs.gnu.org; 13 Aug 2022 14:34:59 +0000 Received: from localhost ([127.0.0.1]:34838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMsE7-0000cr-EQ for submit@debbugs.gnu.org; Sat, 13 Aug 2022 10:34:59 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:54583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMsE5-0000ci-KP for 56803@debbugs.gnu.org; Sat, 13 Aug 2022 10:34:58 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id EA7E740028; Sat, 13 Aug 2022 14:34:56 +0000 (UTC) MIME-Version: 1.0 Date: Sat, 13 Aug 2022 14:34:52 +0000 From: Tomasz Jeneralczyk To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Subject: Re: bug#56803: [PATCH 0/6] Add hydrus network and its dependencies In-Reply-To: <87lerx5u0q.fsf_-_@gnu.org> References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> <87lerx5u0q.fsf_-_@gnu.org> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <6db66d068f014489f5202d825e1985af@schwi.pl> X-Sender: tj@schwi.pl Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Maxime Devos , 56803@debbugs.gnu.org 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: -0.6 (/) On 2022-08-09 15:09, Ludovic Courtès wrote: > Perhaps these comments, or some of them, should go as comments in the > source? That will prove helpful next time you or someone else tries to > work on the package. They cluttered the code with meta-information that I didn't consider to be directly related to the package's source. Thought anyone searching would see the commit message and that would be enough. I'll add them back in if that's what you prefer. > In general, the solution here, rather than copy files like the ‘ffmpeg’ > executable, would be to patch Hydrus so that it contains the absolute > file name of ‘ffmpeg’ as returned by (search-input-file inputs > "/bin/ffmpeg"). > > How does that sound? At the time I thought that directly patching the binary paths could break some logic, but I looked into it and it looks like I only had to patch one `if` statement. This could change in future releases, but it's not likely. It appears to work as well and maybe even better - Now miniupnpc isn't timing out for me, which might or might not be because of this change. > In addition, this substitution should be done in a phase rather than in > a snippet, because (1) the result of ‘guix build -S’ should be > platform-independent and thus not include the file name of ‘mpv’ for a > particular system, and (2) the reference to variable ‘mpv’ at the top > level can cause problems due to circular dependencies among modules. I didn't know that, but it makes sense. I moved the code into its own phase. And if I understand the 2nd point correctly I should use something like `(assoc-ref inputs "mpv")` instead of `#$mpv`, right? I cannot use `(search-input-file ...)` because the name of the mpv's lib is determined during runtime by the python code and I didn't want to hardcode the mpv so file's version. After I finish making the changes I'll send the whole patchset again, it will also include updated packages to their newest release and be rebased onto current master. Thank you for taking the time to review my work. From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 13 17:26:39 2022 Received: (at 56803) by debbugs.gnu.org; 13 Aug 2022 21:26:39 +0000 Received: from localhost ([127.0.0.1]:35269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMyeV-0006is-0u for submit@debbugs.gnu.org; Sat, 13 Aug 2022 17:26:39 -0400 Received: from knopi.disroot.org ([178.21.23.139]:44062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMyeP-0006if-Q0 for 56803@debbugs.gnu.org; Sat, 13 Aug 2022 17:26:37 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B7FC240062; Sat, 13 Aug 2022 23:26:32 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EBkW_pS_4-88; Sat, 13 Aug 2022 23:26:31 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1660425985; bh=IvLculUdSkLGCHOR63xSLYTgPmNUHeAThK75533fDAY=; h=Date:To:Cc:Subject:From:References:In-Reply-To; b=boui/HsX1CJA42vgo+7nOHgqR2b2YYQCSeBDZ6Aan5KoMf3kFc1Y6oDzazHiaZktn 4P0301vTxq2Z3Xrx/T5F5VO+MB/yIHuctN+VW+jfgJ65NWrOqXn9Wl+DLds4uSmLeV /TRjCl+ubd5dlEt033CLrSE9YdkUa0aS2stCgIFk3lvYEv4PugVT3wrDs0ZdXqiqsr UjH7DmuzjWjFAwU+G9aDZacGtK9337nJbLFYd6QIxbiWUTfP78Lg6a1OshMVnY/y0d QBhJWba9BXmOazyKRN1J0O/tBNfXAxUvzuplg7TTBk9KcAL5gGSIhDxaCRAVxjxh3q Qm8R6frxqNYOw== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 13 Aug 2022 22:26:24 +0100 Message-Id: To: "Tomasz Jeneralczyk" , =?utf-8?q?Ludovic_Court=C3=A8s?= Subject: Re: [bug#56803] [PATCH 0/6] Add hydrus network and its dependencies From: "(" References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> <87lerx5u0q.fsf_-_@gnu.org> <6db66d068f014489f5202d825e1985af@schwi.pl> In-Reply-To: <6db66d068f014489f5202d825e1985af@schwi.pl> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56803 Cc: Maxime Devos , 56803@debbugs.gnu.org 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 (-) Hey, On Sat Aug 13, 2022 at 3:34 PM BST, Tomasz Jeneralczyk wrote: > > In addition, this substitution should be done in a phase rather than in > > a snippet, because (1) the result of =E2=80=98guix build -S=E2=80=99 sh= ould be > > platform-independent and thus not include the file name of =E2=80=98mpv= =E2=80=99 for a > > particular system, and (2) the reference to variable =E2=80=98mpv=E2=80= =99 at the top > > level can cause problems due to circular dependencies among modules. > And if I understand the 2nd point correctly I should use something like= =20 > `(assoc-ref inputs "mpv")` instead of `#$mpv`, right? I cannot use=20 > `(search-input-file ...)` because the name of the mpv's lib is=20 > determined during runtime by the python code and I didn't want to=20 > hardcode the mpv so file's version. No, the assoc-ref style is basically deprecated last I heard. The problem is with snippets: apparently something with the definition of the `snippet` field can cause module dependency issues, whereas `arguments` does not suffer from the same. IIRC, the issue is that the former is not specifie as a `(delayed)` field. So, #$pkg is okay in arguments, but sometimes not in snippets. -- ( From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 06:10:48 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 10:10:48 +0000 Received: from localhost ([127.0.0.1]:35980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNAZz-0005Gm-RE for submit@debbugs.gnu.org; Sun, 14 Aug 2022 06:10:48 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNAZw-0005Gc-Gm for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 06:10:46 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 9C6724001F; Sun, 14 Aug 2022 10:10:43 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 14 Aug 2022 10:10:38 +0000 From: Tomasz Jeneralczyk To: "(" Subject: Re: [bug#56803] [PATCH 0/6] Add hydrus network and its dependencies In-Reply-To: References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> <87lerx5u0q.fsf_-_@gnu.org> <6db66d068f014489f5202d825e1985af@schwi.pl> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <49364d9d0b0d0248b7e9e8e86a4cb4ba@schwi.pl> X-Sender: tj@schwi.pl Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: =?UTF-8?Q?Ludovic_Court=C3=A8s?= , Maxime Devos , 56803@debbugs.gnu.org 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: -0.6 (/) On 2022-08-13 21:26, ( wrote: > No, the assoc-ref style is basically deprecated last I heard. The > problem > is with snippets: apparently something with the definition of the > `snippet` > field can cause module dependency issues, whereas `arguments` does not > suffer from the same. IIRC, the issue is that the former is not > specifie > as a `(delayed)` field. So, #$pkg is okay in arguments, but sometimes > not > in snippets. Does this mean I should replace `(assoc-ref inputs "python")` with `#$python` in the install phase of hydrus? I checked and it didn't cause any problems. I also noticed that python-mpv's mpv library cannot find libmpv.so during runtime (only in the check phase) so I hardcoded the path in source to `(search-input-file inputs "/lib/libmpv.so")`. Was told on irc that most libraries are hardcoded so I take it's not a problem. From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 06:11:56 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 10:11:56 +0000 Received: from localhost ([127.0.0.1]:35985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNAb6-0005IZ-7W for submit@debbugs.gnu.org; Sun, 14 Aug 2022 06:11:56 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNAb4-0005IR-BP for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 06:11:54 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B263C40073; Sun, 14 Aug 2022 12:11:53 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iL7WUvvFzcGF; Sun, 14 Aug 2022 12:11:52 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1660471912; bh=EnLKzgPlCQxn9vYeJ4F+3gn1sggriGyTuKu5xhBzj54=; h=Date:Cc:Subject:From:To:References:In-Reply-To; b=ThF+vesuPgCbqKRJeC0EyTcSyUUqOE7r4k7kV+7YWpF3QaSQ2A3/Xh/k3LcCnra3o t2k6q5IoHwWp9j3VHQVOR26X9QLauFOxuttBGFDTqGsOkaSWUpr68zEdROzMvdUEml NUPqE3v5oH63S2jvUPNmSNuPPwvXTVHtA8GCz+vQ10iTQt+ZWFc3Z/JDIY4gRF3cEA aXkl1oSD+d64NZx3KD3iQS87f/nnd30iG9lM6ln+x2DQxtBoCtUIsKeRuQTb/8YVMi Yp1gb7VtXi94nmKo6abkF0NPPzD2/zUM39KW92Y7sJmjtInAByb1L7V66ZAdR4o8wR uVKkT36S8TL7A== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sun, 14 Aug 2022 11:11:52 +0100 Message-Id: Subject: Re: [bug#56803] [PATCH 0/6] Add hydrus network and its dependencies From: "(" To: "Tomasz Jeneralczyk" References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> <87lerx5u0q.fsf_-_@gnu.org> <6db66d068f014489f5202d825e1985af@schwi.pl> <49364d9d0b0d0248b7e9e8e86a4cb4ba@schwi.pl> In-Reply-To: <49364d9d0b0d0248b7e9e8e86a4cb4ba@schwi.pl> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56803 Cc: =?utf-8?q?Ludovic_Court=C3=A8s?= , Maxime Devos , 56803@debbugs.gnu.org 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 (-) On Sun Aug 14, 2022 at 11:10 AM BST, Tomasz Jeneralczyk wrote: > Does this mean I should replace `(assoc-ref inputs "python")` with=20 > `#$python` in the install phase of hydrus? > I checked and it didn't cause any problems. You could, but I think #$(this-package-input "python") would be better styl= e. -- ( From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 08:47:15 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 12:47:15 +0000 Received: from localhost ([127.0.0.1]:36139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1P-0003Cl-2c for submit@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:15 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1J-0003CI-LA for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:12 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id E22E040011 for <56803@debbugs.gnu.org>; Sun, 14 Aug 2022 12:47:08 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH v2 1/6] gnu: Add swftools. Date: Sun, 14 Aug 2022 14:46:18 +0200 Message-Id: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) This package will built all of swftools' tools but one: PDF2SWF, so I purposefuly commented it out of description. Swftools includes the source tarball of an old version of xpdf and I have not been successful in replacing it with the version distributed in guix. However I believe the near-completeness of the package warrants a release. Also updated copyright and used modules. *gnu/packages/animation.scm (swftools): Add variable. --- gnu/packages/animation.scm | 93 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index ba8ce00fbd..6a017895a3 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020, 2021 Vinicius Monego +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ (define-module (gnu packages animation) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages mp3) #:use-module (gnu packages networking) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -496,3 +498,94 @@ (define-public pencil2d lets you create traditional hand-drawn animations (cartoons) using both bitmap and vector graphics.") (license license:gpl2))) + +(define-public swftools + ;; Last release of swftools was 0.9.2 on 2012-04-21 - it is really old and + ;; does not compile with what's available in guix, master on the other hand works. + (let ((commit "772e55a271f66818b06c6e8c9b839befa51248f4") + (revision "1")) + (package + (name "swftools") + (version (git-version "0.9.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/matthiaskramm/swftools") + (commit commit))) + (sha256 + (base32 "0a8a29rn7gpxnba3spnvkpdgr7mdlssvr273mzw5b2wjvbzard3w")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; To fix a linking error I followed the workaround in: + ;; https://github.com/matthiaskramm/swftools/issues/178 + ;; and implented it as a two-step snippet because substitute* + ;; does not match multiline regexes. + (substitute* "lib/lame/quantize.c" + ;; move inline keywords to the same line as their function headers + (("^inline.*\n") "inline ")) + (substitute* "lib/lame/quantize.c" + ;; make this particular function not inline + (("inline (void bitpressure_strategy1)" _ f) f)))))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f)) ; no rule for check + (inputs (list zlib freetype giflib libjpeg-turbo lame)) + (home-page "http://www.swftools.org") + (synopsis "Collection of utilities for working with Adobe Flash files") + (description "SWFTools is a collection of utilities for working with +Adobe Flash files (SWF files). The tool collection includes programs for +reading SWF files, combining them, and creating them from other content (like +images, sound files, videos or sourcecode). The current collection is + comprised of the programs detailed below: + +@itemize +@comment PDF2SWF is not currentlybeing build alongside other tools. The next +@comment two lines should be uncommented if this will ever get fixed. +@comment @item +@comment @command{PDF2SWF} A PDF to SWF Converter. + +@item +@command{SWFCombine} A multi-function tool for inserting, contatenating, +stacking and changing parameters in SWFs. + +@item +@command{SWFStrings} Scans SWFs for text data. +@item +@command{SWFDump} Prints out various informations about SWFs. + +@item +@command{JPEG2SWF} Takes one or more JPEG pictures and generates a SWF +slideshow from them. + +@item +@command{PNG2SWF} Like JPEG2SWF, only for PNGs. + +@item +@command{GIF2SWF} Converts GIFs to SWF. Also able to handle animated gifs. + +@item +@command{WAV2SWF} Converts WAV audio files to SWFs, using the L.A.M.E. MP3 + encoder library. + +@item +@command{Font2SWF} Converts font files (TTF, Type1) to SWF. + +@item +@command{SWFBBox} Allows to read out, optimize and readjust SWF bounding boxes. + +@item +@command{SWFC} A tool for creating SWF files from simple script files. Supports +both ActionScript 2.0 aand 3.0. + +@item +@command{SWFExtract} Allows to extract Movieclips, Sounds, Images etc. from SWF + files. + +@item +@command{AS3Compile} A standalone ActionScript 3.0 compiler. Mostly compatible + with Flex. +@end itemize") + (license license:gpl2)))) base-commit: ca8c7a36dfbefd66841a2a6df4c9e44ba525c3e0 -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 08:47:16 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 12:47:16 +0000 Received: from localhost ([127.0.0.1]:36141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1P-0003Co-LU for submit@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:15 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1M-0003Cd-PQ for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:13 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 84BBE4001C for <56803@debbugs.gnu.org>; Sun, 14 Aug 2022 12:47:12 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH v2 2/6] gnu: Add python-xvfbwrapper. Date: Sun, 14 Aug 2022 14:46:19 +0200 Message-Id: <2e41dc32468bd25fbf0aaae998a1fc3295b6e44d.1660481045.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> References: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Also updates copyright. * gnu/packages/python-check.scm (python-xvfbwrapper): New variable. --- gnu/packages/python-check.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index e196f2eccb..ff5b956cad 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Felix Gruber +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -2373,3 +2374,24 @@ (define-public python-pycotap attachments). @end itemize") (license license:expat))) + +(define-public python-xvfbwrapper + (package + (name "python-xvfbwrapper") + (version "0.2.9") + (source (origin + (method url-fetch) + (uri (pypi-uri "xvfbwrapper" version)) + (sha256 + (base32 + "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w")))) + (build-system python-build-system) + (propagated-inputs (list xorg-server-for-tests)) + (home-page "https://github.com/cgoldberg/xvfbwrapper") + (synopsis "Python module for controlling virtual displays with Xvfb") + (description + "Xvfb (X virtual framebuffer) is a display server implementing +the X11 display server protocol. It runs in memory and does not require a +physical display. Only a network layer is necessary. Xvfb is useful for +running acceptance tests on headless servers.") + (license license:expat))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 08:47:21 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 12:47:21 +0000 Received: from localhost ([127.0.0.1]:36145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1V-0003DH-15 for submit@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:21 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1Q-0003D0-FB for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:18 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 35A3C40011 for <56803@debbugs.gnu.org>; Sun, 14 Aug 2022 12:47:16 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH v2 3/6] gnu: Add python-mpv. Date: Sun, 14 Aug 2022 14:46:20 +0200 Message-Id: <08140eaac786e693cc7ac33208e4080650dcfb26.1660481045.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> References: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Author states that the license of the library is inherited from libmpv, which can be either GPLv2 or LPGLv2.1. That's why the package's license is set to be the same as mpv's. One of the tests had to be disabled because it would neither fail or pass, blocking all other tests from running and the package from finishing its build process. I have no clue on why it happens. Rarely some tests fail without any apparent reason. This is possibly related to: https://github.com/jaseg/python-mpv/issues/209 Also add copyright. * gnu/packages/python-xyz.scm (python-mpv): Add variable. --- gnu/packages/python-xyz.scm | 63 +++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 13ab2f2c8b..51bf4d5c0b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -127,6 +127,7 @@ ;;; Copyright © 2022 Philip McGrath ;;; Copyright © 2022 Marek Felšöci ;;; Copyright © 2022 Hilton Chain +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -30388,6 +30389,68 @@ (define-public python-bsdiff4 and @code{bspatch4}.") (license license:bsd-2))) +(define-public python-mpv + (package + (name "python-mpv") + (version "v1.0.1") + (source + (origin + ;; python-mpv from pypi does not include the tests directory. + (method git-fetch) + (uri (git-reference + (url "https://github.com/jaseg/python-mpv") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10w6j3n62ap45sf6q487kz8z6g58sha37i14fa2hhng794z7a8jh")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; One of the tests never completes, so neutering it using + ;; early return allows other test to run without issue. + (substitute* "tests/test_mpv.py" + ;; Note the typo in "prooperty" - this was fixed later in + ;; upstream but has no effect on whether the tests hangs or not. + (("test_wait_for_prooperty_event_overflow.*" line) + ;; The long whitespace between \n and return is to match the + ;; identation level, which is significant in python. + (string-append line "\n return\n"))))))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-reference-to-mpv + (lambda* (#:key inputs #:allow-other-keys) + ;; Without an absolute path it is not able find and + ;; load the libmpv library. + (substitute* "mpv.py" + (("sofile = .*") + (string-append "sofile = \"" + (search-input-file inputs "/lib/libmpv.so") + "\"\n"))))) + (add-before 'check 'prepare-for-tests + (lambda _ + ;; Fontconfig throws errors when it has no cache dir to use. + (setenv "XDG_CACHE_HOME" (getcwd)) + ;; Some tests fail without a writable and readable HOME. + (setenv "HOME" (getcwd))))))) + (native-inputs + (list python-xvfbwrapper)) ; needed for tests only + (inputs (list mpv)) + (propagated-inputs (list python-pillow)) ; for raw screenshots + (home-page "https://github.com/jaseg/python-mpv") + (synopsis "Python interface to the mpv media player") + (description + "python-mpv is a ctypes-based python interface to the mpv media player. +It gives you more or less full control of all features of the player, just +as the lua interface does.") + ;; From the project's README: + ;; python-mpv inherits the underlying libmpv's license, which can be either + ;; GPLv2 or later (default) or LGPLv2.1 or later. For details, see the mpv + ;; copyright page. + (license (package-license mpv)))) + (define-public python-biblib (let ((upstream-version "0.1.0") (commit "ab0e857b9198fe425ec9b02fcc293b5d9fd0c406") -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 08:47:24 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 12:47:24 +0000 Received: from localhost ([127.0.0.1]:36148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1Y-0003DZ-GK for submit@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:24 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1U-0003DB-31 for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:20 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id D0EB740011 for <56803@debbugs.gnu.org>; Sun, 14 Aug 2022 12:47:19 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH v2 4/6] gnu: Add support for python in opencv Date: Sun, 14 Aug 2022 14:46:21 +0200 Message-Id: <369561a2fb573caf1233bf6e713fd1caeac2fce8.1660481045.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> References: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) The package already had all dependencies needed for its python bindings, so enabling python support was as easy as adding a flag. Which makes me think this was the intention from the start. Also add copyright. * gnu/packages/image-processing.scm (opencv)[arguments]: Change variable. --- gnu/packages/image-processing.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 3dfe086af8..f26691cad7 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -511,6 +512,8 @@ (define-public opencv ;; DISPATCH is the list of optional dispatches. "-DCPU_BASELINE=SSE2" + "-DBUILD_opencv_python3=ON" + ,@(match (%current-system) ("x86_64-linux" '("-DCPU_DISPATCH=NEON;VFPV3;FP16;SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;POPCNT;AVX;FP16;AVX2;FMA3;AVX_512F;AVX512_SKX" -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 08:47:27 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 12:47:27 +0000 Received: from localhost ([127.0.0.1]:36150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1a-0003Di-RO for submit@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:27 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1X-0003DS-P7 for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:24 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 89AB640011 for <56803@debbugs.gnu.org>; Sun, 14 Aug 2022 12:47:23 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH v2 5/6] gnu: Update python-cloudscraper. Date: Sun, 14 Aug 2022 14:46:22 +0200 Message-Id: X-Mailer: git-send-email 2.37.1 In-Reply-To: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> References: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Neither 1.2.58 nor 1.2.60 version of python-cloudscraper requires compatibility with python2 afaik. This removes possible collisions with packages that depend on the mainstream version of python-pyparsing. * gnu/packages/python-web.scm (python-cloudscraper): Update to 1.2.60 * gnu/packages/python-web.scm (python-cloudscraper)[propagated-inputs]: Change python-pyparsing to its mainstream version --- gnu/packages/python-web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 896e60aba2..298c1e09de 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -6262,17 +6263,16 @@ (define-public python-http-ece (define-public python-cloudscraper (package (name "python-cloudscraper") - (version "1.2.58") + (version "1.2.60") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/VeNoMouS/cloudscraper") - ;; Corresponds to 1.2.58 - (commit "f3a3d067ea8b5238e9a0948aed0c3fa0d9c29b96"))) + (commit "1.2.60"))) (file-name (git-file-name name version)) (sha256 - (base32 "18fbp086imabjxly04rrchbf6n6m05bpd150zxbw7z2w3mjnpsqd")) + (base32 "00cmxgwdm0x1j4a4ipwvpzih735hdzidljbijk1b3laj3dgvnvsm")) (modules '((guix build utils))) (snippet '(with-directory-excursion "cloudscraper" @@ -6312,7 +6312,7 @@ (define-public python-cloudscraper python-requests python-requests-toolbelt python-responses - python-pyparsing-2.4.7)) + python-pyparsing)) (native-inputs (list python-pytest)) (home-page "https://github.com/venomous/cloudscraper") -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 14 08:47:45 2022 Received: (at 56803) by debbugs.gnu.org; 14 Aug 2022 12:47:45 +0000 Received: from localhost ([127.0.0.1]:36153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1s-0003Eo-7V for submit@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:45 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:56529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oND1b-0003Dp-Kn for 56803@debbugs.gnu.org; Sun, 14 Aug 2022 08:47:42 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id 686E340011 for <56803@debbugs.gnu.org>; Sun, 14 Aug 2022 12:47:27 +0000 (UTC) From: Tomasz Jeneralczyk To: 56803@debbugs.gnu.org Subject: [PATCH v2 6/6] gnu: Add hydrus-network. Date: Sun, 14 Aug 2022 14:46:23 +0200 Message-Id: <2a7e6f4b11784ab9dc680e1fe3255f6e15333e32.1660481045.git.tj@schwi.pl> X-Mailer: git-send-email 2.37.1 In-Reply-To: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> References: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56803 Cc: Tomasz Jeneralczyk 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: -0.6 (/) Hydrus-network has a weekly release cycle and is meant to be used from its own directory so I artificially spread it out to comply with guix's expectations. I was not able to build the program's help files. Fixing it would probably mean packaging a whole new build system for guix - more info in source comments. Also adds copyright and new used modules. * gnu/packages/image-viewers.scm (hydrus-network): Add variable. --- gnu/packages/image-viewers.scm | 133 +++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 88dbba866b..7878fe1048 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 dissent ;;; Copyright © 2022 Michael Rohleder +;;; Copyright © 2022 Tomasz Jeneralczyk ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages image-viewers) #:use-module (guix build-system qt) #:use-module (gnu packages autotools) #:use-module (gnu packages algebra) + #:use-module (gnu packages animation) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -84,14 +86,20 @@ (define-module (gnu packages image-viewers) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages suckless) #:use-module (gnu packages terminals) + #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages)) @@ -973,3 +981,128 @@ (define-public xzgv (description "xzgv is a fast image viewer that provides extensive keyboard support.") (license license:gpl2+))) + +(define-public hydrus-network + (package + (name "hydrus-network") + (version "495") ; upstream has a weekly release cycle. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hydrusnetwork/hydrus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03zhrcmjzbk37sl9nwjahfmr8aflss84c4xhg5ci5b8jvbbqmr1j")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(let ((static-dir "/share/hydrus/static")) + (modify-phases %standard-phases + ;; Hydrus is a python program but does not uses setup.py or any + ;; other build system to build itself - it's delivered ready to + ;; run from the source. + (replace 'check + (lambda _ + (setenv "DISPLAY" ":0") + (setenv "XDG_CACHE_HOME" (getcwd)) + (setenv "HOME" (getcwd)) + (invoke "xvfb-run" "python" "test.py"))) + ;; I was not able to build the program's help files. Updating + ;; python-pymdown-extensions to its latest version might be the + ;; solution, but this would require also packaging its new build + ;; system that is not present in guix yet. I decided to cut short there. + (delete 'build) + (add-before 'install 'patch-variables + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((ffmpeg (search-input-file inputs "/bin/ffmpeg")) + (swfrender (search-input-file inputs "/bin/swfrender")) + (upnpc (search-input-file inputs "/bin/upnpc")) + (out (assoc-ref outputs "out"))) + (with-directory-excursion "hydrus" + ;; Without this the program would incorrectly assume + ;; that it uses user's ffmpeg binary when it isn't. + (substitute* "client/ClientController.py" + (("if (HydrusVideoHandling\\.FFMPEG_PATH).*" _ var) + (string-append "if " var " == \"" ffmpeg "\":\n"))) + (with-directory-excursion "core" + (substitute* "HydrusConstants.py" + (("STATIC_DIR = .*") + (string-append "STATIC_DIR = \"" out static-dir "\"\n"))) + (substitute* "HydrusFlashHandling.py" + (("SWFRENDER_PATH = .*\n") + (string-append "SWFRENDER_PATH = \"" swfrender "\"\n"))) + (substitute* "HydrusVideoHandling.py" + (("FFMPEG_PATH = .*\n") + (string-append "FFMPEG_PATH = \"" ffmpeg "\"\n"))) + (substitute* "networking/HydrusNATPunch.py" + (("UPNPC_PATH = .*\n") + (string-append "UPNPC_PATH = \"" upnpc "\"\n")))))))) + ;; Since everything lives in hydrus's root directory, it needs to + ;; be spread out to comply with guix's expectations. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (client (string-append out "/bin/hydrus")) + (server (string-append out "/bin/hydrus-server"))) + (copy-recursively "static" + (string-append out static-dir)) + (copy-recursively "hydrus" + (string-append out + "/lib/python" + (python-version + #$(this-package-input "python")) + "/site-packages/hydrus")) + (mkdir (string-append out "/bin")) + (copy-file "client.py" client) + (chmod client #o0555) + (copy-file "server.py" server) + (chmod server #o0555)))))))) + ;; All native-inputs are only needed for the the check phase + (native-inputs + (list + xvfb-run + python-nose + python-mock + python-httmock)) + ;; All python packages were taken from static/build_files/linux/requirements.txt + (propagated-inputs + (list + python-beautifulsoup4 + python-cbor2 + python-chardet + python-cloudscraper + python-html5lib + python-lxml + python-lz4 + python-numpy + opencv ; its python bindings are a drop-in replacement for opencv-python-headless + python-pillow + python-psutil + python-pylzma + python-pyopenssl + ;; since hydrus' version 494 it supports python-pyside-6 but it's not yet + ;; in guix. pyside-2 is still supported as a fallback. + python-pyside-2 + python-pysocks + python-mpv + python-pyyaml + python-qtpy + python-requests + python-send2trash + python-service-identity + python-six + python-twisted)) + (inputs (list swftools ffmpeg miniupnpc python)) + (synopsis "Organize your media with tags like a dektop booru") + (description + "The hydrus network client is an application written for +internet-fluent media nerds who have large image/swf/webm collections. +It browses with tags instead of folders, a little like a booru on your desktop. +Advanced users can share tags and files anonymously through custom servers that +any user may run. Everything is free and privacy is the first concern.") + (home-page "https://hydrusnetwork.github.io/hydrus/") + (license license:wtfpl2))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 29 18:46:38 2022 Received: (at 56803-done) by debbugs.gnu.org; 29 Aug 2022 22:46:39 +0000 Received: from localhost ([127.0.0.1]:34090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSnWg-0000N0-La for submit@debbugs.gnu.org; Mon, 29 Aug 2022 18:46:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSnWe-0000Mn-Qy for 56803-done@debbugs.gnu.org; Mon, 29 Aug 2022 18:46:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSnWY-0003xu-GX; Mon, 29 Aug 2022 18:46:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=r8gSQbWUVgefRs623Amh0+dzSmbvlABoe9vVhkeLxRo=; b=pfyGKcSfpVXUTw3dIA2r +V1umP7+ZEz1737mBDUcw7hNchnLn3/79CVsGZ1CCfHqAkgxdi57wHNPHc2rHRgRYys/MRYDVGEGh ZBtLyBDyLhX3qJFyMT3hHCZg2naC2t3pMMzC2nob86nJgNc4V+nmUPYYU3+h3fL4h0FKNTpDiq0vs O7Le09SSHTaEtpa6XPJDGhjWTA7pYZDEtl3zXODNiWJPU0tlPJbkwSvHaJOs7gYKI2ICy8IZAgGfS QDiccKtrl6rgskoLT9QuQ4QloLD/zLxfFj68OG+xoJVK47gWVKGbMysb2BBuH8dntYt5+PCM4YrYH 5AA8LwimpHmntw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:59104 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSnWY-0006no-2u; Mon, 29 Aug 2022 18:46:30 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomasz Jeneralczyk Subject: Re: bug#56803: [PATCH 0/6] Add hydrus network and its dependencies References: <458d155cb6f630e0e8aea1793a4c97b3d76520e6.1660481045.git.tj@schwi.pl> <2a7e6f4b11784ab9dc680e1fe3255f6e15333e32.1660481045.git.tj@schwi.pl> Date: Tue, 30 Aug 2022 00:46:27 +0200 In-Reply-To: <2a7e6f4b11784ab9dc680e1fe3255f6e15333e32.1660481045.git.tj@schwi.pl> (Tomasz Jeneralczyk's message of "Sun, 14 Aug 2022 14:46:23 +0200") Message-ID: <87v8qa4qik.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56803-done Cc: 56803-done@debbugs.gnu.org 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: -3.3 (---) Hi, Tomasz Jeneralczyk skribis: > Hydrus-network has a weekly release cycle and is meant to be used from it= s own > directory so I artificially spread it out to comply with guix's expectati= ons. > > I was not able to build the program's help files. Fixing it would probably > mean packaging a whole new build system for guix - more info in source > comments. > > Also adds copyright and new used modules. > > * gnu/packages/image-viewers.scm (hydrus-network): Add variable. I pushed the whole series: 9b8507df11 gnu: Add hydrus-network. f82a8873d3 gnu: python-cloudscraper: Update to 1.2.60. 5920196e47 gnu: opencv: Build Python bindings. 619af9f307 gnu: Add python-mpv. e1ea628776 gnu: Add python-xvfbwrapper. 05246c691b gnu: Add swftools. I had to make a number of adjustments, such as tweaking commit logs, moving info from the commit log to comments for swftools, changing the swftools license to =E2=80=98gpl2+=E2=80=99 (because source file headers ca= rry the =E2=80=9Cor any later version=E2=80=9D wording), avoiding =E2=80=9C(package-license mpv= )=E2=80=9D as this leads to a top-level circular dependency, and removing bundled binaries from hydrus-network. Thanks, Ludo=E2=80=99. From unknown Sat Aug 16 14:31:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 27 Sep 2022 11:24:05 +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