[gnome-build-meta/valentindavid/gnome-os-ostree: 7/16] Add plymouth



commit d4d4c9ea66e5ced08fe87ebf67aa8909eda1a1a7
Author: Valentin David <valentin david codethink co uk>
Date:   Sat Nov 16 21:55:17 2019 +0100

    Add plymouth

 elements/core-deps/plymouth.bst      | 31 +++++++++++++++++++++++++++++++
 elements/core/gdm.bst                |  3 ++-
 elements/vm/plymouth-gnome-theme.bst | 28 ++++++++++++++++++++++++++++
 files/plymouth/logo-parameter.patch  | 10 ++++++++++
 files/plymouth/no-intltool.patch     | 15 +++++++++++++++
 files/plymouth/plymouthd.defaults    |  4 ++++
 6 files changed, 90 insertions(+), 1 deletion(-)
---
diff --git a/elements/core-deps/plymouth.bst b/elements/core-deps/plymouth.bst
new file mode 100644
index 00000000..0c55c40f
--- /dev/null
+++ b/elements/core-deps/plymouth.bst
@@ -0,0 +1,31 @@
+kind: autotools
+
+sources:
+- kind: git_tag
+  url: git_freedesktop_org:plymouth/plymouth.git
+  track: master
+- kind: patch
+  path: files/plymouth/no-intltool.patch
+- kind: patch
+  path: files/plymouth/logo-parameter.patch
+
+depends:
+- sdk/gtk+-3.bst
+- sdk/pango.bst
+- freedesktop-sdk.bst:components/libdrm.bst
+- freedesktop-sdk.bst:components/systemd.bst
+
+build-depends:
+- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
+variables:
+  conf-local: >-
+    --with-logo="%{datadir}/pixmaps/gnome-boot-logo.png"
+
+config:
+  install-commands:
+    (>):
+    - |
+      mv "%{install-root}/var/run" "%{install-root}/"
+      rm -rf "%{install-root}/var"
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index 29a133ac..dd696723 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -11,6 +11,7 @@ build-depends:
 depends:
 - core-deps/accountsservice.bst
 - core-deps/upower.bst
+- core-deps/plymouth.bst
 - sdk/dconf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
@@ -24,7 +25,7 @@ variables:
     --enable-wayland-support
     --with-pam-prefix=%{sysconfdir}
     --with-run-dir=/run/gdm
-    --with-plymouth=no
+    --with-plymouth=yes
 
 config:
   install-commands:
diff --git a/elements/vm/plymouth-gnome-theme.bst b/elements/vm/plymouth-gnome-theme.bst
new file mode 100644
index 00000000..e1c554fb
--- /dev/null
+++ b/elements/vm/plymouth-gnome-theme.bst
@@ -0,0 +1,28 @@
+kind: manual
+
+sources:
+- kind: local
+  path: files/plymouth/plymouthd.defaults
+- kind: remote
+  url: https://people.gnome.org/~engagement/logos/GnomeLogoHorizontal.svg
+
+runtime-depends:
+- core-deps/plymouth.bst
+
+build-depends:
+- sdk/librsvg.bst
+
+config:
+  build-commands:
+  - sed -i "s/black/white/g" GnomeLogoHorizontal.svg
+  - rsvg-convert GnomeLogoHorizontal.svg -h 40 -f png -b black -o gnome-boot-logo.png
+
+  install-commands:
+  - install -Dm644 -t "%{install-root}%{datadir}/pixmaps" gnome-boot-logo.png
+  - install -Dm644 plymouthd.defaults "%{install-root}%{datadir}/plymouth/plymouthd.gnome"
+  - install -Dm644 gnome-boot-logo.png "%{install-root}%{datadir}/plymouth/themes/spinner/watermark.png"
+
+public:
+  bst:
+    integration-commands:
+    - mv "%{datadir}/plymouth/plymouthd.gnome" "%{datadir}/plymouth/plymouthd.defaults"
diff --git a/files/plymouth/logo-parameter.patch b/files/plymouth/logo-parameter.patch
new file mode 100644
index 00000000..9505237e
--- /dev/null
+++ b/files/plymouth/logo-parameter.patch
@@ -0,0 +1,10 @@
+diff --git a/themes/spinfinity/Makefile.am b/themes/spinfinity/Makefile.am
+index b4bc31d..4798eb5 100644
+--- a/themes/spinfinity/Makefile.am
++++ b/themes/spinfinity/Makefile.am
+@@ -54,4 +54,4 @@ spinfinity.plymouth: $(srcdir)/spinfinity.plymouth.in
+ EXTRA_DIST = spinfinity.plymouth.in
+ 
+ install-data-hook:
+-      ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png
++      ln -sf $(logofile) $(DESTDIR)$(themedir)/header-image.png
diff --git a/files/plymouth/no-intltool.patch b/files/plymouth/no-intltool.patch
new file mode 100644
index 00000000..ab0a5701
--- /dev/null
+++ b/files/plymouth/no-intltool.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index ada2e4d..5b0f1fa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,10 +17,6 @@ AM_MAINTAINER_MODE([enable])
+ 
+ AM_GNU_GETTEXT_VERSION([0.19.8])
+ AM_GNU_GETTEXT([external])
+-AC_PATH_PROG([INTLTOOL_EXTRACT], [intltool-extract])
+-if test x$INTLTOOL_EXTRACT = x; then
+-  AC_MSG_ERROR([intltool-extract is required to build plymouth])
+-fi
+ 
+ PKG_PROG_PKG_CONFIG
+ LT_INIT([dlopen disable-static pic-only])
diff --git a/files/plymouth/plymouthd.defaults b/files/plymouth/plymouthd.defaults
new file mode 100644
index 00000000..8bcb4345
--- /dev/null
+++ b/files/plymouth/plymouthd.defaults
@@ -0,0 +1,4 @@
+[Daemon]
+Theme=bgrt
+ShowDelay=0
+DeviceTimeout=8


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