[gnome-build-meta/abderrahim/more-cleanups: 2/3] world/phosh.bst: update dependencies (use wlroots upstream)




commit 6f927e72d756b6b716d238cb425f1582ab19fa8a
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Dec 24 16:18:18 2021 +0100

    world/phosh.bst: update dependencies (use wlroots upstream)
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1423>

 elements/world.bst         |  2 ++
 elements/world/libseat.bst | 19 +++++++++++++++++++
 elements/world/phosh.bst   |  6 ++----
 elements/world/wlroots.bst | 16 ++++++----------
 4 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/elements/world.bst b/elements/world.bst
index aa45da98e..df5770432 100644
--- a/elements/world.bst
+++ b/elements/world.bst
@@ -51,6 +51,7 @@ depends:
 - world/libgnome-games-support.bst
 - world/libgrss.bst
 - world/libhandy-0.bst
+- world/libseat.bst
 - world/libshumate.bst
 - world/libsigcplusplus.bst
 - world/libzapojit.bst
@@ -72,3 +73,4 @@ depends:
 - world/telepathy-mission-control.bst
 - world/tracker-2.bst
 - world/tracker-miners-2.bst
+- world/wlroots.bst
diff --git a/elements/world/libseat.bst b/elements/world/libseat.bst
new file mode 100644
index 000000000..0d1dea35a
--- /dev/null
+++ b/elements/world/libseat.bst
@@ -0,0 +1,19 @@
+kind: meson
+
+sources:
+- kind: tar
+  url: github_com:kennylevinsen/seatd/archive/refs/tags/0.6.3.tar.gz
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- freedesktop-sdk.bst:components/systemd-libs.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  meson-local: >-
+    -Dlibseat-logind=systemd
+    -Dlibseat-seatd=disabled
+    -Dman-pages=disabled
+    -Dserver=disabled
diff --git a/elements/world/phosh.bst b/elements/world/phosh.bst
index a9116f501..82ce1e264 100644
--- a/elements/world/phosh.bst
+++ b/elements/world/phosh.bst
@@ -13,14 +13,13 @@ sources:
       url: gitlab_gnome_org:World/Phosh/libcall-ui.git
 
 build-depends:
-- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:components/wayland-protocols.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/NetworkManager.bst
 - core-deps/callaudiod.bst
 - core-deps/feedbackd.bst
-- core-deps/libinput.bst
 - core-deps/upower.bst
 - core/gnome-desktop.bst
 - sdk/gcr.bst
@@ -32,6 +31,5 @@ depends:
 - world/phoc.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/polkit.bst
-- freedesktop-sdk.bst:components/systemd.bst
-- freedesktop-sdk.bst:components/wayland.bst
+- freedesktop-sdk.bst:components/systemd-libs.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/wlroots.bst b/elements/world/wlroots.bst
index 308a4d100..e75d53bbe 100644
--- a/elements/world/wlroots.bst
+++ b/elements/world/wlroots.bst
@@ -1,31 +1,27 @@
 kind: meson
 
 sources:
-- kind: git_tag
-  url: https://source.puri.sm/Librem5/wlroots.git
-  track: librem5-0.12.x
+- kind: tar
+  url: https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.14.1/wlroots-0.14.1.tar.bz2
 
 build-depends:
+- freedesktop-sdk.bst:components/mesa-headers.bst
+- freedesktop-sdk.bst:components/wayland-protocols.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/libinput.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
+- world/libseat.bst
 - freedesktop-sdk.bst:components/dummy-gbm.bst
 - freedesktop-sdk.bst:components/libdrm.bst
 - freedesktop-sdk.bst:components/libxkbcommon.bst
-- freedesktop-sdk.bst:components/mesa-headers.bst
 - freedesktop-sdk.bst:components/pixman.bst
-- freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:components/wayland.bst
-- freedesktop-sdk.bst:components/wayland-protocols.bst
 - freedesktop-sdk.bst:components/xcb-util-renderutil.bst
 - freedesktop-sdk.bst:components/xcb-util-wm.bst
 - freedesktop-sdk.bst:components/xwayland.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
 
 variables:
   meson-local: >-
-    -Dlibseat=disabled
-    -Dlogind=enabled
-    -Dlogind-provider=systemd
     -Dxcb-errors=disabled


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]