1
0
forked from pool/libmirage
libmirage/libmirage-3.0.5-glib-2.28-workaround.patch
Jan Engelhardt 8e2aa678b0 Accepting request 486008 from home:linux4humans:sle11_software:filesystems
- Fix SLES 11 build. We're also need Glib 2.28 instead of 2.22.5. Most desktop and workstation users are turn on Packman repository, so they're have Glib 2.28 installed from there.
- Added 01_g_assert_nonnull.diff patch taken from Cdemu PPA
- Add glib2-devel as a required for the -devel package. That fixes some rpmbuild warning.

OBS-URL: https://build.opensuse.org/request/show/486008
OBS-URL: https://build.opensuse.org/package/show/filesystems/libmirage?expand=0&rev=41
2017-04-11 21:10:21 +00:00

72 lines
2.9 KiB
Diff

--- a/images/image-ccd/parser.c 2016-10-10 02:01:03.000000000 +0100
+++ b/images/image-ccd/parser.c 2017-03-20 02:40:11.000000000 +0100
@@ -1033,7 +1033,7 @@
gsize line_length;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {
--- a/images/image-cue/parser.c 2016-10-10 02:01:03.000000000 +0100
+++ b/images/image-cue/parser.c 2017-03-20 02:40:56.000000000 +0100
@@ -839,7 +839,7 @@
gsize line_length;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {
--- a/images/image-toc/parser.c 2016-10-10 02:01:03.000000000 +0100
+++ b/images/image-toc/parser.c 2017-03-20 02:42:21.000000000 +0100
@@ -1007,7 +1007,7 @@
GMatchInfo *match_info = NULL;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {
@@ -1166,7 +1166,7 @@
GMatchInfo *match_info = NULL;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {
--- a/images/image-xcdroast/parser.c 2016-10-10 02:01:03.000000000 +0100
+++ b/images/image-xcdroast/parser.c 2017-03-20 02:42:52.000000000 +0100
@@ -587,7 +587,7 @@
gsize line_length;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {
@@ -670,7 +670,7 @@
gsize line_length;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {
@@ -766,7 +766,7 @@
GMatchInfo *match_info = NULL;
/* Read line */
- line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
+ line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
/* Handle error */
if (!line_string) {