From 6f0c4016e62893b0cfae3db2af910bd00c838b78 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sat, 22 Jul 2023 10:19:12 +0200
Subject: [PATCH] GNOME 45

---
 Workbench.doap                | 1 +
 meson.build                   | 2 +-
 re.sonny.Workbench.Devel.json | 7 ++++---
 re.sonny.Workbench.json       | 7 ++++---
 src/Previewer/previewer.vala  | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Workbench.doap b/Workbench.doap
index 949542d8c..7225f73b6 100644
--- a/Workbench.doap
+++ b/Workbench.doap
@@ -13,6 +13,7 @@
   <bug-database rdf:resource="https://workbench.sonny.re/feedback" />
   <programming-language>JavaScript</programming-language>
   <programming-language>Vala</programming-language>
+  <programming-language>C</programming-language>
 
   <platform>GTK 4</platform>
   <platform>Libadwaita</platform>
diff --git a/meson.build b/meson.build
index 7c0930cec..89af49974 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('Workbench', ['vala', 'c'],
-  version: '44.2',
+  version: '45.0',
   meson_version: '>= 0.59.0',
   license: 'GPL-3.0-only'
 )
diff --git a/re.sonny.Workbench.Devel.json b/re.sonny.Workbench.Devel.json
index 5d9231391..7dbcf3375 100644
--- a/re.sonny.Workbench.Devel.json
+++ b/re.sonny.Workbench.Devel.json
@@ -1,7 +1,7 @@
 {
   "id": "re.sonny.Workbench.Devel",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "44",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",
@@ -193,7 +193,7 @@
         {
           "type": "git",
           "url": "https://github.com/JCWasmx86/GTKCssLanguageServer",
-          "commit": "638bf6e8836d9c2aed6d4c5d17dbf00311155145"
+          "commit": "6fa2252d55c4c11a866b6ea91c1a8ad52d7d3a01"
         }
       ],
       "modules": [
@@ -224,8 +224,9 @@
         }
       ],
       "post-install": [
+        "cp -a /usr/share/gtk-doc/html/. /app/share/doc/",
+        "rm -r /app/share/doc/appstream",
         "cp -a /usr/share/doc/. /app/share/doc/",
-        "cp -a /usr/share/gtk-doc/html/. /app/share/doc",
         "cp -a /usr/lib/sdk/vala/bin/. /app/bin/",
         "cp -a /usr/lib/sdk/vala/lib/. /app/lib/",
         "cp -a /usr/lib/sdk/vala/share/. /app/share/"
diff --git a/re.sonny.Workbench.json b/re.sonny.Workbench.json
index 9edfdd863..8efef90d9 100644
--- a/re.sonny.Workbench.json
+++ b/re.sonny.Workbench.json
@@ -1,7 +1,7 @@
 {
   "id": "re.sonny.Workbench",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "44",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",
@@ -193,7 +193,7 @@
         {
           "type": "git",
           "url": "https://github.com/JCWasmx86/GTKCssLanguageServer",
-          "commit": "638bf6e8836d9c2aed6d4c5d17dbf00311155145"
+          "commit": "6fa2252d55c4c11a866b6ea91c1a8ad52d7d3a01"
         }
       ],
       "modules": [
@@ -224,8 +224,9 @@
         }
       ],
       "post-install": [
+        "cp -a /usr/share/gtk-doc/html/. /app/share/doc/",
+        "rm -r /app/share/doc/appstream",
         "cp -a /usr/share/doc/. /app/share/doc/",
-        "cp -a /usr/share/gtk-doc/html/. /app/share/doc",
         "cp -a /usr/lib/sdk/vala/bin/. /app/bin/",
         "cp -a /usr/lib/sdk/vala/lib/. /app/lib/",
         "cp -a /usr/lib/sdk/vala/share/. /app/share/"
diff --git a/src/Previewer/previewer.vala b/src/Previewer/previewer.vala
index b5ae8a9a2..1179c58bc 100644
--- a/src/Previewer/previewer.vala
+++ b/src/Previewer/previewer.vala
@@ -118,7 +118,7 @@ namespace Workbench {
         var end = section.get_end_location();
         this.css_parser_error(error.message, (int)start.lines, (int)start.line_chars, (int)end.lines, (int)end.line_chars);
       });
-      this.css.load_from_data (content.data);
+      this.css.load_from_data (content);
       Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), this.css , Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }