public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH] plymouth: Update to 0.9.2.
@ 2015-10-09 17:58 Stefan Schantl
  2015-10-10 17:33 ` Timo Eissler
  0 siblings, 1 reply; 5+ messages in thread
From: Stefan Schantl @ 2015-10-09 17:58 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 752 bytes --]

Update to the latest minor version of the plymouth 0.9 series.
Also enable support for systemd.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 plymouth/plymouth.nm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 257aef6..2666928 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.9.0
+version    = 0.9.2
 release    = 1
 
 groups     = System/Base
@@ -33,6 +33,7 @@ build
 		libpng-devel
 		libudev-devel
 		pango-devel
+		systemd-devel
 	end
 
 	configure_options += \
-- 
2.4.3


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] plymouth: Update to 0.9.2.
  2015-10-09 17:58 [PATCH] plymouth: Update to 0.9.2 Stefan Schantl
@ 2015-10-10 17:33 ` Timo Eissler
  2015-10-15 14:39   ` Michael Tremer
  0 siblings, 1 reply; 5+ messages in thread
From: Timo Eissler @ 2015-10-10 17:33 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

Reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org>

Am 09.10.2015 um 19:58 schrieb Stefan Schantl:
> Update to the latest minor version of the plymouth 0.9 series.
> Also enable support for systemd.
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  plymouth/plymouth.nm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
> index 257aef6..2666928 100644
> --- a/plymouth/plymouth.nm
> +++ b/plymouth/plymouth.nm
> @@ -4,7 +4,7 @@
>  ###############################################################################
>  
>  name       = plymouth
> -version    = 0.9.0
> +version    = 0.9.2
>  release    = 1
>  
>  groups     = System/Base
> @@ -33,6 +33,7 @@ build
>  		libpng-devel
>  		libudev-devel
>  		pango-devel
> +		systemd-devel
>  	end
>  
>  	configure_options += \

-- 
Timo Eissler
Senior Project Engineer / Consultant

Am Zuckerberg 54
D-71640 Ludwigsburg

Tel.: +49 7141 4094003
Mobil.: +49 151 20650311
Email: timo(a)teissler.de



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] plymouth: Update to 0.9.2.
  2015-10-10 17:33 ` Timo Eissler
@ 2015-10-15 14:39   ` Michael Tremer
  2015-10-16 17:40     ` Stefan Schantl
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Tremer @ 2015-10-15 14:39 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]

This happens when I try to compile this:

+ /usr/lib/pakfire/patch --search-path=/usr/src/packages/plymouth-0.9.2-1.ip3.src/patches /usr/src/packages/plymouth-0.9.2-1.ip3.src/patches/plymouth-0.9.0-everything-is-better-in-red.patch
Applying patches...
  Applying /usr/src/packages/plymouth-0.9.2-1.ip3.src/patches/plymouth-0.9.0-everything-is-better-in-red.patch (-N -p1)...
patching file src/plugins/splash/text/plugin.c
Hunk #1 FAILED at 177.
1 out of 1 hunk FAILED -- saving rejects to file src/plugins/splash/text/plugin.c.rej

-Michael

