pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Invert the logic in plymouth-ignore-cirrusdrm.patch bnc#890516

Browse Source 
- Add
  0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch:
  fix incorrect UTF-8 code used for square [bnc#886148].

OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=151
This commit is contained in:
Ismail Dönmez 2014-08-07 11:00:56 +00:00 committed by Git OBS Bridge
parent 82c1a7ae5e
commit 3534b1cd54
3 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch Normal file
View File

@ -0,0 +1,37 @@
From 40c2dd36c5da64919f69dd4f37de2ecf19f23058 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 28 Jul 2014 09:58:49 -0400
Subject: [PATCH] =?UTF-8?q?text-step-bar:=20use=20correct=20utf-8=20multib?=
=?UTF-8?q?yte=20sequence=20for=20=E2=96=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
For some reason in commit 113526408c5706c9efc7f43c3f8258354e762677
I commited the sequence \x25\x96\xa0 in place of the block character
that was there before. I don't know where I got \x25 from, but it's
not right (and couldn't even be right since the high order bit isn't
set which is a requirement for the first byte in multi-byte utf-8
sequences).
This commit uses \xe2 instead which I got from doing:
$ echo ■ | xxd
0000000: e296 a00a ....
---
src/libply-splash-core/ply-text-step-bar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: plymouth-0.9.0/src/libply-splash-core/ply-text-step-bar.c
===================================================================
--- plymouth-0.9.0.orig/src/libply-splash-core/ply-text-step-bar.c
+++ plymouth-0.9.0/src/libply-splash-core/ply-text-step-bar.c
@@ -96,7 +96,7 @@ ply_text_step_bar_draw (ply_text_step_ba
}
/* U+25A0 BLACK SQUARE */
- ply_text_display_write (step_bar->display, "%s", "\x25\x96\xa0");
+ ply_text_display_write (step_bar->display, "%s", "\xe2\x96\xa0");
ply_text_display_write (step_bar->display, "%c", ' ');
}

8
plymouth-ignore-cirrusdrm.patch
View File

@ -2,7 +2,7 @@ Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
===================================================================
--- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c
+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
@@ -151,8 +151,14 @@ fb_device_has_drm_device (ply_device_man
@@ -149,8 +149,14 @@ fb_device_has_drm_device (ply_device_man
card_path = udev_list_entry_get_name (card_entry);
card_device = udev_device_new_from_syspath (manager->udev_context, card_path);
card_node = udev_device_get_devnode (card_device);
@ -11,10 +11,10 @@ Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
+ if (card_node != NULL) {
+ /* don't consider drm driver for cirrus usable */
+ const char *card_name = udev_device_get_sysattr_value (card_device, "name");
+ if ((card_name != 0) && strcmp ("cirrusdrmfb", card_name) != 0)
+ has_drm_device = true;
+ else
+ if (card_name && strcmp ("cirrusdrmfb", card_name) == 0)
+ has_drm_device = false;
+ else
+ has_drm_device = true;
+ }
else
ply_trace ("no card node!");

12
plymouth.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Aug 7 09:24:37 UTC 2014 - idonmez@suse.com
- Invert the logic in plymouth-ignore-cirrusdrm.patch bnc#890516
-------------------------------------------------------------------
Mon Jul 28 16:10:49 CEST 2014 - fcrozat@suse.com
- Add
0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch:
fix incorrect UTF-8 code used for square [bnc#886148].
-------------------------------------------------------------------
Fri Jul 25 14:32:38 CEST 2014 - fcrozat@suse.com