From patchwork Sat Feb 25 15:18:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pisemsky X-Patchwork-Id: 47303 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7346916BBC; Sat, 25 Feb 2023 15:19:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 47F5416B9F for ; Sat, 25 Feb 2023 15:19:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVwKT-0001oH-23; Sat, 25 Feb 2023 10:19:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVwKG-0001nV-OF for guix-patches@gnu.org; Sat, 25 Feb 2023 10:19:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVwKE-0008Qf-QX for guix-patches@gnu.org; Sat, 25 Feb 2023 10:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVwKE-00029B-B1 for guix-patches@gnu.org; Sat, 25 Feb 2023 10:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61468] Updated patch Resent-From: Evgeny Pisemsky Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61468 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61468@debbugs.gnu.org Cc: Julien Lepiller , zimoun Received: via spool by 61468-submit@debbugs.gnu.org id=B61468.16773383258227 (code B ref 61468); Sat, 25 Feb 2023 15:19:02 +0000 Received: (at 61468) by debbugs.gnu.org; 25 Feb 2023 15:18:45 +0000 Received: from localhost ([127.0.0.1]:41290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVwJx-00028c-B5 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 10:18:45 -0500 Received: from sofi-shared.hosting.energy ([146.59.29.125]:58019 helo=sofi.hosting.energy) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVwJu-00028P-N4 for 61468@debbugs.gnu.org; Sat, 25 Feb 2023 10:18:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=pisemsky.com; s=dkim; h=Content-Type:MIME-Version:Message-ID:In-Reply-To: Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ET7mFqGrR4Jh0ZlDPaLpbg3oAVaX4zy1RdJe9DUFPzE=; b=pWzwDLheHbZXibCN+VTCtmn44B FBdc030yhilCCf+p9J7cgdyERlTlRUMckwLabb8S0hmgWz8EjYpKtOlU6o9MenOv8puDWy7RY6jOo 6lgZhQpXtUjamuLREYsa0mnvnWE0PUAwoL/b8GbCal9TJXFIlweO6YYvNa+Ynm61X0BM=; Received: from [176.59.46.203] (helo=portable) by sofi.hosting.energy with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1pVwJl-0002c1-UW; Sat, 25 Feb 2023 18:18:34 +0300 From: Evgeny Pisemsky References: <87y1p2nsh6.fsf@pisemsky.com> <8635797pom.fsf@gmail.com> Date: Sat, 25 Feb 2023 18:18:30 +0300 In-Reply-To: (Julien Lepiller's message of "Mon, 13 Feb 2023 13:28:08 +0100") Message-ID: <87h6v9ojsp.fsf_-_@pisemsky.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: ClamAV 0.103.0; Sat, 25 Feb 2023 18:18:34 +0300 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello. Here is the updated patch. I have also changed the builder to copy only necessary files. From 67527806b69ad391209b9e149cd4975e582e1366 Mon Sep 17 00:00:00 2001 From: Evgeny Pisemsky Date: Sat, 25 Feb 2023 17:55:10 +0300 Subject: [PATCH] gnu: cat-avatar-generator: Update to 1-1.9360ea3. * gnu/packages/web.scm (cat-avatar-generator): Update to 1-1.9360ea3. --- gnu/packages/web.scm | 74 +++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fd0e68c591..66be07a383 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7679,47 +7679,49 @@ (define-public geomyidae (license license:expat))) (define-public cat-avatar-generator - (package - (name "cat-avatar-generator") - (version "1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://framagit.org/Deevad/cat-avatar-generator.git") - (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad"))) - (file-name (string-append name "-" version)) - (sha256 - (base32 - "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils) - (srfi srfi-1) - (srfi srfi-26)) - - (let ((source (assoc-ref %build-inputs "source")) - (php-dir (string-append %output "/share/web/" ,name "/"))) - ;; The cache directory must not be in the store, but in a writable - ;; location. The webserver will give us this location. - (copy-recursively source php-dir) - (substitute* (string-append php-dir "/cat-avatar-generator.php") - (("\\$cachepath = .*") - "if(isset($_SERVER['CACHE_DIR'])) + (let ((commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa") + (revision "1")) + (package + (name "cat-avatar-generator") + (version (git-version "1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/Deevad/cat-avatar-generator.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0js4grqzsm4gvmcbmxv7zw4samfzi6nk4mn977ddcvla9g222rkm")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + (let ((source (assoc-ref %build-inputs "source")) + (php-dir (string-append %output "/share/web/" ,name))) + (install-file (string-append source "/cat-avatar-generator.php") php-dir) + (copy-recursively (string-append source "/avatars") (string-append php-dir "/avatars")) + ;; The cache directory must not be in the store, but in a writable + ;; location. The webserver will give us this location. + (substitute* (string-append php-dir "/cat-avatar-generator.php") + (("\\$cachepath = .*") + "if(isset($_SERVER['CACHE_DIR'])) $cachepath = $_SERVER['CACHE_DIR']; else die('You need to set the CACHE_DIR variable first.');")) - #t)))) - (home-page "https://framagit.org/Deevad/cat-avatar-generator") - (synopsis "Random avatar generator") - (description "Cat avatar generator is a generator of cat pictures optimised + #t)))) + (home-page "https://framagit.org/Deevad/cat-avatar-generator") + (synopsis "Random avatar generator") + (description "Cat avatar generator is a generator of cat pictures optimised to generate random avatars, or defined avatar from a \"seed\". This is a derivation by David Revoy from the original MonsterID by Andreas Gohr.") - ;; expat for the code, CC-BY 4.0 for the artwork - (license (list license:expat - license:cc-by4.0)))) + ;; expat for the code, CC-BY 4.0 for the artwork + (license (list license:expat + license:cc-by4.0))))) (define-public nghttp2 (package base-commit: 82fc07363b1600b0bfbf4a3327ea516a7b480f6b -- 2.39.1