Browse Source

glib2 package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 6 years ago
parent
commit
7511d4fd79
  1. 27
      SOURCES/add-back-g-memmove.patch
  2. 25
      SOURCES/revert-g-source-remove-critical.patch
  3. 1437
      SPECS/glib2.spec

27
SOURCES/add-back-g-memmove.patch

@ -0,0 +1,27 @@
From 9ce4aab38747c80d043de5f907c7b514e2547df7 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Sat, 21 Mar 2015 11:18:05 -0400
Subject: [PATCH] Add back g_memmove

---
configure.ac | 2 --
1 file changed, 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 67a766f..cdf800a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2928,10 +2928,8 @@ _______EOF
cat >>$outfile <<_______EOF
-#ifndef G_DISABLE_DEPRECATED
#define g_ATEXIT(proc) (atexit (proc))
#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-#endif
$glib_defines
$glib_os
$glib_static_compilation
--
1.8.3.1

25
SOURCES/revert-g-source-remove-critical.patch

@ -0,0 +1,25 @@
From 7b125e2e70c9de222feccae4e8931f943c8ef0cc Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Sat, 21 Mar 2015 11:16:29 -0400
Subject: [PATCH] Revert "gmain: Warn when g_source_remove() fails"

---
glib/gmain.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/glib/gmain.c b/glib/gmain.c
index 30fac70..c5f5218 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2237,8 +2237,6 @@ g_source_remove (guint tag)
source = g_main_context_find_source_by_id (NULL, tag);
if (source)
g_source_destroy (source);
- else
- g_critical ("Source ID %u was not found when attempting to remove it", tag);
return source != NULL;
}
--
1.8.3.1

1437
SPECS/glib2.spec

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save