From patchwork Mon Jun 9 19:38:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 43052 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 BD2F527BC49; Mon, 9 Jun 2025 20:40:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EDD027BC4A for ; Mon, 9 Jun 2025 20:40:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOiKs-0007L8-VQ; Mon, 09 Jun 2025 15:39:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uOiKl-0007Ju-SU for guix-patches@gnu.org; Mon, 09 Jun 2025 15:39:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOiKl-0004FM-JE for guix-patches@gnu.org; Mon, 09 Jun 2025 15:39:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:In-Reply-To:References:MIME-Version:To:Subject; bh=WwpxweDp9r72pweDcF9Jc1Ts+38vbLkBSmEN/gIiZLQ=; b=k++ObT5bhhjeZXk94sZcN2GYpde4jO4nvKAPdeidW4kDuJBnmIcmscgFdS1PSNme3/WFX66gcO4ymS+eVNBo2DF7HZYK4iWkisWCt2n6D/je+IIgXqS4xWlL3zFvb3u6BWj18T9LFRDCTLBHJUUA+S8184HD26fSd/Q+GMGRmiV50jtSIwjSsTFXFsJ6M8ux/f8mdrKYhoGnyyCcth8SiTXJfUfzNxbByByk7IjQ2n0HPHxpEI6jQWhvGpYsSDlm10A8YHeS8V0pRrl2UTjB3vz5kbFDLTa75DSME6Im2u3gRrw90WvW79zA9TAtawGhmIVS268P5d455fwdaqvDrw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uOiKl-0002qz-AN for guix-patches@gnu.org; Mon, 09 Jun 2025 15:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78732] [PATCH] gnu: simple-scan: enable scanning over network for eSCL/WSD scanners Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Jun 2025 19:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78732 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: Vivien Kraus , 38929@debbugs.gnu.org, 78732@debbugs.gnu.org, =?utf-8?q?No=C3=A9?= Lopez , Maxim Cournoyer Received: via spool by 78732-submit@debbugs.gnu.org id=B78732.174949793710900 (code B ref 78732); Mon, 09 Jun 2025 19:39:03 +0000 Received: (at 78732) by debbugs.gnu.org; 9 Jun 2025 19:38:57 +0000 Received: from localhost ([127.0.0.1]:57755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uOiKd-0002pd-DA for submit@debbugs.gnu.org; Mon, 09 Jun 2025 15:38:56 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:49623) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uOiKa-0002oE-SZ; Mon, 09 Jun 2025 15:38:53 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-4a42cb03673so60203801cf.3; Mon, 09 Jun 2025 12:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749497927; x=1750102727; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=WwpxweDp9r72pweDcF9Jc1Ts+38vbLkBSmEN/gIiZLQ=; b=Ndprozkh7qFtuaR9RJm1HOhxS5yQAg6G0xcGY2WaVmp+WlImrwyziWWMap7GqALR5s 6wslUNiyd6dfVfWnfBb7OJhATiCxzb3nb+iDDebcgA0L4SA3Ssuy+38hy86UVDOg24k7 I/a2hdGY6p77qKjAPGzNYFLqe/Q/KU8KdaoMkfGe1SQjJIJQ80sUkahGL6p4ovdXCs0K 1QT2cLvUgZUEocZT9lHhV5XvIcY00l5ajI9Lx3WTIjQIBsc2mck1gVhnkj6KmRpZCRiD cTJM0jPySOepJjF6NUOl/5rblXY1udf52uzyMU4/Ybi5JoRFrMUcQS92IWWS5WolPncb aM2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749497927; x=1750102727; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WwpxweDp9r72pweDcF9Jc1Ts+38vbLkBSmEN/gIiZLQ=; b=Rqjyr/KLLwd3nPE+PZQfVfZ1u0uHrLh7pz1fX0o/ppbxiCNKvqM8SrTZrgS7LJw0/x irk+pI3Zndaobsx/iJLfmGT4o3JJ9NAnQrxNaWMyZqdApMx3zJ5yBYG+jpu+suEUgoh3 mkD4aHr/hVJzWIG8BRByzcGU1IP0sxevxJVpcwE4UG4YWCzAxSgNpoXNvU13N4NCAoNZ /gtfxXeb7QMVvwtWzDmCB5ezLrIhMe4Vp9QZuabJH4ovrV7MjpFslQuXLaFLpSWrNCY+ URy8vBPVY+p7oL9eKJMVEMgFmB7W2Xmmpu3Qnx9+fFJZkS2baxVxBzlEZEkcV12CLHX0 NIsA== X-Forwarded-Encrypted: i=1; AJvYcCWW55mjMhIshxAC6jATcOGbPdZ00Of9zP8aflfZEdya2NuOudID8y6NVbSn2eMoHjIw9Pq6Tw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yx4KvW1v8zyAOaPsGBz3kc64Rq37uLIJeB1m9tbDUC+W6agzZcL f90C5zv3Tzq57BfPNLHHB0G2n7RiM7iHCT0+m/FWjnlifqFQWpP/8XxwzlKWPF4LkfMzQmETJzT 8LVzljzza/GHiO2P945YW8km4++L0o0E= X-Gm-Gg: ASbGncvZ2ikIqlw8ymPkJWrb7jOoTf5vVAqNcPqyA97X0Igyke7OjaksWgJZULNTkg6 /cYhyyqkxKvenLD1v4WBkRqlumPvmWC/e0I/yzBUg+XllCiBeASC+aJaIsViviRiP2q5LBRoUzg cVybLHCw3GsanSQ78ZeDE7DtIn/Q9gvx28u2jYP0k67iHZroNpIPYnDlbJHtpKcvzK7x/FXr6ou dL4sg== X-Google-Smtp-Source: AGHT+IFsFNkVoBRg72wzQ6UeEr6sId+xEY9EPmGR55GVtWc9FJMroMHpiMJmuzLeVY3K45kR4tmkaHd3kroaz5wy+2Q= X-Received: by 2002:a05:622a:40ca:b0:477:6f1e:f477 with SMTP id d75a77b69052e-4a5b9e2f621mr257389721cf.19.1749497926998; Mon, 09 Jun 2025 12:38:46 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Rostislav Svoboda Date: Mon, 9 Jun 2025 21:38:10 +0200 X-Gm-Features: AX0GCFsLc7abL1NjhCs8jbOd-azOc5t32A4HsodGlzYB0soJ2fX62ISK9ctI8n8 Message-ID: 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 > The LD_LIBRARY_PATH looks suspicious. What exactly is suspicious? > Is there any way around it using other SANE tooling? AFAIK there's no simpler runtime-only solution: - You could use patchelf to prepend the store's lib/sane directory onto the binary's RPATH, but that's as even even more fiddly as setting LD_LIBRARY_PATH - sane-config only spits out compile-time flags (-I..., -L..., -lsane); it doesn't tell the loader where to find backends at runtime. BTW, I've polished the patch. Please ignore the previous one - the phase name was wrong ("wrap-flatpak" instead of "wrap-simple-scan"). Cheers From f7a355581eb5f6be58e1d1369d7d65dbbc6e774e Mon Sep 17 00:00:00 2001 Message-ID: From: Rostislav Svoboda Date: Mon, 9 Jun 2025 13:19:17 +0200 Subject: [PATCH] gnu: simple-scan: enable scanning over network for eSCL/WSD scanners * gnu/packages/gnome.scm (simple-scan)[inputs]: Add sane-airscan. <#:phases>: Wrap simple-scan to set - LD_LIBRARY_PATH to sane-airscan's lib/sane - SANE_CONFIG_DIR to sane-airscan's etc/sane.d This change allows simple-scan to automatically detect and use eSCL or WSD (AirScan) backends over the network. Change-Id: Id1d95c77c3fc549b7baf91d31049541a687bce2d --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 56236013a7..81a8987a7d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7330,7 +7330,19 @@ (define-public simple-scan (base32 "1aghnkvjdyj73kv55nd9gl5b1xjkpcxjn4j3a6z67r9g2j86avn1")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t)) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-simple-scan + (lambda* (#:key inputs #:allow-other-keys) + (let ((simple-scan (string-append #$output "/bin/simple-scan")) + (sane-airscan-inputs (assoc-ref inputs "sane-airscan"))) + (wrap-program simple-scan + `("LD_LIBRARY_PATH" = + (,(string-append sane-airscan-inputs "/lib/sane"))) + `("SANE_CONFIG_DIR" prefix + (,(string-append sane-airscan-inputs "/etc/sane.d")))))))))) (native-inputs (list gettext-minimal itstool @@ -7347,6 +7359,7 @@ (define-public simple-scan gdk-pixbuf gusb libadwaita + sane-airscan sane-backends)) (home-page "https://gitlab.gnome.org/GNOME/simple-scan") (synopsis "Document and image scanner") base-commit: 03ce76718c41b32d174713c945d269d6fcdd8bf1 -- 2.49.0