From patchwork Sat Jul 31 22:27:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1511980 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=N3BRGMX5; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 ozlabs.org (Postfix) with ESMTPS id 4Gcf6k0LYyz9srX for ; Sun, 1 Aug 2021 08:28:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B885140457; Sat, 31 Jul 2021 22:28:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YZcdSgIwjenx; Sat, 31 Jul 2021 22:28:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id E26E040415; Sat, 31 Jul 2021 22:28:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3FCF51BF2C1 for ; Sat, 31 Jul 2021 22:28:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3B22240415 for ; Sat, 31 Jul 2021 22:28:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gNCK4AhGCh0k for ; Sat, 31 Jul 2021 22:28:03 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9C5F340411 for ; Sat, 31 Jul 2021 22:28:03 +0000 (UTC) Received: by mail-io1-xd2a.google.com with SMTP id z7so15060645iog.13 for ; Sat, 31 Jul 2021 15:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4ZN15g+flu+kcM/jgDRvfkbRHfFp08wzWj5V5kGNZ6g=; b=N3BRGMX5bzejq3lRkH9pfIhWKy/B81CKlAgpbOVwJR0frS9cwsrNaGcRTrZmd+ttPq aHkeh/FCi7NvX8vK/IshULYP/SrQ6ynq0XWt5VNfrh/hqwBg9Fix68UBn+7GwStJYCdK QLHMFpu+0c62VjkjC4z9+LVuYQDiJ97mRhkdGz3rFf9lkCK2EiigaVDdOoRJ/4B2qbn9 vcbm00hS4QnmqwUqw05LGn9oSsv4ceOy9X4jIWbJGXzhOwRbl9lLXfvrxZBWXzl4cP3i m4MPSOXI1/2abiuF7yUn4oij8znO1UZtqVddBx2zYvXcirWwskGrKZPuQ4pXzXTyWx4R kcEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4ZN15g+flu+kcM/jgDRvfkbRHfFp08wzWj5V5kGNZ6g=; b=L5SiuRxN+oSFjB+cxLF71EoLZ5HkYkROEfXDNXV8SwfW+W8oVgDt9bmFiOsd3yGCiA /hjWJTMt7BjlEGPNUcLVjQfWUY0ybiGTjnHOSKqK84hHKJzAWeYRUL5no+sW58cv9ONM gFPFP6er31epfXpC3mz8DkvCta/ta3EL2Pj+6Q5VetlFeqq2uclbkaEui09DdHS/+JZ3 Kivsgq4Sd1cSrhfsh7fIvUFyWBLi2XLRnL084ZP9hskXDNZw/HqJiXUYbjLXaXAZ8CBw afvbdYZ6I477ElxoYUnKtPYLbtOcF4Q8a5EPdSs+OyiQkaPkwLMnnAq0LAw1EUm1R2xf Xo8Q== X-Gm-Message-State: AOAM532qYyyetY3EbmgOKs5eZhDhm4q37B7NouvrREn/QTifo7B/M4gN iZ91aQhjodWUiidv94HDsaa/TSdFnvc= X-Google-Smtp-Source: ABdhPJy+XIQyztw3egKPvLuPCMBP6A/BXMgKVDTNeiKSCEbX+eeRxFmtaJfEFw2F/vT0MGdacHVinQ== X-Received: by 2002:a02:c4cc:: with SMTP id h12mr5179529jaj.108.1627770482442; Sat, 31 Jul 2021 15:28:02 -0700 (PDT) Received: from james-x399.localdomain (97-118-178-184.hlrn.qwest.net. [97.118.178.184]) by smtp.gmail.com with ESMTPSA id u15sm3704971ion.34.2021.07.31.15.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Jul 2021 15:28:01 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 31 Jul 2021 16:27:52 -0600 Message-Id: <20210731222752.64315-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/1] package/system-config-printer: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Hilliard , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This package has some udev tools to assist with printer autodetection. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add autoreconf - add host-intltool for autoreconf Changes v1 -> v2: - update patch to merged upstream version --- package/Config.in | 1 + ...n-to-disable-xmlto-manual-generation.patch | 73 +++++++++++++++++++ package/system-config-printer/Config.in | 7 ++ .../system-config-printer.hash | 3 + .../system-config-printer.mk | 33 +++++++++ 5 files changed, 117 insertions(+) create mode 100644 package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch create mode 100644 package/system-config-printer/Config.in create mode 100644 package/system-config-printer/system-config-printer.hash create mode 100644 package/system-config-printer/system-config-printer.mk diff --git a/package/Config.in b/package/Config.in index 5941e35c05..fa916370f0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2120,6 +2120,7 @@ menu "Networking applications" source "package/ctorrent/Config.in" source "package/cups/Config.in" source "package/cups-filters/Config.in" + source "package/system-config-printer/Config.in" source "package/dante/Config.in" source "package/darkhttpd/Config.in" source "package/dehydrated/Config.in" diff --git a/package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch b/package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch new file mode 100644 index 0000000000..e2cf395811 --- /dev/null +++ b/package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch @@ -0,0 +1,73 @@ +From 731c8d7e1f9edb527785d61f74031a5e5846554b Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 25 Jul 2021 16:30:59 -0600 +Subject: [PATCH] Add option to disable xmlto manual generation. + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +95e0b461f5a46c74b00287aca65732ea2fc9d69b] +--- + Makefile.am | 7 ++++++- + configure.ac | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 843ba30d..7facab94 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -209,9 +209,11 @@ else + systemd_CLEANFILES= + endif + ++if XMLTO + man_MANS= \ + man/system-config-printer.1 \ + man/system-config-printer-applet.1 ++endif + + dbus_DATA = \ + dbus/com.redhat.NewPrinterNotification.conf \ +@@ -274,7 +276,6 @@ EXTRA_DIST=\ + $(bin_SCRIPTS) \ + setup.py \ + $(EXPORT_MODULES) \ +- man/system-config-printer.xml \ + $(dbus_DATA) \ + $(dbusinterfaces_DATA) \ + $(dbusservices_DATA) \ +@@ -297,12 +298,16 @@ EXTRA_DIST=\ + test_PhysicalDevice.py \ + $(appdata_in_files) + ++if XMLTO ++EXTRA_DIST+=man/system-config-printer.xml ++ + # The man pages are generated from DocBook XML. + .stamp-man-pages-built: $(top_srcdir)/man/system-config-printer.xml + xmlto man -o man $< + touch .stamp-man-pages-built + + $(man_MANS): .stamp-man-pages-built ++endif + + html: $(EXPORT_MODULES) $(EXPORT_MODULES_GEN) + rm -rf html +diff --git a/configure.ac b/configure.ac +index 811f897a..a2a66889 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,11 @@ if test "x$with_systemdsystemunitdir" != xno; then + fi + AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) + ++AC_ARG_WITH(xmlto, ++ [AC_HELP_STRING([--with-xmlto], ++ [Enable xmlto manual generation @<:@default=yes@:>@])]) ++AM_CONDITIONAL([XMLTO], [test x$with_xmlto != xno]) ++ + ALL_LINGUAS="ar as ast bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr fur gu he hi hr hu id is it ja kn ko lt lv mai ml mr ms nb nds nl nn oc or pa pl pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW" + AC_CONFIG_FILES([ + Makefile +-- +2.25.1 + diff --git a/package/system-config-printer/Config.in b/package/system-config-printer/Config.in new file mode 100644 index 0000000000..8ebc4d060c --- /dev/null +++ b/package/system-config-printer/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_SYSTEM_CONFIG_PRINTER + bool "system-config-printer" + depends on BR2_PACKAGE_CUPS + help + Graphical user interface for CUPS administration + + https://github.com/OpenPrinting/system-config-printer diff --git a/package/system-config-printer/system-config-printer.hash b/package/system-config-printer/system-config-printer.hash new file mode 100644 index 0000000000..56b7e47650 --- /dev/null +++ b/package/system-config-printer/system-config-printer.hash @@ -0,0 +1,3 @@ +# Locally calculated: +sha256 fbd226ce215bf014213dded81b43b9d4d90470524f5bf7cd21ecc71d4aefa689 system-config-printer-1.5.15.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/system-config-printer/system-config-printer.mk b/package/system-config-printer/system-config-printer.mk new file mode 100644 index 0000000000..05dd2f5b46 --- /dev/null +++ b/package/system-config-printer/system-config-printer.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# system-config-printer +# +################################################################################ + +SYSTEM_CONFIG_PRINTER_VERSION = 1.5.15 +SYSTEM_CONFIG_PRINTER_SOURCE = system-config-printer-$(SYSTEM_CONFIG_PRINTER_VERSION).tar.xz +SYSTEM_CONFIG_PRINTER_SITE = https://github.com/OpenPrinting/system-config-printer/releases/download/v$(SYSTEM_CONFIG_PRINTER_VERSION) +SYSTEM_CONFIG_PRINTER_LICENSE = GPL-2.0 +SYSTEM_CONFIG_PRINTER_LICENSE_FILES = COPYING +SYSTEM_CONFIG_PRINTER_DEPENDENCIES = cups host-intltool +SYSTEM_CONFIG_PRINTER_AUTORECONF = YES + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +SYSTEM_CONFIG_PRINTER_DEPENDENCIES += libglib2 +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2)$(BR2_PACKAGE_LIBUSB)$(BR2_PACKAGE_HAS_UDEV),yyy) +SYSTEM_CONFIG_PRINTER_CONF_OPTS = --with-udev-rules=yes +SYSTEM_CONFIG_PRINTER_DEPENDENCIES += libusb udev +else +SYSTEM_CONFIG_PRINTER_CONF_OPTS = --with-udev-rules=no +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SYSTEM_CONFIG_PRINTER_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +SYSTEM_CONFIG_PRINTER_DEPENDENCIES += systemd +else +SYSTEM_CONFIG_PRINTER_CONF_OPTS += --with-systemdsystemunitdir=no +endif + +$(eval $(autotools-package))