Merge branch 'main' into fix-set-gtk3-theme

Signed-off-by: Himadri Bhattacharjee <lavafroth@protonmail.com>
GradienceTeam · Mar 25, 2024 · 473062a · 473062a
2 parents 8716677 + ee5bc57
commit 473062a
Show file tree

Hide file tree

Showing 96 changed files with 19,951 additions and 11,045 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
         with:
           submodules: recursive
@@ -51,11 +51,12 @@ jobs:
 
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@v2.2.0
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v5
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+
         with:
           repository-name: gnome-nightly
           bundle: gradience-devel.flatpak

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
diff --git a/.github/workflows/pypi-dependencies.yml b/.github/workflows/pypi-dependencies.yml
@@ -27,9 +27,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: '3.10'
 
@@ -42,7 +41,7 @@ jobs:
           mv pypi-dependencies.json build-aux/flatpak/pypi-dependencies.json
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6.0.2
         with:
           author: "AdwCustomizer <AdwCustomizerTeam@proton.me>"
           title: "meta: update PyPI dependencies for Flatpak"

diff --git a/.github/workflows/pysa.yml b/.github/workflows/pysa.yml
@@ -36,7 +36,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 

diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml
@@ -25,22 +25,22 @@ jobs:
     steps:
       # Checkout a repository with Flatpak manifests
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       # See "Multiple Architectures" below
       - name: Setup QEMU
         if: ${{ matrix.arch == 'aarch64' }}
         id: qemu
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
       # See "GPG Signing" below
       - name: Setup GPG
         id: gpg
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -73,4 +73,4 @@ jobs:
     steps:
       - name: GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/translation.yml b/.github/workflows/translation.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Update .pot
         uses: GradienceTeam/action-update-pot@main

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
@@ -28,9 +28,9 @@ jobs:
     name: Typos
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Check for typos
-      uses: crate-ci/typos@master
+      uses: crate-ci/typos@v1.19.0
       with:
         config: typos.toml
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/README.md b/README.md
@@ -79,10 +79,6 @@ The main features of Gradience include the following:
   ![Proof of Work](https://github.com/GradienceTeam/Design/raw/main/Screenshots/proof_purple.png)
 </details>
 
-> [!NOTE]
-> You can download [latest nightly build](https://nightly.link/GradienceTeam/Gradience/workflows/build/main) from GitHub actions
-
-
 ## 🎨️ Theming setup
 
 > [!NOTE]
@@ -113,7 +109,6 @@ Use [this guide](https://github.com/lassekongo83/adw-gtk3/blob/main/gtk4.md) to
 
 </details>
 
-
 ## 🔄 Revert Theming
 1. Open Preferences window
 
@@ -146,7 +141,6 @@ Use [this guide](https://github.com/lassekongo83/adw-gtk3/blob/main/gtk4.md) to
 
 </details>
 
-
 ## 📦️ Alternative installation methods
 
 > [!IMPORTANT]
@@ -218,27 +212,22 @@ To install:
 nix-env -iA nixos.gradience
 ```
 
-
 ## 🏗️ Building from source
 
-### Nightly Remote
+### Nightly Build
 
-First of all, you need to have [GNOME Nightly](https://wiki.gnome.org/Apps/Nightly) Flatpak remote added if it's not already:
+First of all, you need to have [GNOME Nightly](https://nightly.gnome.org) Flatpak remote added if it's not already:
 
 ```shell
 flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
 ```
 
-Then, add the Gradience Flatpak remote:
-
-```shell
-flatpak remote-add --if-not-exists gradience-nightly https://gradienceteam.github.io/Gradience/index.flatpakrepo
-```
+Then, download the Gradience nightly from [here](https://nightly.link/GradienceTeam/Gradience/workflows/build/main)
 
-Finally, install Gradience by running:
+Finally, extract the ZIP and install Gradience by running:
 
 ```shell
-flatpak install gradience-nightly com.github.GradienceTeam.Gradience.Devel
+flatpak install gradience-devel.flatpak
 ```
 
 ### GNOME Builder
@@ -247,13 +236,12 @@ GNOME Builder is the environment used for developing this application.
 It can use Flatpak manifests to create a consistent building and running
 environment cross-distro. Thus, it is highly recommended you use it.
 
-1. Download [GNOME Builder](https://flathub.org/apps/details/org.gnome.Builder).
+1. Download [GNOME Builder](https://apps.gnome.org/Builder).
 2. In Builder, click the "Clone Repository" button at the bottom, using `https://github.com/GradienceTeam/Gradience.git` as the URL.
 3. Click the build button at the top once the project is loaded.
 
 For more building and installation methods, see [HACKING.md](HACKING.md)
 
-
 ## 🎛️ Miscellaneous
 
 ### Show welcome window again
@@ -272,23 +260,19 @@ flatpak run --command=gsettings com.github.GradienceTeam.Gradience reset com.git
 gsettings reset com.github.GradienceTeam.Gradience first-run
 ```
 
-
 ## ℹ️ FAQ
 
 ### How can I launch a CLI?
 Refer to [temporary CLI documentation](https://github.com/GradienceTeam/Gradience/wiki/Using-CLI) in repo's wiki for instructions on how to launch a CLI.
 
-
 ## 🙌 Contribute to Gradience
 
 See [HACKING.md](HACKING.md)
 
-
 ## ✨️ Contributors
 
 [![Contributors](https://contrib.rocks/image?repo=GradienceTeam/Gradience)](https://github.com/GradienceTeam/Gradience/graphs/contributors)
 
-
 ## 🏷️ About the Name
 
 Gradience was originally named Adwaita Manager.
@@ -307,14 +291,12 @@ Pretty Purple preset was originally shared in the https://github.com/GradienceTe
 
 Pretty Purple is built-in in the Gradience and used in all Gradience artworks.
 
-
 ## 🌱️ Gradience, [stopthemingmy.app](https://stopthemingmy.app) and Adwaita Developers
 
 > See [gradienceteam.github.io/hack](https://gradienceteam.github.io/hack)
 
 Gradience Team is not against the ideas of [stopthemingmy.app](https://stopthemingmy.app) and the developers of Adwaita. Gradience is a tool for tinkerers who want to theme their desktop to their liking, and **not a tool for distributions** to ship in their releases. Gradience Team agrees with importance of unified look of Adwaita to make sure that all apps function correctly and that developers have a unified and stable tool for creating their apps.
 
-
 ## 💝 Acknowledgment
 
 Special thanks to:

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,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",
         "--filesystem=/.var/app/com.getmailspring.Mailspring/config/Mailspring/packages/Libadwaita/styles",
         "--filesystem=xdg-config/Mailspring"
     ],
@@ -50,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"
                 }
             ]
         },
@@ -61,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"
                 }
             ]
@@ -92,7 +95,7 @@
                         {
                             "type": "git",
                             "url": "https://github.com/sass/libsass.git",
-                            "tag": "3.6.5"
+                            "tag": "3.6.6"
                         },
                         {
                             "type": "script",
@@ -119,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,9 +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",
-        "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules/",
+        "--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"
                 }
             ]
         },
@@ -67,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": [
@@ -110,7 +95,7 @@
                         {
                             "type": "git",
                             "url": "https://github.com/sass/libsass.git",
-                            "tag": "3.6.5"
+                            "tag": "3.6.6"
                         },
                         {
                             "type": "script",
@@ -132,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"
                 }
             ]
         },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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`.