forked from pool/libmirage
Jan Engelhardt
8e2aa678b0
- 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
53 lines
2.5 KiB
Diff
53 lines
2.5 KiB
Diff
Index: libmirage-3.0.5/images/image-ccd/parser.c
|
|
===================================================================
|
|
--- libmirage-3.0.5.orig/images/image-ccd/parser.c 2016-10-19 20:45:47.238020045 +0200
|
|
+++ libmirage-3.0.5/images/image-ccd/parser.c 2016-10-19 20:46:38.188531986 +0200
|
|
@@ -927,7 +927,7 @@
|
|
|
|
CCD_RegexRule *new_rule = g_new(CCD_RegexRule, 1);
|
|
new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
|
|
- g_assert_nonnull(new_rule->regex);
|
|
+ g_assert(new_rule->regex != NULL);
|
|
new_rule->callback_func = callback;
|
|
/* Append to the list */
|
|
list = g_list_append(list, new_rule);
|
|
Index: libmirage-3.0.5/images/image-cue/parser.c
|
|
===================================================================
|
|
--- libmirage-3.0.5.orig/images/image-cue/parser.c 2016-10-19 20:45:47.238020045 +0200
|
|
+++ libmirage-3.0.5/images/image-cue/parser.c 2016-10-19 20:46:38.188531986 +0200
|
|
@@ -767,7 +767,7 @@
|
|
|
|
CUE_RegexRule *new_rule = g_new(CUE_RegexRule, 1);
|
|
new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
|
|
- g_assert_nonnull(new_rule->regex);
|
|
+ g_assert(new_rule->regex != NULL);
|
|
new_rule->callback_func = callback;
|
|
/* Append to the list */
|
|
list = g_list_append(list, new_rule);
|
|
Index: libmirage-3.0.5/images/image-toc/parser.c
|
|
===================================================================
|
|
--- libmirage-3.0.5.orig/images/image-toc/parser.c 2016-10-19 20:45:47.238020045 +0200
|
|
+++ libmirage-3.0.5/images/image-toc/parser.c 2016-10-19 20:46:38.188531986 +0200
|
|
@@ -863,7 +863,7 @@
|
|
|
|
TOC_RegexRule *new_rule = g_new(TOC_RegexRule, 1);
|
|
new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
|
|
- g_assert_nonnull(new_rule->regex);
|
|
+ g_assert(new_rule->regex != NULL);
|
|
new_rule->callback_func = callback;
|
|
/* Append to the list */
|
|
list = g_list_append(list, new_rule);
|
|
Index: libmirage-3.0.5/images/image-xcdroast/parser.c
|
|
===================================================================
|
|
--- libmirage-3.0.5.orig/images/image-xcdroast/parser.c 2016-10-19 20:45:47.238020045 +0200
|
|
+++ libmirage-3.0.5/images/image-xcdroast/parser.c 2016-10-19 20:46:38.188531986 +0200
|
|
@@ -496,7 +496,7 @@
|
|
|
|
XCDROAST_RegexRule *new_rule = g_new(XCDROAST_RegexRule, 1);
|
|
new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
|
|
- g_assert_nonnull(new_rule->regex);
|
|
+ g_assert(new_rule->regex != NULL);
|
|
new_rule->callback_func = callback;
|
|
/* Append to the list */
|
|
list = g_list_append(list, new_rule);
|