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 4fZzw84G6mz2yNV for ; Tue, 17 Mar 2026 17:48:40 +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) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4fZzw83t98z2xl1 for ; Tue, 17 Mar 2026 17:48:40 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) 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 4fZzw76Y5cz2C for ; Tue, 17 Mar 2026 17:48:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1773769719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=eedCXG7Aw2qhrZs76jbFklxUAEj+RMuXL0b48CBum2k=; b=PRrpdebiLXx6YVdiiz5C4Rm5XISV+rYUF5NSEtSaxJFoX57udJVb7UqFpnuMEbxd5totaV 6uT1pSWnrK0dJBBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1773769719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=eedCXG7Aw2qhrZs76jbFklxUAEj+RMuXL0b48CBum2k=; b=SmIM2EROO4p0uIfi8wktg76vLC/Kc3FMQIntSWCNqXLhWfwNSHMORpAaD0+6aGXCB1MJWJ WVCudvQ4T5B9SSnaOq0G2I55/ACsPLUeahlh8rX1s/M2FnEoqauwzGGmqKNp4Xuuyha/oS 280xAtmZb6EHVbBBmbreKm86/nA4u1MnlWw6MWgalbGE255kYB//cCUDae4KYyE/jpiEh3 b94ftmPjW4c0aKEBrt397C0tRn9GoyUYL0BtAclMwAaLRiArf0T/6ZTmBodk/0sazjfyVH 8LWLIE3RHIG6+c/+GMNR63TnAaDWfbCS+r8+VkX/8Dv2hvIr5YsPcipSzY5q8g== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4fZzw70S16z2y2f; Tue, 17 Mar 2026 17:48:39 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] The artwork of the ipfire project. branch, master, updated. b8b5b91ba1823f47dc9c97e288e29208c23eccce X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3cfd1dacb3c2ebe76f21a27f9af7d960e90fdcf5 X-Git-Newrev: b8b5b91ba1823f47dc9c97e288e29208c23eccce Message-Id: <4fZzw70S16z2y2f@people01.haj.ipfire.org> Date: Tue, 17 Mar 2026 17:48:38 +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 b8b5b91ba1823f47dc9c97e288e29208c23eccce (commit) via 22c7d4be91ec7db79460f50a2c809c7cc95fdb16 (commit) via 3fcb3297c8ee2d8272c074aede736ebfa0890fcd (commit) via 2aa2c720c14460ea685e7e927e79e53588e9a215 (commit) via d3db4254923a4564a074d7f5a26bc6f319bbacf5 (commit) via d326ceec86979293fb3327e3bfea2ef292b12f76 (commit) via 27805dc60d5dfde9208bf492477521418bf5bee6 (commit) from 3cfd1dacb3c2ebe76f21a27f9af7d960e90fdcf5 (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 b8b5b91ba1823f47dc9c97e288e29208c23eccce Author: Michael Tremer Date: Tue Mar 17 17:28:12 2026 +0000 logo: Simplify the SVG input file Signed-off-by: Michael Tremer commit 22c7d4be91ec7db79460f50a2c809c7cc95fdb16 Author: Michael Tremer Date: Tue Mar 17 17:24:12 2026 +0000 logos: Change the naming of the small logo as it is no longer square Signed-off-by: Michael Tremer commit 3fcb3297c8ee2d8272c074aede736ebfa0890fcd Author: Michael Tremer Date: Tue Mar 17 17:18:30 2026 +0000 logo: Rename "squared" to small There is no point in adding all the padding. Instead of being actually squared, this logo is actually more "small" in that it will need less width. Signed-off-by: Michael Tremer commit 2aa2c720c14460ea685e7e927e79e53588e9a215 Author: Michael Tremer Date: Tue Mar 17 17:11:45 2026 +0000 Makefile: Let rsvg-convert generate the final SVGs These files are much more compact and not so busy with unnecessary stuff that Inkscape generates. Signed-off-by: Michael Tremer commit d3db4254923a4564a074d7f5a26bc6f319bbacf5 Author: Michael Tremer Date: Tue Mar 17 17:02:05 2026 +0000 favicon: Generate the favicon only for the standard design Signed-off-by: Michael Tremer commit d326ceec86979293fb3327e3bfea2ef292b12f76 Author: Michael Tremer Date: Tue Mar 17 16:57:52 2026 +0000 favicon: Give it a white background Signed-off-by: Michael Tremer commit 27805dc60d5dfde9208bf492477521418bf5bee6 Author: Michael Tremer Date: Tue Mar 17 16:44:01 2026 +0000 Makefile: Use rsvg-convert to generate output files Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: Makefile | 141 +++++++++++++++++++++++++++++++------------------------- logo-small.svg | 30 ++++++++++++ logo-square.svg | 51 -------------------- logo.svg | 82 ++++++++------------------------ 4 files changed, 128 insertions(+), 176 deletions(-) create mode 100644 logo-small.svg delete mode 100644 logo-square.svg Difference in files: diff --git a/Makefile b/Makefile index 2ab4dd1..3b54bcd 100644 --- a/Makefile +++ b/Makefile @@ -3,38 +3,43 @@ STYLES = \ inverted \ monochrome -FILES = \ - logo.svg \ - logo.pdf \ - logo-512.png \ - logo-1024.png \ - logo-2048.png \ - logo-4096.png \ - \ - logo-square.pdf \ - logo-square.svg \ - logo-square-512x512.png \ - logo-square-1024x1024.png \ - logo-square-2048x2048.png \ - logo-square-4096x4096.png \ - \ - favicon.svg \ - favicon-16x16.png \ - favicon-32x32.png \ - favicon-64x64.png \ - favicon-128x128.png \ - favicon-256x256.png \ - \ - apple-touch-icon.png - -OBJECTS = \ - $(foreach style,$(STYLES),$(foreach file,$(FILES),$(style)/$(file))) +LOGOS = \ + logo \ + logo-small + +LOGO_SIZES = \ + 512 \ + 1024 \ + 2048 \ + 4096 + +# Render the logos as standalone SVG & PDF +OBJECTS += \ + $(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(style)/$(logo).svg)) \ + $(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(style)/$(logo).pdf)) + +# Render the logos as PNG in all desired sizes +OBJECTS += \ + $(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(foreach size,$(LOGO_SIZES),$(style)/$(logo)-$(size).png))) + +# The favicon only exists in the standard design +OBJECTS += \ + standard/favicon.svg \ + standard/favicon-16x16.png \ + standard/favicon-32x32.png \ + standard/favicon-64x64.png \ + standard/favicon-128x128.png \ + standard/favicon-256x256.png \ + standard/apple-touch-icon.png # Colors PRIMARY = ff2e52 DARK = 363636 WHITE = ffffff +# rsvg-convert command line +RSVG_CONVERT = rsvg-convert --keep-aspect-ratio + # Inkscape command line INKSCAPE = inkscape $< --export-filename=$@ @@ -68,88 +73,98 @@ endef all: $(OBJECTS) # Converts the logo to a plain SVG file without requiring the font -standard/logo.svg: logo.svg - $(TO_PATHS) - -%/logo.svg: logo-%.svg +%-standalone.svg: %.svg $(TO_PATHS) -standard/logo-square.svg: logo-square.svg - $(TO_PATHS) +# Converts the logo to PDF +%.pdf: %.svg + mkdir -p $(dir $@) + rsvg-convert --format=pdf1.7 $< > $@ -%/logo-square.svg: logo-square-%.svg - $(TO_PATHS) +standard/logo.svg: logo-standalone.svg + mkdir -p $(dir $@) && \ + $(RSVG_CONVERT) --format=svg $< > $@ -standard/favicon.svg: favicon.svg - $(TO_PATHS) +%/logo.svg: logo-%-standalone.svg + mkdir -p $(dir $@) && \ + $(RSVG_CONVERT) --format=svg $< > $@ -%/favicon.svg: favicon-%.svg - $(TO_PATHS) +standard/logo-small.svg: logo-small-standalone.svg + mkdir -p $(dir $@) && \ + $(RSVG_CONVERT) --format=svg $< > $@ -# Converts the logo to PDF -%.pdf: %.svg - mkdir -p $(dir $@) - $(INKSCAPE) +%/logo-small.svg: logo-small-%-standalone.svg + mkdir -p $(dir $@) && \ + $(RSVG_CONVERT) --format=svg $< > $@ # Converts the logo to PNG %/logo-512.png: %/logo.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=512 + $(RSVG_CONVERT) --format=png --width=512 $< > $@ %/logo-1024.png: %/logo.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=1024 + $(RSVG_CONVERT) --format=png --width=1024 $< > $@ %/logo-2048.png: %/logo.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=2048 + $(RSVG_CONVERT) --format=png --width=2048 $< > $@ %/logo-4096.png: %/logo.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=4096 + $(RSVG_CONVERT) --format=png --width=4096 $< > $@ + +# Converts the small logo to PNG +%/logo-small-512.png: %/logo-small.svg + mkdir -p $(dir $@) && \ + $(RSVG_CONVERT) --format=png --width=512 $< > $@ + +%/logo-small-1024.png: %/logo-small.svg + mkdir -p $(dir $@) && \ + $(RSVG_CONVERT) --format=png --width=1024 $< > $@ -# Converts the square logo to PNG -%/logo-square-512x512.png: %/logo-square.svg +%/logo-small-2048.png: %/logo-small.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=512 + $(RSVG_CONVERT) --format=png --width=2048 $< > $@ -%/logo-square-1024x1024.png: %/logo-square.svg +%/logo-small-4096.png: %/logo-small.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=1024 + $(RSVG_CONVERT) --format=png --width=4096 $< > $@ -%/logo-square-2048x2048.png: %/logo-square.svg +# Converts the favicon to SVG +standard/favicon.svg: favicon-standalone.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=2048 + $(RSVG_CONVERT) --format=svg --background-color="#$(WHITE)" $< > $@ -%/logo-square-4096x4096.png: %/logo-square.svg +%/favicon.svg: favicon-%-standalone.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=4096 + $(RSVG_CONVERT) --format=svg --background-color="#$(WHITE)" $< > $@ # Converts the favicon to PNG %/favicon-16x16.png: %/favicon.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=16 + $(RSVG_CONVERT) --format=png --width=16 --background-color="#$(WHITE)" $< > $@ %/favicon-32x32.png: %/favicon.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=32 + $(RSVG_CONVERT) --format=png --width=32 --background-color="#$(WHITE)" $< > $@ %/favicon-64x64.png: %/favicon.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=64 + $(RSVG_CONVERT) --format=png --width=64 --background-color="#$(WHITE)" $< > $@ %/favicon-128x128.png: %/favicon.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=128 + $(RSVG_CONVERT) --format=png --width=128 --background-color="#$(WHITE)" $< > $@ %/favicon-256x256.png: %/favicon.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=256 + $(RSVG_CONVERT) --format=png --width=256 --background-color="#$(WHITE)" $< > $@ # This is like the favicon but in 180x180px %/apple-touch-icon.png: %/favicon.svg mkdir -p $(dir $@) && \ - $(INKSCAPE) --export-width=180 + $(RSVG_CONVERT) --format=png --width=180 --background-color="#$(WHITE)" $< > $@ # Convert the logo to monochome only %-monochrome.svg: %.svg @@ -166,8 +181,8 @@ clean: rm -vf \ logo-inverted.svg \ logo-monochrome.svg \ - logo-square-inverted.svg \ - logo-square-monochrome.svg \ + logo-small-inverted.svg \ + logo-small-monochrome.svg \ favicon-inverted.svg \ favicon-monochrome.svg diff --git a/logo-small.svg b/logo-small.svg new file mode 100644 index 0000000..0ba77ba --- /dev/null +++ b/logo-small.svg @@ -0,0 +1,30 @@ + + + + + + IPFire + + diff --git a/logo-square.svg b/logo-square.svg deleted file mode 100644 index c4894ab..0000000 --- a/logo-square.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - IPFire - diff --git a/logo.svg b/logo.svg index 56eda25..fbd58ea 100644 --- a/logo.svg +++ b/logo.svg @@ -1,66 +1,24 @@ - - - + - - - - - - IPFire_ - + xmlns="http://www.w3.org/2000/svg"> + + + + IPFire_ hooks/post-receive -- The artwork of the ipfire project.