Revert "Add patch to fix compilation errors"

This reverts commit 54f948d308.
This commit is contained in:
Siavash Safi 2017-04-27 02:41:14 +02:00
parent 54f948d308
commit 4ff931f016
2 changed files with 3 additions and 28 deletions

View file

@ -4,7 +4,7 @@
# Lara Maia, Padfoot, Jorge Barroso, carstene1ns # Lara Maia, Padfoot, Jorge Barroso, carstene1ns
pkgname=plymouth-git pkgname=plymouth-git
pkgver=0.9.2.r70.g11b0ce0 pkgver=0.9.3.r0.g2c437c3
pkgrel=1 pkgrel=1
pkgdesc="A graphical boot splash screen with kernel mode-setting support (development version)" pkgdesc="A graphical boot splash screen with kernel mode-setting support (development version)"
url="http://www.freedesktop.org/wiki/Software/Plymouth/" url="http://www.freedesktop.org/wiki/Software/Plymouth/"
@ -35,8 +35,7 @@ source=('git+http://anongit.freedesktop.org/git/plymouth'
'plymouth.initcpio_install' 'plymouth.initcpio_install'
'sd-plymouth.initcpio_install' 'sd-plymouth.initcpio_install'
'plymouth-quit.service.in.patch' 'plymouth-quit.service.in.patch'
'plymouth-update-initrd.patch' 'plymouth-update-initrd.patch')
'plymouth.patch')
sha256sums=('SKIP' sha256sums=('SKIP'
'9bac679d2494d9b60b288be87021f1d7b85a9503ebbdce93d6e37c0fc07568ae' '9bac679d2494d9b60b288be87021f1d7b85a9503ebbdce93d6e37c0fc07568ae'
@ -51,8 +50,7 @@ sha256sums=('SKIP'
'b0467b7c490539470f726358e5d0c72951efd58d268a2d16411dafacba68041a' 'b0467b7c490539470f726358e5d0c72951efd58d268a2d16411dafacba68041a'
'f434dd9cc96c3cec470aedb7734663cd3e04ffa34eff2bea92708f966132a2da' 'f434dd9cc96c3cec470aedb7734663cd3e04ffa34eff2bea92708f966132a2da'
'fc900a0c330b9bcbf84afaa6575d9df392c4e8c2ea699b72dc9a137f4972de49' 'fc900a0c330b9bcbf84afaa6575d9df392c4e8c2ea699b72dc9a137f4972de49'
'bb597e2ced7c3beca8c9e9f212bc001750746d9b41e00071697a0352ec2a2e27' 'bb597e2ced7c3beca8c9e9f212bc001750746d9b41e00071697a0352ec2a2e27')
'4ae4b4d5912cc9bff20fe0d7e85270829657b1a91a177349559d6566f3946d56')
pkgver() { pkgver() {
cd plymouth cd plymouth
@ -64,7 +62,6 @@ prepare() {
patch -p1 -i "$srcdir"/plymouth-update-initrd.patch patch -p1 -i "$srcdir"/plymouth-update-initrd.patch
patch -p1 -i "$srcdir"/plymouth-quit.service.in.patch patch -p1 -i "$srcdir"/plymouth-quit.service.in.patch
patch -p1 -i "$srcdir"/plymouth.patch
} }
build() { build() {

View file

@ -1,22 +0,0 @@
diff --git a/src/main.c b/src/main.c
index eeb4e20..95b0872 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1529,14 +1529,14 @@ on_escape_pressed (state_t *state)
ply_trigger_add_handler (state->details_trigger,
(ply_trigger_handler_t)
- toggle_between_splash_details,
+ toggle_between_splash_and_details,
state);
ply_trace ("escape key pressed");
ply_event_loop_watch_for_timeout (state->loop,
0.01,
(ply_event_loop_timeout_handler_t)
- ply_trigger_pull
+ ply_trigger_pull,
state->details_trigger);
}