[b3a8e0e1f9ab1bfe3a36f231f676f78bb30a519d2b21e6c530c0eee8ebb4a5d0/valentindavid/gnome-os-wip: 39/39] Revert "Revert "core-deps/plymouth.bst: Use git version to re-enable bgrt theme""



commit 58a8ecb2189009065a0962ae3558abb1db471b97
Author: Valentin David <valentin david codethink co uk>
Date:   Tue Jul 7 22:42:11 2020 +0200

    Revert "Revert "core-deps/plymouth.bst: Use git version to re-enable bgrt theme""
    
    This reverts commit b549b2e883d7478128bd7d8f92dbadd0b4512450.

 elements/core-deps/plymouth.bst  |  9 +++++++--
 files/plymouth/no-intltool.patch | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/elements/core-deps/plymouth.bst b/elements/core-deps/plymouth.bst
index 393b550d..72b3d7f3 100644
--- a/elements/core-deps/plymouth.bst
+++ b/elements/core-deps/plymouth.bst
@@ -1,8 +1,13 @@
 kind: autotools
 
 sources:
-- kind: tar
-  url: https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.4.tar.xz
+  # Plymouth has not been released for a while. Fedora uses a non-released
+  # version. We need the bgrt theme.
+- kind: git_tag
+  url: git_freedesktop_org:plymouth/plymouth.git
+  track: d7c737d05afea5ff1b26f90708a15add5c30fe92
+- kind: patch
+  path: files/plymouth/no-intltool.patch
 
 depends:
 - sdk/gtk+-3.bst
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])


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