[gtk-osx] Patch gsf for deleted g_memmove.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Patch gsf for deleted g_memmove.
- Date: Sun, 21 Dec 2014 00:10:22 +0000 (UTC)
commit 2b8c7bc8cc4a69ab10c1e4feed8af42f0708928f
Author: John Ralls <jralls ceridwen us>
Date: Sat Dec 20 15:27:20 2014 -0800
Patch gsf for deleted g_memmove.
modulesets-stable/gtk-osx-random.modules | 5 ++++-
patches/gsf-memmove.patch | 14 ++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index fbcb591..3f259e9 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -384,7 +384,10 @@ Libglade itself is deprecated. This is the last release. -->
<autotools id="libgsf" autogenargs="--without-python">
<branch module="libgsf/1.14/libgsf-1.14.28.tar.xz" version="1.14.28"
- hash="sha256:ea94914f1fdaa5d4eb49149f0228ae6e41a54bdeb8caf52a7dd8acaa329fcbe4"/>
+ hash="sha256:ea94914f1fdaa5d4eb49149f0228ae6e41a54bdeb8caf52a7dd8acaa329fcbe4">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gsf-memmove.patch" strip="1"/>
+
+ </branch>
</autotools>
<autotools id="gmp">
diff --git a/patches/gsf-memmove.patch b/patches/gsf-memmove.patch
new file mode 100644
index 0000000..e636b14
--- /dev/null
+++ b/patches/gsf-memmove.patch
@@ -0,0 +1,14 @@
+
+--- a/gsf/gsf-output-iconv.c Sun Mar 3 07:17:11 2013
++++ b/gsf/gsf-output-iconv.c Sat Dec 13 10:32:43 2014
+@@ -119,7 +119,7 @@
+ ok = FALSE;
+ } else {
+ ic->buf_len -= bytes_read;
+- g_memmove (ic->buf, ic->buf + bytes_read, ic->buf_len);
++ memmove (ic->buf, ic->buf + bytes_read, ic->buf_len);
+
+ ok = gsf_output_write (ic->sink, bytes_written, data);
+ if (!ok) {
+
+Diff finished. Sat Dec 20 15:21:40 2014
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]