Date: Tuesday, March 21, 2023 @ 18:58:01
Author: arojas
Revision: 471700
archrelease: copy trunk to testing-x86_64
Added:
plymouth-kcm/repos/testing-x86_64/PKGBUILD
(from rev 471699, plymouth-kcm/trunk/PKGBUILD)
plymouth-kcm/repos/testing-x86_64/keys/
plymouth-kcm/repos/testing-x86_64/mkinitcpio.patch
(from rev 471699, plymouth-kcm/trunk/mkinitcpio.patch)
Deleted:
plymouth-kcm/repos/testing-x86_64/PKGBUILD
plymouth-kcm/repos/testing-x86_64/keys/
------------------+
PKGBUILD | 64 ++++++++++++++++++++++++++++-------------------------
mkinitcpio.patch | 34 ++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 29 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-21 18:57:49 UTC (rev 471699)
+++ PKGBUILD 2023-03-21 18:58:01 UTC (rev 471700)
@@ -1,29 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-
-pkgname=plymouth-kcm
-pkgver=5.27.3
-pkgrel=1
-pkgdesc='KCM to manage the Plymouth (Boot) theme'
-arch=(x86_64)
-url='https://kde.org/plasma-desktop/'
-license=(LGPL)
-depends=(systemsettings plymouth)
-makedepends=(extra-cmake-modules)
-groups=(plasma)
-source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('8f296bdf89b79c1c39acbd64367dbc8712a5566b61fd94128208609a448ce626'
- 'SKIP')
-validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan
Esk-Riddell <[email protected]>
- '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah
<[email protected]>
- 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson
<[email protected]>
- '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin
<[email protected]>
-
-build() {
- cmake -B build -S $pkgname-$pkgver \
- -DBUILD_TESTING=OFF
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: plymouth-kcm/repos/testing-x86_64/PKGBUILD (from rev 471699,
plymouth-kcm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-21 18:58:01 UTC (rev 471700)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <[email protected]>
+
+pkgname=plymouth-kcm
+pkgver=5.27.3
+pkgrel=2
+pkgdesc='KCM to manage the Plymouth (Boot) theme'
+arch=(x86_64)
+url='https://kde.org/plasma-desktop/'
+license=(LGPL)
+depends=(systemsettings plymouth)
+makedepends=(extra-cmake-modules)
+groups=(plasma)
+source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
+ mkinitcpio.patch)
+sha256sums=('8f296bdf89b79c1c39acbd64367dbc8712a5566b61fd94128208609a448ce626'
+ 'SKIP'
+ '8b0bd2731e80564827025db503c4181187eb33b7ebd0dbe9027b8e9658593683')
+validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan
Esk-Riddell <[email protected]>
+ '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah
<[email protected]>
+ 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson
<[email protected]>
+ '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin
<[email protected]>
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < mkinitcpio.patch # Run mkinitcpio instead of
initramfs
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DBUILD_TESTING=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Copied: plymouth-kcm/repos/testing-x86_64/mkinitcpio.patch (from rev 471699,
plymouth-kcm/trunk/mkinitcpio.patch)
===================================================================
--- mkinitcpio.patch (rev 0)
+++ mkinitcpio.patch 2023-03-21 18:58:01 UTC (rev 471700)
@@ -0,0 +1,34 @@
+diff --git a/src/helper.cpp b/src/helper.cpp
+index b594d59..d0239cb 100644
+--- a/src/helper.cpp
++++ b/src/helper.cpp
+@@ -154,12 +154,23 @@ ActionReply PlymouthHelper::save(const QVariantMap &args)
+ }
+
+ QProcess process;
+- qDebug() << "Running update-initramfs -u now";
+- process.start(QStringLiteral("/usr/sbin/update-initramfs"), QStringList()
<< QStringLiteral("-u"));
+- if (!process.waitForStarted()) {
+- reply = ActionReply::BackendError;
+- reply.setErrorDescription(i18n("Cannot start initramfs."));
+- return reply;
++ if (QFileInfo(QStringLiteral("/usr/sbin/update-initramfs")).exists()) {
++ qDebug() << "Running update-initramfs -u now";
++ process.start(QStringLiteral("/usr/sbin/update-initramfs"),
QStringList() << QStringLiteral("-u"));
++ if (!process.waitForStarted()) {
++ reply = ActionReply::BackendError;
++ reply.setErrorDescription(i18n("Cannot start initramfs."));
++ return reply;
++ }
++ }
++ if (QFileInfo(QStringLiteral("/usr/bin/mkinitcpio")).exists()) {
++ qDebug() << "Running mkinitcpio -P now";
++ process.start(QStringLiteral("/usr/bin/mkinitcpio"), QStringList() <<
QStringLiteral("-P"));
++ if (!process.waitForStarted()) {
++ reply = ActionReply::BackendError;
++ reply.setErrorDescription(i18n("Cannot start mkinitcpio."));
++ return reply;
++ }
+ }
+ // We don't know how long this will take. The helper will need to
generate N=installed_kernels initrds.
+ // Be very generous with the timeout!
https://bugs.kde.org/show_bug.cgi?id=400641
