Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jb51311' into 'master'
Update to 2.66.1. See merge request mer-core/glib2!12
- Loading branch information
Showing
7 changed files
with
42 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
[submodule "upstream"] | ||
path = upstream | ||
url = https://git.sailfishos.org/mirror/glib.git | ||
url = https://github.com/sailfishos-mirror/glib.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
rpm/0001-glib-Replace-g_critical-in-g_source_remove-with-g_wa.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From d75b5f52bbca63dfe20c7c4604b9783d990c6f73 Mon Sep 17 00:00:00 2001 | ||
From: Slava Monich <slava.monich@jolla.com> | ||
Date: Mon, 30 May 2016 12:25:19 +0300 | ||
Subject: [PATCH] glib: Replace g_critical in g_source_remove with g_warning. | ||
Contributes to JB#35380 | ||
|
||
glib 2.39 and later calls g_critical from g_source_remove() if it's called | ||
with invalid source id. Even though it's a programming error, in most cases | ||
it's not fatal. | ||
--- | ||
glib/gmain.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/glib/gmain.c b/glib/gmain.c | ||
index cae6e4828..ca21cf272 100644 | ||
--- a/glib/gmain.c | ||
+++ b/glib/gmain.c | ||
@@ -2496,7 +2496,7 @@ g_source_remove (guint tag) | ||
if (source) | ||
g_source_destroy (source); | ||
else | ||
- g_critical ("Source ID %u was not found when attempting to remove it", tag); | ||
+ g_warning ("Source ID %u was not found when attempting to remove it", tag); | ||
|
||
return source != NULL; | ||
} | ||
-- | ||
2.26.2 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters