From 6ba86451c7373b73759e338ead44d691357aa6a5 Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Sun, 19 Feb 2023 20:19:31 +0100
Subject: [PATCH] Cleanups

---
 data/library_placeholder.svg | 29 ++++++++++++++---------------
 hu.kramo.Cartridges.json     | 15 ++++++++++++++-
 python3-PyYAML.json          | 14 --------------
 3 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 python3-PyYAML.json

diff --git a/data/library_placeholder.svg b/data/library_placeholder.svg
index 5f6e956..7ebfbad 100644
--- a/data/library_placeholder.svg
+++ b/data/library_placeholder.svg
@@ -1,16 +1,15 @@
-<svg width="200" height="300" viewBox="0 0 200 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="200" height="300" fill="url(#paint0_linear_1_2)"/>
-<g clip-path="url(#clip0_1_2)">
-<path d="M49 169.125V185.062C49 193.853 56.147 201 64.9375 201H68.125C75.1724 201 80.875 195.297 80.875 188.25C80.875 181.203 86.5776 175.5 93.625 175.5C100.672 175.5 106.375 181.203 106.375 188.25C107.247 196.169 114.394 201.872 122.312 201C131.103 201 138.25 193.878 138.25 185.062V169.125C138.25 155.03 126.845 143.625 112.75 143.625H74.5C60.4053 143.625 49 155.03 49 169.125ZM69.7188 156.375H72.9062C73.7778 156.375 74.5 157.097 74.5 157.969V162.75H79.2812C80.1528 162.75 80.875 163.472 80.875 164.344V167.531C80.875 168.428 80.1528 169.125 79.2812 169.125H74.5V173.906C74.5 174.803 73.7778 175.5 72.9062 175.5H69.7188C68.8223 175.5 68.125 174.803 68.125 173.906V169.125H63.3438C62.4473 169.125 61.75 168.428 61.75 167.531V164.344C61.75 163.472 62.4473 162.75 63.3438 162.75H68.125V157.969C68.125 157.097 68.8223 156.375 69.7188 156.375ZM109.562 161.156C112.202 161.156 114.344 163.298 114.344 165.938C114.344 168.577 112.202 170.719 109.562 170.719C106.923 170.719 104.781 168.577 104.781 165.938C104.781 163.298 106.923 161.156 109.562 161.156ZM122.312 167.531C124.952 167.531 127.094 169.673 127.094 172.312C127.094 174.952 124.952 177.094 122.312 177.094C119.673 177.094 117.531 174.952 117.531 172.312C117.531 169.673 119.673 167.531 122.312 167.531Z" fill="#241F31"/>
-<path d="M61.75 118.225C61.7998 128.783 70.416 137.3 80.9746 137.25H131.775C142.384 137.25 151 128.634 151 118.025C150.95 107.467 142.334 98.9502 131.775 99H80.9746C70.3662 99 61.75 107.616 61.75 118.225ZM82.2695 105.375H85.457C86.3286 105.375 87.0508 106.097 87.0508 106.969V111.75H91.832C92.7036 111.75 93.4258 112.472 93.4258 113.344V116.531C93.4258 117.428 92.7036 118.125 91.832 118.125H87.0508V122.906C87.0508 123.803 86.3286 124.5 85.457 124.5H82.2695C81.373 124.5 80.6758 123.803 80.6758 122.906V118.125H75.8945C74.998 118.125 74.3008 117.428 74.3008 116.531V113.344C74.3008 112.472 74.998 111.75 75.8945 111.75H80.6758V106.969C80.6758 106.097 81.373 105.375 82.2695 105.375ZM122.113 110.156C124.753 110.156 126.895 112.298 126.895 114.938C126.895 117.577 124.753 119.719 122.113 119.719C119.474 119.719 117.332 117.577 117.332 114.938C117.332 112.298 119.474 110.156 122.113 110.156ZM134.863 110.355C137.503 110.355 139.645 112.497 139.645 115.137C139.645 117.776 137.503 119.918 134.863 119.918C132.224 119.918 130.082 117.776 130.082 115.137C130.082 112.497 132.224 110.355 134.863 110.355Z" fill="#241F31"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1_2" x1="100" y1="0" x2="100" y2="300" gradientUnits="userSpaceOnUse">
-<stop stop-color="#DEDDDA"/>
-<stop offset="1" stop-color="#9A9996"/>
-</linearGradient>
-<clipPath id="clip0_1_2">
-<rect width="102" height="102" fill="white" transform="translate(49 99)"/>
-</clipPath>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="300" fill="none">
+    <path fill="url(#a)" d="M0 0h200v300H0z"/>
+    <g fill="#241F31" clip-path="url(#b)">
+        <path d="M49 169.125v15.937C49 193.853 56.147 201 64.938 201h3.187c7.047 0 12.75-5.703 12.75-12.75s5.703-12.75 12.75-12.75 12.75 5.703 12.75 12.75c.872 7.919 8.019 13.622 15.937 12.75 8.791 0 15.938-7.122 15.938-15.938v-15.937c0-14.095-11.405-25.5-25.5-25.5H74.5c-14.095 0-25.5 11.405-25.5 25.5Zm20.719-12.75h3.187c.872 0 1.594.722 1.594 1.594v4.781h4.781c.872 0 1.594.722 1.594 1.594v3.187c0 .897-.722 1.594-1.594 1.594H74.5v4.781c0 .897-.722 1.594-1.594 1.594H69.72a1.573 1.573 0 0 1-1.594-1.594v-4.781h-4.781a1.573 1.573 0 0 1-1.594-1.594v-3.187c0-.872.697-1.594 1.594-1.594h4.781v-4.781c0-.872.697-1.594 1.594-1.594Zm39.843 4.781a4.783 4.783 0 0 1 4.782 4.782 4.783 4.783 0 0 1-4.782 4.781 4.783 4.783 0 0 1-4.781-4.781 4.783 4.783 0 0 1 4.781-4.782Zm12.75 6.375a4.783 4.783 0 0 1 4.782 4.781 4.783 4.783 0 0 1-4.782 4.782 4.783 4.783 0 0 1-4.781-4.782 4.783 4.783 0 0 1 4.781-4.781ZM61.75 118.225c.05 10.558 8.666 19.075 19.225 19.025h50.8c10.609 0 19.225-8.616 19.225-19.225-.05-10.558-8.666-19.075-19.225-19.025h-50.8c-10.609 0-19.225 8.616-19.225 19.225Zm20.52-12.85h3.187c.872 0 1.594.722 1.594 1.594v4.781h4.781c.872 0 1.594.722 1.594 1.594v3.187c0 .897-.722 1.594-1.594 1.594h-4.781v4.781c0 .897-.722 1.594-1.594 1.594h-3.188a1.573 1.573 0 0 1-1.593-1.594v-4.781h-4.782a1.573 1.573 0 0 1-1.593-1.594v-3.187c0-.872.697-1.594 1.593-1.594h4.782v-4.781c0-.872.697-1.594 1.593-1.594Zm39.843 4.781a4.783 4.783 0 0 1 4.782 4.782 4.783 4.783 0 0 1-4.782 4.781 4.783 4.783 0 0 1-4.781-4.781 4.783 4.783 0 0 1 4.781-4.782Zm12.75.199a4.783 4.783 0 0 1 4.782 4.782 4.783 4.783 0 0 1-4.782 4.781 4.783 4.783 0 0 1-4.781-4.781 4.783 4.783 0 0 1 4.781-4.782Z"/>
+    </g>
+    <defs>
+        <linearGradient id="a" x1="100" x2="100" y1="0" y2="300" gradientUnits="userSpaceOnUse">
+            <stop stop-color="#DEDDDA"/>
+            <stop offset="1" stop-color="#9A9996"/>
+        </linearGradient>
+        <clipPath id="b">
+            <path fill="#fff" d="M49 99h102v102H49z"/>
+        </clipPath>
+    </defs>
 </svg>
diff --git a/hu.kramo.Cartridges.json b/hu.kramo.Cartridges.json
index 8f5bb2e..82130da 100644
--- a/hu.kramo.Cartridges.json
+++ b/hu.kramo.Cartridges.json
@@ -29,7 +29,20 @@
         "*.a"
     ],
     "modules" : [
-        "python3-PyYAML.json",
+        {
+            "name": "python3-PyYAML",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"PyYAML>=6.0\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz",
+                    "sha256": "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"
+                }
+            ]
+        },
         {
             "name": "blueprint-compiler",
             "buildsystem": "meson",
diff --git a/python3-PyYAML.json b/python3-PyYAML.json
deleted file mode 100644
index 8393db4..0000000
--- a/python3-PyYAML.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "python3-PyYAML",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"PyYAML>=6.0\" --no-build-isolation"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz",
-            "sha256": "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"
-        }
-    ]
-}
\ No newline at end of file