On Sat, 2015-10-10 at 19:33 +0200, Timo Eissler wrote:
> Reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org>
> 
> Am 09.10.2015 um 19:58 schrieb Stefan Schantl:
> > Update to the latest minor version of the plymouth 0.9 series.
> > Also enable support for systemd.
> > 
> > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> > ---
> >  plymouth/plymouth.nm | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
> > index 257aef6..2666928 100644
> > --- a/plymouth/plymouth.nm
> > +++ b/plymouth/plymouth.nm
> > @@ -4,7 +4,7 @@
> >  ##################################################################
> > #############
> >  
> >  name       = plymouth
> > -version    = 0.9.0
> > +version    = 0.9.2
> >  release    = 1
> >  
> >  groups     = System/Base
> > @@ -33,6 +33,7 @@ build
> >  		libpng-devel
> >  		libudev-devel
> >  		pango-devel
> > +		systemd-devel
> >  	end
> >  
> >  	configure_options += \
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] plymouth: Update to 0.9.2.
  2015-10-15 14:39   ` Michael Tremer
@ 2015-10-16 17:40     ` Stefan Schantl
  2015-10-16 22:32       ` [PATCH v2] " Stefan Schantl
  0 siblings, 1 reply; 5+ messages in thread
From: Stefan Schantl @ 2015-10-16 17:40 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]

Thanks for the feedback, I missed to attach the changed patch.

I'll send a fixed patch to the list soon.

-Stefan
> This happens when I try to compile this:
> 
> + /usr/lib/pakfire/patch --search-path=/usr/src/packages/plymouth
> -0.9.2-1.ip3.src/patches /usr/src/packages/plymouth-0.9.2
> -1.ip3.src/patches/plymouth-0.9.0-everything-is-better-in-red.patch
> Applying patches...
>   Applying /usr/src/packages/plymouth-0.9.2
> -1.ip3.src/patches/plymouth-0.9.0-everything-is-better-in-red.patch (
> -N -p1)...
> patching file src/plugins/splash/text/plugin.c
> Hunk #1 FAILED at 177.
> 1 out of 1 hunk FAILED -- saving rejects to file
> src/plugins/splash/text/plugin.c.rej
> 
> -Michael
> 
> On Sat, 2015-10-10 at 19:33 +0200, Timo Eissler wrote:
> > Reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org>
> > 
> > Am 09.10.2015 um 19:58 schrieb Stefan Schantl:
> > > Update to the latest minor version of the plymouth 0.9 series.
> > > Also enable support for systemd.
> > > 
> > > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> > > ---
> > >  plymouth/plymouth.nm | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
> > > index 257aef6..2666928 100644
> > > --- a/plymouth/plymouth.nm
> > > +++ b/plymouth/plymouth.nm
> > > @@ -4,7 +4,7 @@
> > >  ################################################################
> > > ##
> > > #############
> > >  
> > >  name       = plymouth
> > > -version    = 0.9.0
> > > +version    = 0.9.2
> > >  release    = 1
> > >  
> > >  groups     = System/Base
> > > @@ -33,6 +33,7 @@ build
> > >  		libpng-devel
> > >  		libudev-devel
> > >  		pango-devel
> > > +		systemd-devel
> > >  	end
> > >  
> > >  	configure_options += \

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2] plymouth: Update to 0.9.2.
  2015-10-16 17:40     ` Stefan Schantl
@ 2015-10-16 22:32       ` Stefan Schantl
  0 siblings, 0 replies; 5+ messages in thread
From: Stefan Schantl @ 2015-10-16 22:32 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3604 bytes --]

Update to the latest minor version of the plymouth 0.9 series.
Also enable support for systemd.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 .../plymouth-0.9.0-everything-is-better-in-red.patch     | 16 ----------------
 .../plymouth-0.9.2-everything-is-better-in-red.patch     | 16 ++++++++++++++++
 plymouth/plymouth.nm                                     |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch
 create mode 100644 plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch

diff --git a/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch
deleted file mode 100644
index f2981ca..0000000
--- a/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c plymouth-0.9.0/src/plugins/splash/text/plugin.c
---- plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c	2014-04-21 17:18:19.000000000 +0200
-+++ plymouth-0.9.0/src/plugins/splash/text/plugin.c	2014-12-07 14:57:09.344789424 +0100
-@@ -177,10 +177,10 @@
-                                     0xffffff);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BLUE,
--                                    0x3465a4);
-+                                    0xCC0A00);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BROWN,
--                                    0x979a9b);
-+                                    0x880400);
- 
-   ply_text_display_set_background_color (view->display,
-                                          PLY_TERMINAL_COLOR_BLACK);
diff --git a/plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch
new file mode 100644
index 0000000..255f3c3
--- /dev/null
+++ b/plymouth/patches/plymouth-0.9.2-everything-is-better-in-red.patch
@@ -0,0 +1,16 @@
+diff -Nur a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
+--- a/src/plugins/splash/text/plugin.c	2015-02-26 19:32:41.000000000 +0100
++++ b/src/plugins/splash/text/plugin.c	2015-09-10 22:03:27.266902240 +0200
+@@ -174,10 +174,10 @@
+                                           0x2e3436);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_WHITE,
+-                                          0xffffff);
++                                          0xCC0A00);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_BROWN,
+-                                          0x979a9b);
++                                          0x880400);
+ 
+         ply_text_display_set_background_color (view->display,
+                                                PLY_TERMINAL_COLOR_BLACK);
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 257aef6..2666928 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.9.0
+version    = 0.9.2
 release    = 1
 
 groups     = System/Base
@@ -33,6 +33,7 @@ build
 		libpng-devel
 		libudev-devel
 		pango-devel
+		systemd-devel
 	end
 
 	configure_options += \
-- 
2.4.3


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-10-16 22:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-09 17:58 [PATCH] plymouth: Update to 0.9.2 Stefan Schantl
2015-10-10 17:33 ` Timo Eissler
2015-10-15 14:39   ` Michael Tremer
2015-10-16 17:40     ` Stefan Schantl
2015-10-16 22:32       ` [PATCH v2] " Stefan Schantl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox