feat: Bump to 0.8.0-beta2, update dependencies and tweak UI

GradienceTeam · Jan 4, 2024 · 0c3ba09 · 0c3ba09
1 parent 9edabcc
commit 0c3ba09
Show file tree

Hide file tree

Showing 34 changed files with 97 additions and 415 deletions.
diff --git a/HACKING.md b/HACKING.md
@@ -107,3 +107,4 @@ ninja -C builddir run
 > **Note** 
 > During testing and development, as a convenience, you can use the `local.sh` script to quickly rebuild local builds.
 > If you want to use CLI in local builds, you should type: `./local_cli.sh <command>` instead of `gradience-cli`.
+
diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json
@@ -22,8 +22,10 @@
         "--filesystem=xdg-download:ro",
         "--filesystem=~/.mozilla/firefox",
         "--filesystem=~/.librewolf",
+        "--filesystem=~/.waterfox",
         "--filesystem=~/.var/app/org.mozilla.firefox/.mozilla/firefox",
         "--filesystem=~/.var/app/io.gitlab.librewolf-community/.librewolf",
+        "--filesystem=~/.var/app/net.waterfox.waterfox/.waterfox",
         "--filesystem=~/snap/firefox/common/.mozilla/firefox",
         "--filesystem=/.var/app/com.getmailspring.Mailspring/config/Mailspring/packages/Libadwaita/styles",
         "--filesystem=xdg-config/Mailspring"
@@ -51,8 +53,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.3/lxml-4.9.3.tar.gz",
-                    "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"
+                    "url": "https://github.com/lxml/lxml/releases/download/lxml-5.0.0-1/lxml-5.0.0.tar.gz",
+                    "sha256": "67216b13a832adb984cfd20437261236f8c05fc19a0f7d4c59c235fddb17dfdb"
                 }
             ]
         },
@@ -62,7 +64,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
+                    "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler.git",
                     "branch" : "main"
                 }
             ]
@@ -93,7 +95,7 @@
                         {
                             "type": "git",
                             "url": "https://github.com/sass/libsass.git",
-                            "tag": "3.6.5"
+                            "tag": "3.6.6"
                         },
                         {
                             "type": "script",
@@ -120,8 +122,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/flatpak/libportal",
-                    "tag": "main"
+                    "url": "https://github.com/flatpak/libportal.git",
+                    "branch": "main"
                 }
             ]
         },

diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "com.github.GradienceTeam.Gradience",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "44",
+    "runtime-version" : "45",
     "sdk" : "org.gnome.Sdk",
     "command" : "gradience",
     "finish-args" : [
@@ -22,10 +22,11 @@
         "--filesystem=xdg-download:ro",
         "--filesystem=~/.mozilla/firefox",
         "--filesystem=~/.librewolf",
+        "--filesystem=~/.waterfox",
         "--filesystem=~/.var/app/org.mozilla.firefox/.mozilla/firefox",
         "--filesystem=~/.var/app/io.gitlab.librewolf-community/.librewolf",
+        "--filesystem=~/.var/app/net.waterfox.waterfox/.waterfox",
         "--filesystem=~/snap/firefox/common/.mozilla/firefox",
-        "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules/",
         "--filesystem=/.var/app/com.getmailspring.Mailspring/config/Mailspring/packages/Libadwaita/styles",
         "--filesystem=xdg-config/Mailspring"
     ],
@@ -52,8 +53,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.3/lxml-4.9.3.tar.gz",
-                    "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"
+                    "url": "https://github.com/lxml/lxml/releases/download/lxml-5.0.0-1/lxml-5.0.0.tar.gz",
+                    "sha256": "67216b13a832adb984cfd20437261236f8c05fc19a0f7d4c59c235fddb17dfdb"
                 }
             ]
         },
@@ -68,23 +69,6 @@
                 }
             ]
         },
-        {
-            "name" : "dconf",
-            "buildsystem" : "meson",
-            "config-opts": [
-                "-Dbash_completion=false",
-                "-Dman=false",
-                "-Dgtk_doc=false",
-                "-Dvapi=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://download.gnome.org/sources/dconf/0.40/dconf-0.40.0.tar.xz",
-                    "sha256" : "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533"
-                }
-            ]
-        },
         {
             "name": "sassc",
             "sources": [
@@ -111,7 +95,7 @@
                         {
                             "type": "git",
                             "url": "https://github.com/sass/libsass.git",
-                            "tag": "3.6.5"
+                            "tag": "3.6.6"
                         },
                         {
                             "type": "script",
@@ -133,13 +117,13 @@
             "config-opts": [
                 "-Ddocs=false",
                 "-Dvapi=false",
-                "-Dbackends=gtk4"
+                "-Dbackend-gtk4=enabled"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/flatpak/libportal.git",
-                    "tag": "0.6"
+                    "tag": "0.7.1"
                 }
             ]
         },

diff --git a/data/com.github.GradienceTeam.Gradience.appdata.xml.in.in b/data/com.github.GradienceTeam.Gradience.appdata.xml.in.in
@@ -86,6 +86,14 @@
   </keywords>
 
   <releases>
+    <release version="0.8.0-beta2" date="2024-01-4" type="development">
+      <description translatable="no">
+        <p>Gradience 0.8.0-beta2 release is the second beta for upcoming major release.</p>
+        <ul>
+          <li>See GitHub releases for more info</li>
+        </ul>
+      </description>
+    </release>"
     <release version="0.8.0-beta1" date="2023-06-16" type="development">
       <description translatable="no">
         <p>Gradience 0.8.0-beta1 release is the first beta for upcoming major release.</p>

diff --git a/data/gradience.gresource.xml b/data/gradience.gresource.xml
@@ -34,13 +34,15 @@
   <gresource prefix="/com/github/GradienceTeam/Gradience/icons/scalable/actions/">
     <file preprocess="xml-stripblanks" alias="adw-gtk3-warning-symbolic.svg">icons/scalable/actions/adw-gtk3-warning-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="bug-symbolic.svg">icons/scalable/actions/bug-symbolic.svg</file>
-    <file preprocess="xml-stripblanks" alias="checkmark-large-symbolic.svg">icons/scalable/actions/checkmark-large-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="checkmark-symbolic.svg">icons/scalable/actions/checkmark-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="code-symbolic.svg">icons/scalable/actions/code-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="color-picker-symbolic.svg">icons/scalable/actions/color-picker-symbolic.svg</file>
-    <file preprocess="xml-stripblanks" alias="drive-symbolic.svg">icons/scalable/actions/drive-symbolic.svg</file>
-    <file preprocess="xml-stripblanks" alias="drive-unsaved-symbolic.svg">icons/scalable/actions/drive-unsaved-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="document-edit-symbolic.svg">icons/scalable/actions/document-edit-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="document-save-symbolic.svg">icons/scalable/actions/document-save-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="larger-brush-symbolic.svg">icons/scalable/actions/larger-brush-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="palette-symbolic.svg">icons/scalable/actions/palette-symbolic.svg</file>
     <file preprocess="xml-stripblanks" alias="settings-symbolic.svg">icons/scalable/actions/settings-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="star-large-symbolic.svg">icons/scalable/actions/star-large-symbolic.svg</file>
+    <file preprocess="xml-stripblanks" alias="star-outline-rounded-symbolic.svg">icons/scalable/actions/star-outline-rounded-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/data/icons/scalable/actions/bug-symbolic.svg b/data/icons/scalable/actions/bug-symbolic.svg
diff --git a/data/icons/scalable/actions/checkmark-large-symbolic.svg b/data/icons/scalable/actions/checkmark-large-symbolic.svg
diff --git a/data/icons/scalable/actions/checkmark-symbolic.svg b/data/icons/scalable/actions/checkmark-symbolic.svg