Merge branch 'main' into tintou/wayland-greeter

Author: danirabbit

.github/workflows/gettext.yml

@@ -2,27 +2,20 @@ name: Gettext Updates
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
-  build:
-    runs-on: ubuntu-22.04
-    container:
-      image: ghcr.io/elementary/docker:next-unstable
+  gettext_template:
+    runs-on: ubuntu-latest
 
     steps:
-    - name: Install git
-      run: |
-        apt-get update
-        apt-get install git -y
-
     - name: Clone repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 
     - name: Update Translation Files
-      uses: elementary/actions/gettext-template@next
+      uses: elementary/actions/gettext-template@main
       env:
         GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
         GIT_USER_NAME: "elementaryBot"

.github/workflows/main.yml

@@ -18,38 +18,75 @@ jobs:
         version: [stable, unstable, development-target]
         include:
           - version: stable
-            mutter_pkg: libmutter-10-dev
+            mutter_pkg: libmutter-14-dev
           - version: unstable
-            mutter_pkg: libmutter-10-dev
-          - version: development-target
             mutter_pkg: libmutter-14-dev
+          - version: development-target
+            mutter_pkg: libmutter-18-dev
+            lightdm_vala: lightdm-vala
     container:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y desktop-file-utils libaccountsservice-dev libgdk-pixbuf2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev libhandy-1-dev liblightdm-gobject-1-dev ${{ matrix.mutter_pkg }} libx11-dev meson valac
+        apt install -y desktop-file-utils libgdk-pixbuf-2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev libhandy-1-dev libjson-glib-dev liblightdm-gobject-1-dev ${{ matrix.mutter_pkg }} libsoup-3.0-dev libx11-dev ${{ matrix.lightdm_vala }} meson valac
     - name: Build
       env:
         DESTDIR: out
       run: |
         meson build
         ninja -C build install
 
-  lint:
+  fedora:
+    runs-on: ubuntu-latest
+
+    container:
+      image: fedora:latest
+
+    steps:
+      - uses: actions/checkout@v6
+      - name: Install Dependencies
+        run: |
+          dnf install -y desktop-file-utils gdk-pixbuf2-devel gnome-desktop3-devel granite-devel gtk3-devel libhandy-devel lightdm-gobject-devel mutter-devel libX11-devel meson valac
+      - name: Build
+        env:
+          DESTDIR: out
+        run: |
+          meson build
+          ninja -C build install
 
+  open-suse-leap:
+    runs-on: ubuntu-latest
+
+    container:
+      image: opensuse/leap:latest
+
+    steps:
+      - name: Install dependencies
+        run: |
+          zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
+          zypper --gpg-auto-import-keys refresh
+          zypper --non-interactive install tar git desktop-file-utils gdk-pixbuf-devel libgnome-desktop-3-devel granite6-devel gtk3-devel libhandy-devel lightdm-gobject-devel mutter-devel meson vala gcc
+      - uses: actions/checkout@v6
+      - name: Build
+        env:
+          DESTDIR: out
+        run: |
+          meson build
+          ninja -C build install
+
+  lint:
     runs-on: ubuntu-latest
 
     container:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Lint
       run: |
         io.elementary.vala-lint -d compositor
         io.elementary.vala-lint -d src
-

.github/workflows/release.yml

@@ -2,18 +2,18 @@ name: Release
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
     types: [closed]
 jobs:
   release:
      runs-on: ubuntu-latest
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v4
-     - uses: elementary/actions/release@master
+     - uses: actions/checkout@v6
+     - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
          GIT_USER_NAME: "elementaryBot"
          GIT_USER_EMAIL: "builds@elementary.io"
        with:
-         release_branch: 'odin'
+         release_branch: 'noble'

README.md

@@ -8,14 +8,15 @@
 
 You'll need the following dependencies:
 
+* gettext (provides `msgfmt`)
 * gnome-settings-daemon >= 3.27
-* libaccountsservice-dev
 * libgdk-pixbuf2.0-dev
+* libgnome-desktop-3-dev
 * libgranite-dev >= 5.5.0
 * libgtk-3-dev
 * libhandy-1-dev >= 0.90.0
-* liblightdm-gobject-1-dev
-* libmutter-6-dev
+* liblightdm-gobject-1-dev >= 1.30.0
+* libmutter-13-dev
 * libx11-dev
 * meson
 * valac

compositor/Background/Animation.vala

@@ -30,11 +30,7 @@ namespace GreeterCompositor {
             yield;
         }
 
-#if HAS_MUTTER45
         public void update (Mtk.Rectangle monitor) {
-#else
-        public void update (Meta.Rectangle monitor) {
-#endif
             string[] key_frame_files = {};
 
             if (show == null)

compositor/Background/Background.vala

@@ -83,15 +83,38 @@ namespace GreeterCompositor {
             var settings = background_source.gnome_background_settings;
 
             color_string = settings.get_string ("primary-color");
+#if HAS_MUTTER47
+            var color = Cogl.Color.from_string (color_string);
+#else
             var color = Clutter.Color.from_string (color_string);
+#endif
+            if (color == null) {
+#if HAS_MUTTER47
+                color = Cogl.Color.from_string ("#000000");
+#else
+                color = Clutter.Color.from_string ("black");
+#endif
+            }
 
             var shading_type = settings.get_enum ("color-shading-type");
 
             if (shading_type == GDesktop.BackgroundShading.SOLID) {
                 background.set_color (color);
             } else {
                 color_string = settings.get_string ("secondary-color");
+#if HAS_MUTTER47
+                var second_color = Cogl.Color.from_string (color_string);
+#else
                 var second_color = Clutter.Color.from_string (color_string);
+#endif
+                if (second_color == null) {
+#if HAS_MUTTER47
+                    second_color = Cogl.Color.from_string ("#000000");
+#else
+                    second_color = Clutter.Color.from_string ("black");
+#endif
+                }
+
                 background.set_gradient ((GDesktop.BackgroundShading) shading_type, color, second_color);
             }
         }

compositor/Background/BackgroundContainer.vala

@@ -28,7 +28,11 @@ namespace GreeterCompositor {
         }
 
         public void set_black_background (bool black) {
+#if HAS_MUTTER47
+            set_background_color (black ? Cogl.Color.from_string ("#000000") : null);
+#else
             set_background_color (black ? Clutter.Color.from_string ("Black") : null);
+#endif
         }
 
         private void update () {

compositor/Background/BackgroundSource.vala

@@ -39,7 +39,7 @@ namespace GreeterCompositor {
             monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.connect (monitors_changed);
 
-            gala_background_settings = new GLib.Settings ("io.elementary.desktop.background");
+            gala_background_settings = new GLib.Settings ("io.elementary.greeter-compositor.background");
             gala_background_settings.changed["dim-wallpaper-in-dark-style"].connect (() => changed ());
 
             gnome_background_settings = new GLib.Settings ("org.gnome.desktop.background");