From patchwork Wed May 6 22:29:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Tojnar X-Patchwork-Id: 1285915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=qFPxpDdz; 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=VoYnv8FY; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 49JNyV2P2Bz9sSk for ; Fri, 8 May 2020 18:38:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tJZumQgTylF6EK/4f5IwpZ5mbnHo6SBofc6DGh3e4Ys=; b=qFPxpDdz7qEbRS 8SCXBidXG72u/Timrb6D0PexxQfmUTmwvhE1qSFfYB7KAvR32lJjVkcFimM1ZeaLXMp/wd/9kJvUZ SW2Kb4vBoO2wftY8jLrxe8Vm7njB94cYpoGjQdFszDec7bIbfTNNwt6xccTqfpzRosUUQAvAr6JWK idSVN8GFpjO1nB9kZHMU67SLbuFPmh6cenk6KHsNAOXCBCuABYjxViO0rhp4Lb6e53/0QxPW+40vG Yq9dLMnXuVlVqg4642RDrav8Y9sQnyTasqBfFOLXA7Aay1kIK49Rmc+XBC3OQLWPkE8nwyhfXi1T/ 9oLvFDElgKjgwgeriKew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWyW4-0000mT-S7; Fri, 08 May 2020 08:37:56 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWSYs-0005lP-Dm for hostap@lists.infradead.org; Wed, 06 May 2020 22:30:44 +0000 Received: by mail-wr1-x444.google.com with SMTP id l18so4031252wrn.6 for ; Wed, 06 May 2020 15:30:41 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kakj2VsW+z2Izsf5Zn3GECjPFuR0I3BbErnrYzkbSXM=; b=VoYnv8FYUwRZtm90LFxfrzXkTzXdOtithqiFUjQ5Jwdd7Joe+V1Z0rx2RqJ9Ds4e9S 3I/0kfwnR/pf6zyZN1ubLWmyQjzomKBxfKw6DqrDF3WJGlQZhhqUV3Kd7PSoPn/B6b0Y ad/tTLEpNCkca5bgzNXttABfN37ctWrK0fUcM65ZpsOdV38Nk5HTMnhqFaZJ9q+2ng8E SlyjWpWKThgfe27JD28qnqOu2acDUmBfnRCJ8M0bahI3WBTdAUcRBrnv0b/qoBfVAdGV tlYh5CQCqgdPOHd0aCDFjBXU4ktyGoycmYKcVXrShCVhVf31UkCuWfmEgmhx4V0v+Pgh WzkA== 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=Kakj2VsW+z2Izsf5Zn3GECjPFuR0I3BbErnrYzkbSXM=; b=nB6+DqQw/7WwCD1aVsYruwZEaDI67NFOXwaIMVIr5rVRRmZGJLqvhE3wK8METpfHi4 pMAt6LEGc7bao47fnMmArdsIiAp/9gc+3iGkNgIXxCiUt03rq6rBV14d+sP3BujeUW0i tu+soaSxNvfJzVylmKSPVjsTBQmiK7q8VsQmLFwa+YI5y6CynSW0JXx7jToVb/DAbWCz SEW8esZRaDSG04Q7Iqx5Ad8JvKAJUgeSvTjONL+UP2WqJUhvB0iuaSoAApa3hYJ1f7st 26NKO/lghiOm6e4niOwQuC47bbR5Pt+HHBV4cU9E/PqsX3aHi86b7BCb/+atC/rrUUHJ jh2w== X-Gm-Message-State: AGi0PuYPb1AsQJOwyZWh06wfViSCRT4M4ZC60yaqOe6Hw6uOHPc6Nxc+ EWRsWZEFtt+2zJIP2nag3twU+CJo X-Google-Smtp-Source: APiQypJBiYTeTP29m4qfhDnzr3LIY41uvih+Pb6+WbzRW4MtxSlPjkiZfpgIzCWDVVXfWBNA/5rpwg== X-Received: by 2002:a5d:6144:: with SMTP id y4mr11172145wrt.233.1588804240323; Wed, 06 May 2020 15:30:40 -0700 (PDT) Received: from kaiser.localdomain (ip-89-177-205-133.net.upcbroadband.cz. [89.177.205.133]) by smtp.gmail.com with ESMTPSA id q8sm4861828wmg.22.2020.05.06.15.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 15:30:39 -0700 (PDT) From: Jan Tojnar To: hostap@lists.infradead.org Subject: [PATCH] wpa_gui: Fix build with Inkscape 1.0 Date: Thu, 7 May 2020 00:29:53 +0200 Message-Id: <20200506222953.30263-1-jtojnar@gmail.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200505175947.22494-1-jtojnar@gmail.com> References: <20200505175947.22494-1-jtojnar@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200506_153042_492047_F9784D2B X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [jtojnar[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Mailman-Approved-At: Fri, 08 May 2020 01:37:54 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Tojnar Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Inkscape 1.0 revamped their CLI flags, breaking the icon build. https://wiki.inkscape.org/wiki/index.php?title=Using_the_Command_Line#Background Signed-off-by: Jan Tojnar --- wpa_supplicant/wpa_gui-qt4/icons/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/wpa_gui-qt4/icons/Makefile b/wpa_supplicant/wpa_gui-qt4/icons/Makefile index 709514c..cd3df9f 100644 --- a/wpa_supplicant/wpa_gui-qt4/icons/Makefile +++ b/wpa_supplicant/wpa_gui-qt4/icons/Makefile @@ -5,14 +5,28 @@ SIZES := 16x16 22x22 32x32 48x48 64x64 128x128 ICONS := $(addsuffix .png, $(foreach name, $(NAMES), $(foreach size, $(SIZES), $(size)/$(name)))) ICONS += $(addsuffix .xpm, $(NAMES)) +ifeq (, $(shell command -v inkscape)) +$(error "No inkscape in PATH, it is required for exporting icons.") +else +ifeq (0, $(shell inkscape --without-gui 1>&2 2> /dev/null; echo $$?)) +# Inkscape < 1.0 +INKSCAPE_GUI_FLAG := --without-gui +INKSCAPE_OUTPUT_FLAG := --export-png +else +# Inkscape ≥ 1.0 +INKSCAPE_GUI_FLAG := +INKSCAPE_OUTPUT_FLAG := --export-filename +endif +endif + all: $(ICONS) %.png: mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/ - inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \ + inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) $(INKSCAPE_GUI_FLAG) \ --export-width=$(word 1, $(subst x, , $(@))) \ --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \ - --export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@)) + $(INKSCAPE_OUTPUT_FLAG)=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@)) %.xpm: mkdir -p pixmaps/