Merge branch 'main' into 'main'

port: Fix build error when building in a flatpak

See merge request jwestman/blueprint-compiler!235

blueprintcompiler/outputs/xml/xml_emitter.py

@@ -73,7 +73,6 @@ class XmlEmitter:
         self._needs_newline = False
 
     def put_cdata(self, text: str):
-        text = text.replace("]]>", "]]]]><![CDATA[>")
         self.result += f"<![CDATA[{text}]]>"
         self._needs_newline = False
 

tests/samples/list_factory_nested.blp

@@ -1,17 +0,0 @@
-using Gtk 4.0;
-
-Gtk.ListView {
-  factory: Gtk.BuilderListItemFactory list_item_factory {
-    template ListItem {
-      child: Gtk.ListView {
-        factory: Gtk.BuilderListItemFactory list_item_factory {
-          template ListItem {
-            child: Gtk.Label {
-              label: bind template.item as <$MyObject>.name;
-            };
-          }
-        };
-      };
-    }
-  };
-}

tests/samples/list_factory_nested.ui

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT EDIT!
-This file was @generated by blueprint-compiler. Instead, edit the
-corresponding .blp file and regenerate this file with blueprint-compiler.
--->
-<interface>
-  <requires lib="gtk" version="4.0"/>
-  <object class="GtkListView">
-    <property name="factory">
-      <object class="GtkBuilderListItemFactory" id="list_item_factory">
-        <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkListView">
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory" id="list_item_factory">
-            <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <binding name="label">
-          <lookup name="name" type="MyObject">
-            <lookup name="item" type="GtkListItem">
-              <constant>GtkListItem</constant>
-            </lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>]]]]><![CDATA[></property>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-</interface>]]></property>
-      </object>
-    </property>
-  </object>
-</interface>

tests/samples/list_factory_nested_dec.blp

@@ -1,18 +0,0 @@
-using Gtk 4.0;
-
-ListView {
-  factory: BuilderListItemFactory list_item_factory {
-    template ListItem {
-      child: ListView {
-        factory: BuilderListItemFactory list_item_factory {
-          template ListItem {
-            child: Label {
-              label: bind template.item as <$MyObject>.name;
-            };
-          }
-        };
-      };
-    }
-  };
-}
-