kicad-developers team mailing list archive

[John Beard <john.j.beard@xxxxxxxxx>]

Hi,

The SVGs for Catalan and Chinese did not match the XPM constant names,
so there were linking errors.

I'm not sure how this hasn't been causing breakages since 7841f8a466,
but presumably it only breaks if you have MAINTAIN_PNGs on *and* clean
something in a way most people don't, as the old CPPs persist.

Cheers,

John

From 2a6103b313ae567377dc20f9ea9fa6bbf004535c Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@xxxxxxxxx>
Date: Thu, 26 Jul 2018 15:43:31 +0100
Subject: [PATCH] Update CA and ZH source svg filename

These were updated in 7841f8a466, but the source
files seem to have not been changed.
---
 bitmaps_png/CMakeLists.txt                            | 4 ++--
 bitmaps_png/cpp_26/{lang_catalan.cpp => lang_ca.cpp}  | 0
 bitmaps_png/cpp_26/{lang_chinese.cpp => lang_zh.cpp}  | 0
 bitmaps_png/sources/{lang_catalan.svg => lang_ca.svg} | 0
 bitmaps_png/sources/{lang_chinese.svg => lang_zh.svg} | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename bitmaps_png/cpp_26/{lang_catalan.cpp => lang_ca.cpp} (100%)
 rename bitmaps_png/cpp_26/{lang_chinese.cpp => lang_zh.cpp} (100%)
 rename bitmaps_png/sources/{lang_catalan.svg => lang_ca.svg} (100%)
 rename bitmaps_png/sources/{lang_chinese.svg => lang_zh.svg} (100%)

diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 91b21d43f..6778a00a7 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -314,8 +314,7 @@ set( BMAPS_MID
     label2glabel
     label2text
     label
-    lang_catalan
-    lang_chinese
+    lang_ca
     lang_bg
     lang_cs
     lang_def
@@ -336,6 +335,7 @@ set( BMAPS_MID
     lang_sk
     lang_sl
     lang_lt
+    lang_zh
     language
     layers_manager
     leave_sheet
diff --git a/bitmaps_png/cpp_26/lang_catalan.cpp b/bitmaps_png/cpp_26/lang_ca.cpp
similarity index 100%
rename from bitmaps_png/cpp_26/lang_catalan.cpp
rename to bitmaps_png/cpp_26/lang_ca.cpp
diff --git a/bitmaps_png/cpp_26/lang_chinese.cpp b/bitmaps_png/cpp_26/lang_zh.cpp
similarity index 100%
rename from bitmaps_png/cpp_26/lang_chinese.cpp
rename to bitmaps_png/cpp_26/lang_zh.cpp
diff --git a/bitmaps_png/sources/lang_catalan.svg b/bitmaps_png/sources/lang_ca.svg
similarity index 100%
rename from bitmaps_png/sources/lang_catalan.svg
rename to bitmaps_png/sources/lang_ca.svg
diff --git a/bitmaps_png/sources/lang_chinese.svg b/bitmaps_png/sources/lang_zh.svg
similarity index 100%
rename from bitmaps_png/sources/lang_chinese.svg
rename to bitmaps_png/sources/lang_zh.svg
-- 
2.17.1