From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79921158013 for ; Tue, 5 Dec 2023 05:27:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11E592BC076; Tue, 5 Dec 2023 05:26:02 +0000 (UTC) Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DED6C2BC073 for ; Tue, 5 Dec 2023 05:26:01 +0000 (UTC) Received: by mail-oi1-x229.google.com with SMTP id 5614622812f47-3b8b0ced0f4so1307614b6e.0 for ; Mon, 04 Dec 2023 21:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701753960; x=1702358760; darn=lists.gentoo.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gVDErvqTMsPuquyTG1560HzGUoRZpdX60lBkBJc5HQ4=; b=dj0q5o0e/QQJc5/9i8IVQCEO/KIxEOx2AlkLdWsJKNyyGBmxBKeEn8cQODcH9yB3vp lyAIutjmySGvghnffbZeWSzuEMG8iV/Ss3CJ6Ln8Jn1VjD6mhvW+RWDIi9xFRLEZMuKE k4/iv+7ZaNmhoBXSuHAOc28xRbnAlOAi+ifvwf33fS+FgmGQfqkpFk84MpJRcG4VDQCn p8uHEKLk3+bGmyyuBtsxZWC1LTMgWtC/f9y8RxwW6/sLcDNopnT9BBsZJuzcTVYrz5az bb66cty+JwFDVnX/3k2P9qSd+P6rnrV+XBO7Az1IRoGGut06xNdCRlqmGJzL22gS/bmG hDvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701753960; x=1702358760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gVDErvqTMsPuquyTG1560HzGUoRZpdX60lBkBJc5HQ4=; b=lhESWxqzI8uH7CXuhm/oPdao+e+RB+endYB0wA6lgszt3lG5hqjz3GhpYtp3aVhmK8 uwAa2bZzFkYUgtD4N7qU+puqUtCnSyvSlqQmlF1ex0ek2kgY282Rh/w3HdJnJiE7GRUr Y2JkPFZaUncIzys+eJ0Te+bz1Dmz9gdA6gxF+oqmtEPr6ljHbt8Hencb2J+2//Akly6W +RL4BZAYM/HEBGT6Sy0WeVbHhEa5CV6SRWB8u2CJkUG365+ptdcvpMGKWOJaopnibBWZ YXNSxw6ZKJFE7nYzqwc0URSOdbFCKb4sRnRD1jPxK10/+uapGAaSQJPajMGWR0ibt6Hf P32A== X-Gm-Message-State: AOJu0YyiWSmwZ97ecPKTPvDYWXP7gkLlfJ6ZYHVA4J2sjOlaLnLbkGpL FY45wwrUn8n6wMhbN/qA8dJeOz1AaHY= X-Google-Smtp-Source: AGHT+IG/yVYKXFNKYMqVLO8RlJm9hZuOHhVFZz6DqLpO2MLVbd26+Z7vmwDgnMxbj8b3i3pNGq22DA== X-Received: by 2002:a05:6808:2a44:b0:3b8:b9b3:81e3 with SMTP id fa4-20020a0568082a4400b003b8b9b381e3mr360875oib.1.1701753960413; Mon, 04 Dec 2023 21:26:00 -0800 (PST) Received: from acleverhostname.attlocal.net (108-200-163-197.lightspeed.bcvloh.sbcglobal.net. [108.200.163.197]) by smtp.gmail.com with ESMTPSA id x19-20020a056808145300b003b6caf2accfsm2081659oiv.22.2023.12.04.21.25.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 21:25:59 -0800 (PST) From: Eli Schwartz To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [RFC PATCH 04/10] net-print/cups-browsed: new package, add 2.0.0 Date: Tue, 5 Dec 2023 00:20:29 -0500 Message-ID: <20231205052550.3150055-5-eschwartz93@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231205052550.3150055-1-eschwartz93@gmail.com> References: <20231205052550.3150055-1-eschwartz93@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 77e8d622-ed02-40b2-bd1e-009217eb52de X-Archives-Hash: 0035423a12428f7f2621146a78b581de Part of the CUPS v3 evolution. Now, cups-filters has been split out into multiple sub-packages. This contains the standalone browsed component. Signed-off-by: Eli Schwartz --- net-print/cups-browsed/Manifest | 1 + .../cups-browsed/cups-browsed-2.0.0.ebuild | 63 +++++++++++++++++++ ...d.c-Fix-build-with-avahi-disabled-20.patch | 34 ++++++++++ net-print/cups-browsed/metadata.xml | 11 ++++ 4 files changed, 109 insertions(+) create mode 100644 net-print/cups-browsed/Manifest create mode 100644 net-print/cups-browsed/cups-browsed-2.0.0.ebuild create mode 100644 net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch create mode 100644 net-print/cups-browsed/metadata.xml diff --git a/net-print/cups-browsed/Manifest b/net-print/cups-browsed/Manifest new file mode 100644 index 000000000000..e9a2ce2398ba --- /dev/null +++ b/net-print/cups-browsed/Manifest @@ -0,0 +1 @@ +DIST cups-browsed-2.0.0.tar.xz 426132 BLAKE2B e1724c03302d61cf131c8886a95f6ad8f0236b134f1deaadb783fa185141b83cd8ac5c5d993ded37d04c7fd806c5cde157a792a90a2f372075f24a5bd2423dc5 SHA512 592493ef82c65b2418b86b555c4d24bdf352f78516993a021d106240b8c399fd9f4fcc27e396e895d94da889a97f2bbc5e96bfa92c58c8be80802ee8df43db80 diff --git a/net-print/cups-browsed/cups-browsed-2.0.0.ebuild b/net-print/cups-browsed/cups-browsed-2.0.0.ebuild new file mode 100644 index 000000000000..6baeb697f2cd --- /dev/null +++ b/net-print/cups-browsed/cups-browsed-2.0.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="helper daemon to browse for remote CUPS queues and IPP network printers" +HOMEPAGE="https://github.com/OpenPrinting/cups-browsed" +SRC_URI="https://github.com/OpenPrinting/cups-browsed/releases/download/${PV}/${P}.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="ldap test zeroconf" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/glib:2 + >=net-print/cups-2 + >=net-print/cups-filters-2.0.0 + ldap? ( net-nds/openldap:= ) + test? ( net-print/cups[zeroconf] ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gdbus-codegen + >=sys-devel/gettext-0.18.3 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch +) + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --with-browseremoteprotocols=DNSSD,CUPS + --with-cups-rundir="${EPREFIX}"/run/cups + --with-rcdir=no + + $(use_enable ldap) + $(use_enable zeroconf avahi) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die + + if ! use zeroconf ; then + sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die + sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/daemon/cups-browsed.service || die + fi + + doinitd "${T}"/cups-browsed + systemd_dounit "${S}"/daemon/cups-browsed.service + +} diff --git a/net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch b/net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch new file mode 100644 index 000000000000..f72d3919c037 --- /dev/null +++ b/net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch @@ -0,0 +1,34 @@ +Upstream: https://github.com/OpenPrinting/cups-browsed/commit/08af74bfbf9aa8ccab45a2ee74e95951839756ba.patch +From 08af74bfbf9aa8ccab45a2ee74e95951839756ba Mon Sep 17 00:00:00 2001 +From: Timo Gurr +Date: Wed, 27 Sep 2023 13:01:46 +0200 +Subject: [PATCH] cups-browsed.c: Fix build with avahi disabled (#20) + +Fixes #19 +--- + daemon/cups-browsed.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/daemon/cups-browsed.c b/daemon/cups-browsed.c +index b06461b4..c1e64fab 100644 +--- a/daemon/cups-browsed.c ++++ b/daemon/cups-browsed.c +@@ -400,6 +400,7 @@ typedef struct pagesize_count_s + int count; + } pagesize_count_t; + ++#ifdef HAVE_AVAHI + typedef struct resolver_args_s + { + AvahiIfIndex interface; +@@ -414,6 +415,7 @@ typedef struct resolver_args_s + AvahiLookupResultFlags flags; + void* userdata; + } resolver_args_t; ++#endif // HAVE_AVAHI + + typedef struct create_args_s + { +-- +2.41.0 + diff --git a/net-print/cups-browsed/metadata.xml b/net-print/cups-browsed/metadata.xml new file mode 100644 index 000000000000..1b9a77a07ab0 --- /dev/null +++ b/net-print/cups-browsed/metadata.xml @@ -0,0 +1,11 @@ + + + + + printing@gentoo.org + Gentoo Printing Project + + + OpenPrinting/cups-browsed + + -- 2.41.0