From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4fXSP32HGtz333Q for ; Fri, 13 Mar 2026 15:01:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4fXSP31xtlz2xmt for ; Fri, 13 Mar 2026 15:01:27 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (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 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4fXSP22JDWz1qS for ; Fri, 13 Mar 2026 15:01:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1773414086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=RqVbrJu+DPDBD6UKUBlb9j6iZMutFCDpzASw22cgItg=; b=Ac6W9lxy222Ng71MxNfFvfUony3grQvbABZyqi7cPSyGOFReJ1KRwDQQxLhjK/rk3f2nvK q4GpdmeHb6EbJNBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1773414086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=RqVbrJu+DPDBD6UKUBlb9j6iZMutFCDpzASw22cgItg=; b=VfLg1KDDyBxvLxdbODUoTwatF2zRqr0tUnXZyrMg43834H4TfT9kvTFfbzL3cH3l0c9Ffe x1FDvvcA46+C68cJ1pR0UJt1XxrvEeUibCTCfzAb9CzcMCdH1JgQhvoQhkLDDMB4vwhJtS 74Cbu+SQabqnu4+u9qKhNl1qPuykuTMgD8iJR1/V5E/2zJgZLIyijFzyR4nL1B01iclof/ 4eJNtfjmHseNaOemOFSrmwWSvYEUWEypy7I6zcfc9Sd6FDah4vq5NpsmK8c9sovUHnRmnR O1Rhnvxzr28o6+4TAWzajSprhNcrqxtuFX641S6HmvDb+gpU61d5YM7HuMSKeQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4fXSP21K6hz2xGg; Fri, 13 Mar 2026 15:01:26 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] The artwork of the ipfire project. branch, master, updated. 9639dbe6ec8ed4c7c27b83da912b3611349def90 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 6eb64be1ad1d1bc37e2b09b379f0656700550cab X-Git-Newrev: 9639dbe6ec8ed4c7c27b83da912b3611349def90 Message-Id: <4fXSP21K6hz2xGg@people01.haj.ipfire.org> Date: Fri, 13 Mar 2026 15:01:26 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The artwork of the ipfire project.". The branch, master has been updated via 9639dbe6ec8ed4c7c27b83da912b3611349def90 (commit) via 48d1011f6015caf4a014cb37cc5e887be0b65ce3 (commit) via bc456d46b5474f2954d21a23f43c758b53f69122 (commit) via 2f44b88557f80a07dc6201d632522f5bfc2f6dcf (commit) via a906698afcefbbbccd44a02dba6631c0edf2e60e (commit) via 5fe6332f71700e2d319c09ff49d3c395a503fe73 (commit) via 11b9a0cd88a33d2438f278fbeaa0ff69a0779639 (commit) via b67c4905a73a2afedb7f7c7d86cd6a15de40fb01 (commit) from 6eb64be1ad1d1bc37e2b09b379f0656700550cab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9639dbe6ec8ed4c7c27b83da912b3611349def90 Author: Michael Tremer Date: Fri Mar 13 15:00:59 2026 +0000 logo: Simplify the filenames The NxN naming suggested that the logo was square which it actually isn't. Signed-off-by: Michael Tremer commit 48d1011f6015caf4a014cb37cc5e887be0b65ce3 Author: Michael Tremer Date: Fri Mar 13 14:59:56 2026 +0000 logo: Generate a 4096px version Signed-off-by: Michael Tremer commit bc456d46b5474f2954d21a23f43c758b53f69122 Author: Michael Tremer Date: Fri Mar 13 14:58:47 2026 +0000 Makefile: Create a target to upload all files Signed-off-by: Michael Tremer commit 2f44b88557f80a07dc6201d632522f5bfc2f6dcf Author: Michael Tremer Date: Fri Mar 13 14:31:41 2026 +0000 Makefile: Simplify listing files that should be generated Signed-off-by: Michael Tremer commit a906698afcefbbbccd44a02dba6631c0edf2e60e Author: Michael Tremer Date: Fri Mar 13 14:29:20 2026 +0000 favicon: Keep the rendered SVG file Signed-off-by: Michael Tremer commit 5fe6332f71700e2d319c09ff49d3c395a503fe73 Author: Michael Tremer Date: Fri Mar 13 14:22:20 2026 +0000 Makefile: Generate favicons in all designs, too The file has also been stripped from all the repetition so that it will be much shorter to add additional stuff. Signed-off-by: Michael Tremer commit 11b9a0cd88a33d2438f278fbeaa0ff69a0779639 Author: Michael Tremer Date: Fri Mar 13 14:21:56 2026 +0000 logo: Make the font of the logo slightly off-black Signed-off-by: Michael Tremer commit b67c4905a73a2afedb7f7c7d86cd6a15de40fb01 Author: Michael Tremer Date: Fri Mar 13 14:21:35 2026 +0000 favicon: Update the design to say "IPFire" Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: Makefile | 198 +++++++++++++++++++++++++++++++----------------------------- favicon.svg | 54 ++++++++++------- logo.svg | 2 +- 3 files changed, 136 insertions(+), 118 deletions(-) Difference in files: diff --git a/Makefile b/Makefile index bff88d3..22d8abd 100644 --- a/Makefile +++ b/Makefile @@ -1,133 +1,139 @@ -OBJECTS = \ - standard/logo.svg \ - standard/logo.pdf \ - standard/logo-512x512.png \ - standard/logo-1024x1024.png \ - standard/logo-2048x2048.png \ - standard/favicon-32x32.png \ - standard/favicon-64x64.png \ - standard/favicon-128x128.png \ - standard/favicon-256x256.png \ - \ - monochrome/logo.svg \ - monochrome/logo.pdf \ - monochrome/logo-512x512.png \ - monochrome/logo-1024x1024.png \ - monochrome/logo-2048x2048.png \ +STYLES = \ + standard \ + inverted \ + monochrome + +FILES = \ + logo.svg \ + logo.pdf \ + logo-512.png \ + logo-1024.png \ + logo-2048.png \ + logo-4096.png \ \ - inverted/logo.svg \ - inverted/logo.pdf \ - inverted/logo-512x512.png \ - inverted/logo-1024x1024.png \ - inverted/logo-2048x2048.png + favicon.svg \ + favicon-32x32.png \ + favicon-64x64.png \ + favicon-128x128.png \ + favicon-256x256.png \ + favicon-512x512.png + +OBJECTS = \ + $(foreach style,$(STYLES),$(foreach file,$(FILES),$(style)/$(file))) + +# Colors +PRIMARY = ff2e52 +DARK = 363636 +WHITE = ffffff # Inkscape command line INKSCAPE = inkscape $< --export-filename=$@ +# Macro to render fonts to paths so that we won't need to load the font +define TO_PATHS + mkdir -p $(dir $@) && \ + $(INKSCAPE) \ + --batch-process \ + --actions="select-all;object-to-path;export-plain-svg" +endef + +define TO_INVERTED + mkdir -p $(dir $@) && \ + sed \ + -e "s/fill=\"#$(DARK)\"/fill=\"#$(WHITE)\"/g" \ + -e "s/fill:#$(DARK)/fill:#$(WHITE)/g" \ + -e "s/stroke:[^;\"]*/stroke:none/g" \ + < $< > $@ +endef + +define TO_MONOCHROME + mkdir -p $(dir $@) && \ + sed \ + -e "s/fill:[^;\"]*/fill:#$(DARK)/g" \ + -e "s/fill=\"[^\"]*\"/fill=\"#$(DARK)\"/g" \ + -e "s/stroke:[^;\"]*/stroke:none/g" \ + < $< > $@ +endef + .PHONY: all all: $(OBJECTS) # Converts the logo to a plain SVG file without requiring the font standard/logo.svg: logo.svg - mkdir -p $(dir $@) - $(INKSCAPE) \ - --batch-process \ - --actions="select-all;object-to-path;export-plain-svg" + $(TO_PATHS) + +# Converts the logo to a plain SVG file without requiring the font +%/logo.svg: logo-%.svg + $(TO_PATHS) + +# Converts the favicon to a plain SVG file without requiring the font +standard/favicon.svg: favicon.svg + $(TO_PATHS) + +%/favicon.svg: favicon-%.svg + $(TO_PATHS) # Converts the logo to PDF -standard/logo.pdf: logo.svg +%/logo.pdf: %/logo.svg mkdir -p $(dir $@) $(INKSCAPE) -# Converts the logo to a transparent PNG image with 512x512 pixels -standard/logo-512x512.png: logo.svg - mkdir -p $(dir $@) +# Converts the logo to PNG +%/logo-512.png: %/logo.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=512 -standard/logo-1024x1024.png: logo.svg - mkdir -p $(dir $@) +%/logo-1024.png: %/logo.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=1024 -standard/logo-2048x2048.png: logo.svg - mkdir -p $(dir $@) +%/logo-2048.png: %/logo.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=2048 -standard/favicon-32x32.png: favicon.svg - mkdir -p $(dir $@) +%/logo-4096.png: %/logo.svg + mkdir -p $(dir $@) && \ + $(INKSCAPE) --export-width=4096 + +# Converts the favicon to PNG +%/favicon-32x32.png: %/favicon.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=32 -standard/favicon-64x64.png: favicon.svg - mkdir -p $(dir $@) +%/favicon-64x64.png: %/favicon.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=64 -standard/favicon-128x128.png: favicon.svg - mkdir -p $(dir $@) +%/favicon-128x128.png: %/favicon.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=128 -standard/favicon-256x256.png: favicon.svg - mkdir -p $(dir $@) +%/favicon-256x256.png: %/favicon.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=256 -# Convert the logo to monochome only -logo-monochrome.svg: logo.svg - sed "s/fill:[^;\"]*/fill:#000000/g; s/stroke:[^;\"]*/stroke:none/g" < $< > $@ - -# Converts the logo to a plain SVG file without requiring the font -monochrome/logo.svg: logo-monochrome.svg - mkdir -p $(dir $@) - $(INKSCAPE) \ - --batch-process \ - --actions="select-all;object-to-path;export-plain-svg" - -# Converts the logo to PDF -monochrome/logo.pdf: logo-monochrome.svg - mkdir -p $(dir $@) - $(INKSCAPE) - -# Converts the logo to a transparent PNG image with 512x512 pixels -monochrome/logo-512x512.png: logo-monochrome.svg - mkdir -p $(dir $@) - $(INKSCAPE) --export-width=512 - -monochrome/logo-1024x1024.png: logo-monochrome.svg - mkdir -p $(dir $@) - $(INKSCAPE) --export-width=1024 - -monochrome/logo-2048x2048.png: logo-monochrome.svg - mkdir -p $(dir $@) - $(INKSCAPE) --export-width=1024 - -# Convert the logo to use white only -logo-inverted.svg: logo.svg - sed "s/fill:[^;\"]*/fill:#ffffff/g; s/stroke:[^;\"]*/stroke:none/g" < $< > $@ - -# Converts the logo to a plain SVG file without requiring the font -inverted/logo.svg: logo-inverted.svg - mkdir -p $(dir $@) - $(INKSCAPE) \ - --batch-process \ - --actions="select-all;object-to-path;export-plain-svg" - -# Converts the logo to PDF -inverted/logo.pdf: logo-inverted.svg - mkdir -p $(dir $@) - $(INKSCAPE) - -# Converts the logo to a transparent PNG image with 512x512 pixels -inverted/logo-512x512.png: logo-inverted.svg - mkdir -p $(dir $@) +%/favicon-512x512.png: %/favicon.svg + mkdir -p $(dir $@) && \ $(INKSCAPE) --export-width=512 -inverted/logo-1024x1024.png: logo-inverted.svg - mkdir -p $(dir $@) - $(INKSCAPE) --export-width=1024 +# Convert the logo and favicon to monochome only +%-monochrome.svg: %.svg + $(TO_MONOCHROME) -inverted/logo-2048x2048.png: logo-inverted.svg - mkdir -p $(dir $@) - $(INKSCAPE) --export-width=1024 +# Convert the logo and favicon to use white only +%-inverted.svg: %.svg + $(TO_INVERTED) .PHONY: clean clean: # Remove all generated objects rm -vf $(OBJECTS) - rm -vf logo-inverted.svg logo-monochrome.svg + rm -vf logo-inverted.svg logo-monochrome.svg favicon-inverted.svg favicon-monochrome.svg + +.PHONY: upload +upload: $(OBJECTS) + rsync -avHz --progress --delete --delete-excluded \ + $(addprefix --filter="+ ",$(STYLES)) \ + $(addprefix --filter="+ ",$(OBJECTS)) \ + --filter="- */" --filter="- *" \ + . people.ipfire.org:/pub/artwork/ diff --git a/favicon.svg b/favicon.svg index 48eafbd..31117e5 100644 --- a/favicon.svg +++ b/favicon.svg @@ -1,26 +1,38 @@ - - - -