From patchwork Wed Jun 17 17:28:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311360 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=V13NC+oI; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBrG5NHXz9sRR for ; Thu, 18 Jun 2020 03:29:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2CCC28837C; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 37oQfis+JRch; Wed, 17 Jun 2020 17:28:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6848D8822C; Wed, 17 Jun 2020 17:28:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id AB8801BF278 for ; Wed, 17 Jun 2020 17:28:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A77B8891EA for ; Wed, 17 Jun 2020 17:28:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qaehaoAjQPA4 for ; Wed, 17 Jun 2020 17:28:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id 738E0891DB for ; Wed, 17 Jun 2020 17:28:55 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id l11so3246224wru.0 for ; Wed, 17 Jun 2020 10:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z03NmGBP4XghAGM/yR3RpAH4T/iVXTgTfCfIwxbnfXk=; b=V13NC+oIayAx1Ke9YQFG+D8+ovwcX627NYHV+fUGtblw4twWc1VS4UhQWku1uVzcGV TeqJkQM8HVKws9N8kerH61mIQztQEPpqRB1VJYP2T5bFAk2F92EamxxczHRvMZvy/FKF jOSClDfFFTFTbx5oPuZFOu2f0DvHIsWJKG7Xg= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z03NmGBP4XghAGM/yR3RpAH4T/iVXTgTfCfIwxbnfXk=; b=Xs7K78KrwkOIxe3R7iSTOZw2YjHSAf1OM2QEl5KUJblzC47gSNFrQYBUNJye76iHNA TUT+7jTyA+tMItXvk7oV6BxyWkP2BwraKcxj+1UPZXY7+1K6ay/CnZmV6OgMKHh2FWv2 WZRVmbDdxo4t0V0MTTSUt3MrQIb7TlQlRPJqNnyQT+KboiByHAS+zsJtiMg6RQFu61c9 wtDncozvyN38sOizvNqQrpM6q2DPklXIR7V2fTc6GFv7N/Xe+pKU+IdKeocIuxkUod+N K3tBbPFAeFxtVkzklUw9dTN0dM3sJaAZMNXPc/TB+p9Bw3pfy3ef6bvKicS0Yxj76IEb +3xQ== X-Gm-Message-State: AOAM531zAIjmOZxHUdeehJr4YL1kH3+ZjI4oaI/k8RnzzTekJY+vYOQU +vRYhp/P1U9DYdIkX4yuVMSDyzc9IJjKnQ== X-Google-Smtp-Source: ABdhPJwzXLbUQHSURLTvM97TdcVr5T4djLSyJ6I2q+kIcQjfZRy9W9yy8Kkcj9RuODhcZFg9gzn3Jg== X-Received: by 2002:adf:f611:: with SMTP id t17mr308887wrp.69.1592414933979; Wed, 17 Jun 2020 10:28:53 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:52 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:43 +0200 Message-Id: <20200617172848.2601-2-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/6] package/dejavu: Install dejavu fonts in staging dir 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Michael Trimarchi The dejavu fonts is used by cups-filters and needs to be installed in staging directory. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/dejavu/dejavu.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/dejavu/dejavu.mk b/package/dejavu/dejavu.mk index 9b57f0992e..be3d91f179 100644 --- a/package/dejavu/dejavu.mk +++ b/package/dejavu/dejavu.mk @@ -11,6 +11,7 @@ DEJAVU_LICENSE_FILES = LICENSE DEJAVU_FONTS_INSTALL = DEJAVU_FONTCONFIG_CONF_INSTALL = +DEJAVU_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_DEJAVU_MONO),y) DEJAVU_FONTS_INSTALL += DejaVuSansMono*.ttf @@ -50,6 +51,14 @@ define DEJAVU_FONTCONFIG_CONF_INSTALL_CMDS endef endif +define DEJAVU_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/share/fonts/dejavu/ + for i in $(DEJAVU_FONTS_INSTALL) ; do \ + $(INSTALL) -m 0644 $(@D)/ttf/$$i \ + $(STAGING_DIR)/usr/share/fonts/dejavu/ || exit 1 ; \ + done +endef + define DEJAVU_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/fonts/dejavu/ for i in $(DEJAVU_FONTS_INSTALL) ; do \ From patchwork Wed Jun 17 17:28:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311358 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=ITcmuXWe; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBrJ3cBzz9sTH for ; Thu, 18 Jun 2020 03:29:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 22D7289297; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kFeev6t7iOa0; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C6E3891DB; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6BC181BF278 for ; Wed, 17 Jun 2020 17:29:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6908A8750F for ; Wed, 17 Jun 2020 17:29:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gDZtNgqd4FTz for ; Wed, 17 Jun 2020 17:28:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5FE4F8741F for ; Wed, 17 Jun 2020 17:28:57 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id l17so2651491wmj.0 for ; Wed, 17 Jun 2020 10:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ppHypeDPY4F/0wF7UCnCCKs+bUvkCtt6n8RLRhRVpi4=; b=ITcmuXWeFaCGoBpXdkwLBjUT9fn6+DJHHzP6G+tfZ7JJb89Iya2Ah+VFkGsFer9L4I ktR0x8tykk7YvqHFI8sAkA+XvbmVjQcnDxexhpUEuLyhHv7GsUgKBnXlWVocjWO0HGvt 10sYD+AW0UjJOH58/6wJoIkxltDXnAgn4YK0o= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ppHypeDPY4F/0wF7UCnCCKs+bUvkCtt6n8RLRhRVpi4=; b=N8nAd8kD2fMSdRnYxNhfasgGShYO0BozFhxhdSxAWMHZ8b/E8ZDYerNLvjaL6MUhqQ MBX1UZuH00nZBMHLgGCiIU0NOxUNwnbueBq68oCjMMDBrs2cfO3ftoq8F9ATMWPZIgTU RVX81XtYmb12p7Rzjbtw2ftz+Z/RKUwg1jYIFGtFJ8yEIBUAMycbHfXFgg0X1YROVDdG tdw7MKNhRzI7eJ6gbCWJrouKIVbESDzhy69VIywPL3i3n5N21a7YuYTKhGUSg2h4LmvZ Olt4bLfqkeGnzHL+smdppgA+4k2R+HTivsjWRQDOdgv9S+8FI0IWKjAJtgxt24JnXNdS 263Q== X-Gm-Message-State: AOAM531Lqt9a1Jhvg/BqLEYZPNfxgGXxsApQInI31qUrISVns4zBc7v5 uC5wUcPDANopJl/v0HQQT9QPFhv5DaIVCQ== X-Google-Smtp-Source: ABdhPJxCfu5/wQYG7zKQmX0AbTmT41p69TjkmqAN8dk6vLBUMd/p5jVd0E5UhpeYLVyotiS9trQ+KQ== X-Received: by 2002:a7b:cb4c:: with SMTP id v12mr9470350wmj.43.1592414935314; Wed, 17 Jun 2020 10:28:55 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:54 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:44 +0200 Message-Id: <20200617172848.2601-3-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/6] package/cups-filters: bump to version 1.27.5 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps cups-filters to version 1.27.5. While bumping, fixing also the missing installation for the service files for cups-browsed. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups-filters/Config.in | 3 +++ package/cups-filters/S82cups-browsed | 23 +++++++++++++++++++++++ package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 20 +++++++++++++++++--- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 package/cups-filters/S82cups-browsed diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 9e4e37ca6b..26e8d4aa06 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,9 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_DEJAVU + select BR2_PACKAGE_DEJAVU_SANS + select BR2_PACKAGE_DEJAVU_SERIF select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE diff --git a/package/cups-filters/S82cups-browsed b/package/cups-filters/S82cups-browsed new file mode 100644 index 0000000000..c73ff1fbfa --- /dev/null +++ b/package/cups-filters/S82cups-browsed @@ -0,0 +1,23 @@ +#!/bin/sh + +case "$1" in + start) + printf "Starting cups-browsed: " + start-stop-daemon -S -q -m -p /var/run/cups-browsed.pid \ + -b -x cups-browsed -- -c /etc/cups/cups-browsed.conf + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping cups-browsed: " + start-stop-daemon -K -q -p /var/run/cups-browsed.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index 9e24abe393..61cb42a438 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488 cups-filters-1.26.0.tar.gz +sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6 cups-filters-1.27.5.tar.gz sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 1f17018bc5..20d4c68995 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,12 +4,12 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.26.0 +CUPS_FILTERS_VERSION = 1.27.5 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg +CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg dejavu CUPS_FILTERS_CONF_OPTS = \ --disable-mutool \ @@ -19,7 +19,10 @@ CUPS_FILTERS_CONF_OPTS = \ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ --with-sysroot=$(STAGING_DIR) \ --with-pdftops=pdftops \ - --with-jpeg + --with-jpeg \ + --with-rcdir=no \ + --with-fontdir=$(STAGING_DIR)/usr/share/fonts/ \ + --with-test-font-path=$(STAGING_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png @@ -71,4 +74,15 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +define CUPS_FILTERS_INSTALL_INIT_SYSV + @$(RM) $(TARGET_DIR)/etc/init.d/cups-browsed + $(INSTALL) -D -m 0755 package/cups-filters/S82cups-browsed \ + $(TARGET_DIR)/etc/init.d/S82cups-browsed +endef + +define CUPS_FILTERS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0755 $(@D)/utils/cups-browsed.service \ + $(TARGET_DIR)/usr/lib/systemd/system/cups-browsed.service +endef + $(eval $(autotools-package)) From patchwork Wed Jun 17 17:28:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311361 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=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=XPwWGAC5; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBrL4cNzz9sT2 for ; Thu, 18 Jun 2020 03:29:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E723187500; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fghpQWLF07YF; Wed, 17 Jun 2020 17:29:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A07C287645; Wed, 17 Jun 2020 17:29:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D99CA1BF278 for ; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BA0482040E for ; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rfjg91o5VgRx for ; Wed, 17 Jun 2020 17:28:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by silver.osuosl.org (Postfix) with ESMTPS id 88A1020409 for ; Wed, 17 Jun 2020 17:28:59 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id b82so2659426wmb.1 for ; Wed, 17 Jun 2020 10:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DmZJVsyRk+l1x9z9X0KTlHrov+x4AHtVplV/J70sDzE=; b=XPwWGAC57wWoaQCig0mN3QG1yPCQhZ8P4MaxS0uGBqesz1x2Ujs9EVx6PbFKr8JWHC rCqoVmzsKErIgI7A1jMgXBWXV2UcbH4WTVySF/LHjYLlYC8Wfsy+DlEhjyUbvC5JcExx V551+f4sJX2Zaq66au8cHdGMCy0KEo15RRG9M= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=DmZJVsyRk+l1x9z9X0KTlHrov+x4AHtVplV/J70sDzE=; b=NTbuU3uOSdhnbI4fi51xD2Gg5ZfKfRSuv3gm/4Te02BvjziH3JIEIkv6tXXz/tcN4Z gHaO3EAY1vaOGf5OJfYFDE/odjSZR28FYKmS0zEXHJlMNerAQpaEtaDxUwqJwrYUaUXm LpVaKHrzuQbxQH+0hsHv6hfTNJ9Ofqs8UcaoPP7JeVFD8dItL2xraQAT5b0AV33+jSI4 OXQ/JyQ4uMYqVwOcQ4WfQ4BF5wl8fXvNzVhPAzZ1SGwBTxQmzrpzojPv640JxqPd+asd Uf6zX4One3y3zJTBLwEIAzDdTuyq4dxCAG1AAXYhzFLYHAc0TmOcNlmf4NtxcnmG5Ulg 8gpA== X-Gm-Message-State: AOAM532HWSEgtqEUI4gm/wgHozbSApVs91p2PTdCtycqlsnsIfepY+WZ H/sjR7zYIME4E/mmkyJ6Tnuorpjb6ObhGQ== X-Google-Smtp-Source: ABdhPJwaSPRj9BcNjOMvLpwYz3seiQe1WlClBYspX+//lxFIfSfgudwUVVmk4pbxamY0KzSPa7kCYw== X-Received: by 2002:a1c:3bc2:: with SMTP id i185mr9900540wma.33.1592414936783; Wed, 17 Jun 2020 10:28:56 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:56 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:45 +0200 Message-Id: <20200617172848.2601-4-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/6] package/cups: bump to version 2.3.3 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps cups to version 2.3.3. While bumping, fixing also the wrong installation of service files: the rcdir was left to the default value, that means installing the service files into the wrong /etc/rcX.d directory. Adding also a simplified systemv service file for loading cupsd. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- ...move-man-from-BUILDDIRS-in-configure.patch | 8 ++++--- package/cups/0002-Do-not-use-genstrings.patch | 14 ++++++----- ...0004-Remove-PIE-flags-from-the-build.patch | 8 ++++--- package/cups/S81cupsd | 23 +++++++++++++++++++ package/cups/cups.hash | 2 +- package/cups/cups.mk | 11 +++++++-- 6 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 package/cups/S81cupsd diff --git a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch index b1ab7cbace..7fcf7133c8 100644 --- a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +++ b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch @@ -6,15 +6,17 @@ Subject: [PATCH] Remove man from BUILDDIRS in configure Signed-off-by: Bernd Kuhls [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- config-scripts/cups-common.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 -index fbba715..77d0f5c 100644 +index a460a73..d427acb 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 -@@ -446,7 +446,7 @@ AC_ARG_WITH(components, [ --with-components set components to build: +@@ -434,7 +434,7 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)" case "$COMPONENTS" in all) @@ -24,5 +26,5 @@ index fbba715..77d0f5c 100644 core) -- -2.8.1 +2.17.1 diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch index b3566b8b15..c7d6735b5f 100644 --- a/package/cups/0002-Do-not-use-genstrings.patch +++ b/package/cups/0002-Do-not-use-genstrings.patch @@ -16,23 +16,25 @@ genstrings call.] Signed-off-by: Thomas Petazzoni [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- ppdc/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 68bf6b2..d57a0c9 100644 +index 32e2e0b..7b18879 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -242,8 +242,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ +@@ -186,8 +186,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ + libcupsppdc.a $(LINKCUPSSTATIC) + $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - echo Generating localization strings... - ./genstrings >sample.c # -- -2.6.4 +2.17.1 diff --git a/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/package/cups/0004-Remove-PIE-flags-from-the-build.patch index 8401e133e9..c2765dff09 100644 --- a/package/cups/0004-Remove-PIE-flags-from-the-build.patch +++ b/package/cups/0004-Remove-PIE-flags-from-the-build.patch @@ -13,15 +13,17 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Olivier Schonken [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- Makedefs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makedefs.in b/Makedefs.in -index 3afef0a..299b297 100644 +index 5f1d32f..d669ea8 100644 --- a/Makedefs.in +++ b/Makedefs.in -@@ -148,7 +148,7 @@ IPPFIND_BIN = @IPPFIND_BIN@ +@@ -155,7 +155,7 @@ ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) \ $(ONDEMANDFLAGS) $(OPTIONS) ALL_DSOFLAGS = -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM) ALL_LDFLAGS = -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS) \ @@ -31,5 +33,5 @@ index 3afef0a..299b297 100644 ARFLAGS = @ARFLAGS@ BACKLIBS = @BACKLIBS@ -- -2.7.4 +2.17.1 diff --git a/package/cups/S81cupsd b/package/cups/S81cupsd new file mode 100644 index 0000000000..f527d55f1e --- /dev/null +++ b/package/cups/S81cupsd @@ -0,0 +1,23 @@ +#!/bin/sh + +case "$1" in + start) + printf "Starting cupsd: " + start-stop-daemon -S -q -m -p /var/run/cupsd.pid \ + -b -x cupsd -- -C /etc/cups/cupsd.conf -s /etc/cups/cups-files + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping cupsd: " + start-stop-daemon -K -q -p /var/run/cupsd.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/package/cups/cups.hash b/package/cups/cups.hash index 8f037c6420..2eb289e209 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce cups-2.3.1-source.tar.gz +sha256 261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee cups-2.3.3-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 a5d616e6322a9cb1a971e18765025edfca4f3cd9c0eafc32d6d2eb4b8c8787b5 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 18f01d8484..461e0d9143 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.3.1 +CUPS_VERSION = 2.3.3 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception @@ -21,7 +21,8 @@ CUPS_CONF_OPTS = \ --with-docdir=/usr/share/cups/doc-root \ --disable-gssapi \ --disable-pam \ - --libdir=/usr/lib + --libdir=/usr/lib \ + --with-rcdir=no CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ host-autoconf \ @@ -71,4 +72,10 @@ else CUPS_CONF_OPTS += --disable-avahi endif +define CUPS_INSTALL_INIT_SYSV + @$(RM) $(TARGET_DIR)/etc/init.d/cups + $(INSTALL) -D -m 0755 package/cups/S81cupsd \ + $(TARGET_DIR)/etc/init.d/S81cupsd +endef + $(eval $(autotools-package)) From patchwork Wed Jun 17 17:28:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311362 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=jVIDjXX6; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBrQ5v2Nz9sRR for ; Thu, 18 Jun 2020 03:29:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 55C438908A; Wed, 17 Jun 2020 17:29:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id naTxUpIUe0Zb; Wed, 17 Jun 2020 17:29:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C6315891EA; Wed, 17 Jun 2020 17:29:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 12C7A1BF278 for ; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0ABBE8766E for ; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XZbtkTp5Sf0o for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CCEBB87500 for ; Wed, 17 Jun 2020 17:28:59 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id e1so3228071wrt.5 for ; Wed, 17 Jun 2020 10:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q4Yp9z+5ZeYPPpfP/ow2jR5F40me0m+mOP/bcufnwpg=; b=jVIDjXX6g4AnUMs+t2MZRYR7Wp4eSoA+cnb1qu9t6ZpgfXDohP/1q3AJ/2r76l7G1C TzmQyW1BDUSGdMDdo2SPRTfkHxCBzYxQEQcMOdMrQ4iTrCwHskB4c+3qaIjwHFQmS2Rx sV3NzOwjyHN+pQfDb+AMCPO2l8FJH+PkVUYLY= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q4Yp9z+5ZeYPPpfP/ow2jR5F40me0m+mOP/bcufnwpg=; b=sGzbtYrYRsUj4oKVH5ycfp2wFB383g8ECAA3Zl8B2bxhVxT2JYwAbkeo0W2/DDfPHd iDWFUejztPId6Cgu8YuDRS2oYZdDWd/NT9MLx/M5FQPGm3R/2TniTzXujnMNNvBTJCw7 GY2xeu/hxKTh/Do1zs+nSjwQBKxDQBB1NXwqB2EAumiUmJDcZboeccwNIE4rH3CzGnA4 2ymk7yhI2ah2obvGSnreRQEbtCGIw3Pn7QVNK+Fn4zPXmpmfji7JG9wvT/lsCjE+lBhu P5NRk84CxifO7+gk0w+l2vsX/DO06OZGCyi4jmWyA5mPtylHsG5yDsBvIdCBbbJ7jlxG 6q2g== X-Gm-Message-State: AOAM5323o0YFIRCubSPC8Q2qI0gqa6nmad3dzlho86gbpHxTIYOuXd9b qANTX+68xo+3el5Q0o3mz2hA2Rho6trHyw== X-Google-Smtp-Source: ABdhPJyXtqwu8Rc8KDI7+NnssZZ6uXnaW9w1OqWhkF8CGQ2eip6UxAxsfXB2eJI/wHtTrvfPS51ofg== X-Received: by 2002:a5d:4d4d:: with SMTP id a13mr352752wru.252.1592414937889; Wed, 17 Jun 2020 10:28:57 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:57 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:46 +0200 Message-Id: <20200617172848.2601-5-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/6] package/cups: Add udev rules to assign usb printers group to lp 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch is based on patch from the rockchip tree: commit c8a337593660f27379c30248a11bf08dc8712113 Author: Jeffy Chen Date: Tue Nov 13 18:59:43 2018 +0800 package: cups: Add udev rules to assign usb printers' group to lp Change-Id: Ieae17deaa7d3623e1f0e1cc826871f1719d98d88 Signed-off-by: Jeffy Chen but fixes the missing lp user and group. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups/70-usb-printers.rules | 4 ++++ package/cups/cups.mk | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 package/cups/70-usb-printers.rules diff --git a/package/cups/70-usb-printers.rules b/package/cups/70-usb-printers.rules new file mode 100644 index 0000000000..537645523d --- /dev/null +++ b/package/cups/70-usb-printers.rules @@ -0,0 +1,4 @@ +# Allow USB printers in the lp group +# Match rules converted from usblp.c driver's usblp_ids +ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", GROUP="lp" +ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b8", ATTRS{idProduct}=="0202", GROUP="lp" diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 461e0d9143..d4356682bf 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -72,10 +72,24 @@ else CUPS_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +define CUPS_INSTALL_UDEV_RULES + $(INSTALL) -D -m 0644 package/cups/70-usb-printers.rules \ + $(TARGET_DIR)/lib/udev/rules.d/70-usb-printers.rules +endef + +CUPS_POST_INSTALL_TARGET_HOOKS += CUPS_INSTALL_UDEV_RULES +endif + define CUPS_INSTALL_INIT_SYSV @$(RM) $(TARGET_DIR)/etc/init.d/cups $(INSTALL) -D -m 0755 package/cups/S81cupsd \ $(TARGET_DIR)/etc/init.d/S81cupsd endef +define CUPS_USERS + lp -1 lp -1 * /var/spool/lpd /bin/false - lp + - - lpadmin -1 * - - - Printers admin group. +endef + $(eval $(autotools-package)) From patchwork Wed Jun 17 17:28:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311364 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=hms5QwD7; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBrS2bg0z9sT2 for ; Thu, 18 Jun 2020 03:29:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2EEE421537; Wed, 17 Jun 2020 17:29:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zA8p5clEn5FM; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B91FA214E6; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8DCBD1BF278 for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8A58887629 for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UraRUjM0P_MW for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 043448741F for ; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id r9so2653508wmh.2 for ; Wed, 17 Jun 2020 10:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lqZpQBar7L4AuGJXi3GgkM/ZZxmbF/zaghsHWwiTDn8=; b=hms5QwD7LRXtRZpM4FftZZBq78ccSYqqcgdlpYQI3VJM8VssCBcwModx0FQvSNFkbQ 7jYuUak1zLmpM1Y19/nFgMQ1HaYpYGreW4bh8AMAAlVrG69f5vgLcN4SfKNRPCqy1X9j BX/KUxWgFTWJ+DvCc5vdbo55REVDIzj/TOaUk= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lqZpQBar7L4AuGJXi3GgkM/ZZxmbF/zaghsHWwiTDn8=; b=suE5ECJSHSLNxHMnGXZ2FvpPuh3KA/5HxPOhrv0dRx9IGhYt3E7Vak3TOqM9P0xmdQ b//Bt2QGF3QR+5EU8zeuu8sScnnVMiU8btSHCMN/UWGVQz9BQ9QBy+NVXf1Fiz7J0Hrr UziBjtnwAPK27Gh3bT/PHLhX+YN2WupFNbaXPdUgbL/mn9AVcNNE99jUu+4ywYvviVcE rkZr3DiGsIqdZ8JWl5nUUTIohP2FS5fPWoOnnhNgrpeB5ZFBing8YkKF1BWL/LGEXWuY tkp/pHJlltNO7fA3njnelZ7wyM80ECBbBOGeWDITfLP7pRgDzcHyuPnCtAXJrOwz+acG eBrA== X-Gm-Message-State: AOAM531Vjr0F1zwEUHTWEkdjfotyFbQJRUNysMTAvoUF23k+uZl5wEND QlBTapzCqxQA0BXfU2tAbPmM4l0LqmW9sA== X-Google-Smtp-Source: ABdhPJxWZjRuGku0g0tp8yz5xUYWeAbz2nU4XCV6oeCXl3SEQf8iFDdCc1/ccgoCWbwvxtW9iJDDZg== X-Received: by 2002:a7b:c08f:: with SMTP id r15mr9456611wmh.6.1592414939152; Wed, 17 Jun 2020 10:28:59 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:58 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:47 +0200 Message-Id: <20200617172848.2601-6-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/6] package/cups: adding python support 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Enables python support if python is available. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups/cups.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index d4356682bf..c75a618941 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -72,6 +72,13 @@ else CUPS_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +CUPS_CONF_OPTS += --with-python +CUPS_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +else +CUPS_CONF_OPTS += --without-python +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) define CUPS_INSTALL_UDEV_RULES $(INSTALL) -D -m 0644 package/cups/70-usb-printers.rules \ From patchwork Wed Jun 17 17:28:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311363 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=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=XWlM7Ld4; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBrR6hNFz9sRR for ; Thu, 18 Jun 2020 03:29:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 79D8387604; Wed, 17 Jun 2020 17:29:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n-gYFZIMOCb3; Wed, 17 Jun 2020 17:29:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F3A5D87629; Wed, 17 Jun 2020 17:29:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5D3091BF278 for ; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5A8C520C45 for ; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x925fJONV3t4 for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 2197F20409 for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id r9so2653570wmh.2 for ; Wed, 17 Jun 2020 10:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vxqnclL+X5gXnsZAqo+6XcDXePO+cDYr/bb98I+mTlI=; b=XWlM7Ld4N3uJD/lrakBUy4D503/ft11hKIzbWsx9/fpHGgmccU72fDWddlrab5Go5M kwcEXtJ4GNVww2qeqtBW/aay0XR0lUJDxQlN8mlObrZu1nzk4HgwukdLSwZjNtqg7j5l Aocpn1mpa+0JvAmuBSvUV42B+fyqsxM+3sSQU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=vxqnclL+X5gXnsZAqo+6XcDXePO+cDYr/bb98I+mTlI=; b=PfpHed2TcAUTkyPp/sm1+2R/bdLbkuWImKMcK3dxy1oxK7LWBFB1bTlCVYn6i5o77K a7Ji4IXuSSGItKdQoksyU3FVNXNt7atoc+rHehlybzc/sQ1gaA1meYvzern37SbcQ1Aw pnFnkPUFggzFoNlrXwPLQkVXYbm6/2tvnZ0i0whupKWSMneFTfDnoCeIwV5Jn6hxslnG j41ItH0sAcJn+VTfsvpn27YJcBuz3G4aR0Dn56ssCyaO494xB53flLLIy4uYddvOo97k 4/kcX8ENsp2Y6Acy/TrvVFWYQdKetStw9DxO6Yapms0FRTqGMGV7gdqSB3hk9Uwf9HPf SMvg== X-Gm-Message-State: AOAM531vFfaP/uBl/nd/sXthgn+yrvzNdsCGhc3vjvIZNSW1T7WjTVNi ex9VdtBbK7hqWod+4OH1O6AzdjJjxdkztw== X-Google-Smtp-Source: ABdhPJxFmHL6yLyh9r5hKWXB3jVGRZMRLCPfExMS1YUBkp+EO6JOAajEpyFOAn6KrvW+JgnoLEm9Eg== X-Received: by 2002:a1c:4d0a:: with SMTP id o10mr9779773wmh.150.1592414940248; Wed, 17 Jun 2020 10:29:00 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:59 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:48 +0200 Message-Id: <20200617172848.2601-7-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/6] package/qt5: Enable cups support when BR2_PACKAGE_CUPS 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Cups support should be enabled in Qt if CUPS is available system wide. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/qt5/qt5base/qt5base.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 42d77306cc..c6b459a0e1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -23,7 +23,6 @@ QT5BASE_INSTALL_STAGING = YES # feature enabled QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-cups \ -no-iconv \ -system-zlib \ -system-pcre \ @@ -108,6 +107,13 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) QT5BASE_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_CUPS), y) +QT5BASE_DEPENDENCIES += cups +QT5BASE_CONFIGURE_OPTS += -cups +else +QT5BASE_CONFIGURE_OPTS += -no-cups +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)