From 68aca191da04eff3f4182fc7f23ef1f49abc9201 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Fri, 8 Dec 2023 17:12:47 +0100
Subject: [PATCH 1/2] Windows: include cert.pem in .zip files

---
 scripts/deploy-win-mingw.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deploy-win-mingw.sh b/scripts/deploy-win-mingw.sh
index 746815a56..25d957977 100644
--- a/scripts/deploy-win-mingw.sh
+++ b/scripts/deploy-win-mingw.sh
@@ -277,7 +277,7 @@ echo "Making .zip file $zipname.zip .."
 
 rm -rf $zipname $zipname.zip
 mkdir $zipname
-cp -Rv *.dll .*-paths.txt db_plugins lay_plugins $plugins lib $zipname | sed -u 's/.*/echo -n ./' | sh
+cp -Rv *.dll cert.pem .*-paths.txt db_plugins lay_plugins $plugins lib $zipname | sed -u 's/.*/echo -n ./' | sh
 cp klayout.exe $zipname/klayout_app.exe
 cp klayout.exe $zipname/klayout_vo_app.exe
 echo ""

From 8ec3805c87c1f59284132b480da7ad0fc17260e0 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Fri, 8 Dec 2023 17:42:07 +0100
Subject: [PATCH 2/2] Fixed issue #1563

---
 src/lay/lay/layMacroController.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/lay/lay/layMacroController.cc b/src/lay/lay/layMacroController.cc
index 2eb517e76..657c0468b 100644
--- a/src/lay/lay/layMacroController.cc
+++ b/src/lay/lay/layMacroController.cc
@@ -56,6 +56,15 @@ MacroController::add_macro_category (const std::string &name, const std::string
   cat.name = name;
   cat.description = description;
   cat.folders = folders;
+
+  //  replace an existing category or add to back
+  for (auto c = m_macro_categories.begin (); c != m_macro_categories.end (); ++c) {
+    if (c->name == name) {
+      *c = cat;
+      return;
+    }
+  }
+
   m_macro_categories.push_back (cat);
 }