From d5af85020d531bbe68fd0ca541c0e0d05582b3e2 Mon Sep 17 00:00:00 2001
From: Ilya Zlobintsev <ilya.zl@protonmail.com>
Date: Sun, 21 Apr 2024 18:36:05 +0300
Subject: [PATCH] pkg: update the fedora package to build for fedora 40 (#303)

* pkg: update the fedora package to build for fedora 40

* pkg: update workflow

* fix: add new image to config
---
 .github/workflows/build-packages.yaml  | 4 +++-
 .pkger.yml                             | 4 ++--
 pkg/images/fedora-38/Dockerfile        | 1 -
 pkg/images/fedora-40/Dockerfile        | 1 +
 pkg/recipes/lact-headless/recipe.yml   | 4 ++--
 pkg/recipes/lact-libadwaita/recipe.yml | 4 ++--
 pkg/recipes/lact/recipe.yml            | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 pkg/images/fedora-38/Dockerfile
 create mode 100644 pkg/images/fedora-40/Dockerfile

diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml
index eed6e48..3a32956 100644
--- a/.github/workflows/build-packages.yaml
+++ b/.github/workflows/build-packages.yaml
@@ -9,11 +9,13 @@ jobs:
   build-packages:
     strategy:
       matrix:
-        target-os: [ debian-12, ubuntu-2204, fedora-38, fedora-39, arch, opensuse-tumbleweed ]
+        target-os: [ debian-12, ubuntu-2204, fedora-39, fedora-40, arch, opensuse-tumbleweed ]
         recipe: [ lact, lact-headless ]
         include:
           - target-os: fedora-39
             recipe: lact-libadwaita
+          - target-os: fedora-40
+            recipe: lact-libadwaita
           - target-os: arch
             recipe: lact-libadwaita
           - target-os: opensuse-tumbleweed
diff --git a/.pkger.yml b/.pkger.yml
index 594b3dd..3d96c23 100644
--- a/.pkger.yml
+++ b/.pkger.yml
@@ -11,10 +11,10 @@ images:
   - name: debian-12
     target: deb
     os: Debian
-  - name: fedora-38
+  - name: fedora-39
     target: rpm
     os: Fedora
-  - name: fedora-39
+  - name: fedora-40
     target: rpm
     os: Fedora
   - name: ubuntu-2204
diff --git a/pkg/images/fedora-38/Dockerfile b/pkg/images/fedora-38/Dockerfile
deleted file mode 100644
index 1d0d311..0000000
--- a/pkg/images/fedora-38/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM fedora:38
diff --git a/pkg/images/fedora-40/Dockerfile b/pkg/images/fedora-40/Dockerfile
new file mode 100644
index 0000000..75d48e3
--- /dev/null
+++ b/pkg/images/fedora-40/Dockerfile
@@ -0,0 +1 @@
+FROM fedora:40
diff --git a/pkg/recipes/lact-headless/recipe.yml b/pkg/recipes/lact-headless/recipe.yml
index 3419141..31d8c83 100644
--- a/pkg/recipes/lact-headless/recipe.yml
+++ b/pkg/recipes/lact-headless/recipe.yml
@@ -13,13 +13,13 @@ metadata:
   depends:
     all: [ hwdata ]
     debian-12+ubuntu-2204: [ libdrm-amdgpu1 ]
-    fedora-38+fedora-39: [ libdrm ]
+    fedora-39+fedora-40: [ libdrm ]
     arch: [ libdrm ]
     opensuse-tumbleweed: [ libdrm ]
   build_depends:
     all: [ curl, make, clang, git ]
     debian-12+ubuntu-2204: [ pkg-config, build-essential, libdrm-dev, dbus ]
-    fedora-38+fedora-39: [ gcc, libdrm-devel, dbus ]
+    fedora-39+fedora-40: [ gcc, libdrm-devel, dbus ]
     arch: [ libdrm, dbus ]
     opensuse-tumbleweed: [ libdrm-devel ]
   all_images: true
diff --git a/pkg/recipes/lact-libadwaita/recipe.yml b/pkg/recipes/lact-libadwaita/recipe.yml
index cdc043f..8d77593 100644
--- a/pkg/recipes/lact-libadwaita/recipe.yml
+++ b/pkg/recipes/lact-libadwaita/recipe.yml
@@ -12,12 +12,12 @@ metadata:
   conflicts: [ lact, lact-headless ]
   depends:
     all: [ hwdata ]
-    fedora-39: [ gtk4, libdrm, libadwaita ]
+    fedora-39+fedora-40: [ gtk4, libdrm, libadwaita ]
     arch: [ gtk4, libadwaita ]
     opensuse-tumbleweed: [ libdrm, libadwaita ]
   build_depends:
     all: [ curl, make, clang, git ]
-    fedora-39: [ gtk4-devel, gcc, libdrm-devel, blueprint-compiler, libadwaita-devel, dbus ]
+    fedora-39+fedora-40: [ gtk4-devel, gcc, libdrm-devel, blueprint-compiler, libadwaita-devel, dbus ]
     arch: [ gtk4, blueprint-compiler, libadwaita, dbus ]
     opensuse-tumbleweed: [ libdrm-devel, blueprint-compiler, libadwaita-devel ]
   all_images: true
diff --git a/pkg/recipes/lact/recipe.yml b/pkg/recipes/lact/recipe.yml
index a709ac6..9caf4fe 100644
--- a/pkg/recipes/lact/recipe.yml
+++ b/pkg/recipes/lact/recipe.yml
@@ -13,13 +13,13 @@ metadata:
   depends:
     all: [ hwdata ]
     debian-12+ubuntu-2204: [ libgtk-4-1 ]
-    fedora-38+fedora-39: [ gtk4, libdrm ]
+    fedora-39+fedora-40: [ gtk4, libdrm ]
     arch: [ gtk4 ]
     opensuse-tumbleweed: [ gtk4 ]
   build_depends:
     all: [ curl, make, clang, git ]
     debian-12+ubuntu-2204: [ libgtk-4-dev, pkg-config, build-essential, libdrm-dev, dbus ]
-    fedora-38+fedora-39: [ gtk4-devel, gcc, libdrm-devel, blueprint-compiler, dbus ]
+    fedora-39+fedora-40: [ gtk4-devel, gcc, libdrm-devel, blueprint-compiler, dbus ]
     arch: [ gtk4, blueprint-compiler, dbus ]
     opensuse-tumbleweed: [ gtk4-devel, libdrm-devel, blueprint-compiler ]
   all_images: true