From 7bed0cf60c010a33de490812723677232ac961f8 Mon Sep 17 00:00:00 2001
From: Uchi <>
Date: Sat, 25 May 2024 07:37:14 +0200
Subject: [PATCH] Move notoemoji to its own font folder

---
 .../fonts}/OFL.txt                               |   0
 .../fonts}/README.txt                            |   2 +-
 .../fonts}/notoemoji-bold.ttf                    | Bin
 .../fonts}/notoemoji-regular.ttf                 | Bin
 derivation.nix                                   |  15 +++++++++++++++
 misc/tools/all/release.subr                      |   4 +++-
 misc/tools/xzipdiff                              |   1 +
 release.cmake                                    |   1 +
 8 files changed, 21 insertions(+), 2 deletions(-)
 rename data/{font-xolonium.pk3dir/fonts/notoemoji => font-notoemoji.pk3dir/fonts}/OFL.txt (100%)
 rename data/{font-xolonium.pk3dir/fonts/notoemoji => font-notoemoji.pk3dir/fonts}/README.txt (84%)
 rename data/{font-xolonium.pk3dir/fonts/notoemoji => font-notoemoji.pk3dir/fonts}/notoemoji-bold.ttf (100%)
 rename data/{font-xolonium.pk3dir/fonts/notoemoji => font-notoemoji.pk3dir/fonts}/notoemoji-regular.ttf (100%)

diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/OFL.txt b/data/font-notoemoji.pk3dir/fonts/OFL.txt
similarity index 100%
rename from data/font-xolonium.pk3dir/fonts/notoemoji/OFL.txt
rename to data/font-notoemoji.pk3dir/fonts/OFL.txt
diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/README.txt b/data/font-notoemoji.pk3dir/fonts/README.txt
similarity index 84%
rename from data/font-xolonium.pk3dir/fonts/notoemoji/README.txt
rename to data/font-notoemoji.pk3dir/fonts/README.txt
index 9da3d24e..0a853126 100644
--- a/data/font-xolonium.pk3dir/fonts/notoemoji/README.txt
+++ b/data/font-notoemoji.pk3dir/fonts/README.txt
@@ -1,7 +1,7 @@
 Noto Emoji Variable Font
 ========================
 
-This font provided by Google Fonts is used as a fallback font for Xolonium to display all kinds of emoticons.
+This font provided by Google Fonts is used as a fallback font to display all kinds of emoticons.
 The fonts have been transformed using FontForge to fit the dimensions of Xonotic using the following options:
 1. Origin: Glyph origin, Scale Uniformly: 80%
 2. Origin: Glyph origin, Move: 112
diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-bold.ttf b/data/font-notoemoji.pk3dir/fonts/notoemoji-bold.ttf
similarity index 100%
rename from data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-bold.ttf
rename to data/font-notoemoji.pk3dir/fonts/notoemoji-bold.ttf
diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-regular.ttf b/data/font-notoemoji.pk3dir/fonts/notoemoji-regular.ttf
similarity index 100%
rename from data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-regular.ttf
rename to data/font-notoemoji.pk3dir/fonts/notoemoji-regular.ttf
diff --git a/derivation.nix b/derivation.nix
index 35051b97..1d082882 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -26,6 +26,9 @@ let
 
         srcs."data/font-xolonium" = localFiles ./data/font-xolonium.pk3dir;
         vers."data/font-xolonium" = "xonotic-${VERSION}";
+		
+		srcs."data/font-notoemoji" = localFiles ./data/font-notoemoji.pk3dir;
+        vers."data/font-notoemoji" = "xonotic-${VERSION}";
 
 
         # https://gitlab.com/xonotic/d0_blind_id
@@ -179,6 +182,18 @@ let
                 cp -r $src $out
             '';
         };
+		
+        font-notoemoji = mkDerivation rec {
+            name = "font-notoemoji-${version}";
+            version = vers."data/font-notoemoji";
+
+            src = srcs."data/font-notoemoji";
+
+            phases = [ "installPhase" ];
+            installPhase = ''
+                cp -r $src $out
+            '';
+        };
 
         d0_blind_id = mkDerivation rec {
             name = "d0_blind_id-${version}";
diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 54f7c8c5..69c7bf70 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -601,6 +601,7 @@ case "$cmd" in
 		release_common
 		verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir      raw ''
 		verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir     raw ''
+		verbose "$SELF" release-buildpk3s data/font-notoemoji.pk3dir    raw ''
 		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             normaldds ''                    normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             normaldds '' mapping '-mapping' normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw ''
@@ -648,7 +649,8 @@ case "$cmd" in
 			Xonotic/server \
 			Xonotic/key_0.d0pk \
 			Xonotic/data/font-unifont-$pk3stamp.pk3 \
-			Xonotic/data/font-xolonium-$pk3stamp.pk3
+			Xonotic/data/font-xolonium-$pk3stamp.pk3 \
+			Xonotic/data/font-notoemoji-$pk3stamp.pk3
 		verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip
 		verbose mkzipr Xonotic-$stamp-source.zip \
 			Xonotic/source/d0_blind_id/ \
diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index ad2ffa61..070cbec2 100755
--- a/misc/tools/xzipdiff
+++ b/misc/tools/xzipdiff
@@ -20,6 +20,7 @@ excludes="
 	Xonotic/data/font-nimbussansl-*.pk3
 	Xonotic/data/font-unifont-*.pk3
 	Xonotic/data/font-xolonium-*.pk3
+	Xonotic/data/font-notoemoji-*.pk3
 "
 
 makepatchname()
diff --git a/release.cmake b/release.cmake
index e1c41973..79c3c584 100644
--- a/release.cmake
+++ b/release.cmake
@@ -209,6 +209,7 @@ deftransform(mapping
 
 buildpk3s(font-unifont.pk3dir "raw\;")
 buildpk3s(font-xolonium.pk3dir "raw\;")
+buildpk3s(font-notoemoji.pk3dir "raw\;")
 buildpk3s(xonotic-data.pk3dir "low\;-low" "normaldds\;" "normal\;-high")
 buildpk3s(xonotic-maps.pk3dir "low\;-low" "normaldds\;" "normal\;-high" "mapping\;-mapping")
 buildpk3s(xonotic-music.pk3dir "raw\;" "low\;-low")
-- 
2.39.2