CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gedit: fix compile

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller 2013-03-09 19:59:04 +00:00 committed by Martin Jansa
parent 75c615d7ec
commit 5259a3e097
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch Normal file
View File

@ -0,0 +1,57 @@
From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 9 Mar 2013 12:47:06 +0100
Subject: [PATCH] workaround void pointer arithmetic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fixes errors like:
error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith]
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
gedit/gedit-document-input-stream.c | 4 ++--
gedit/gedit-smart-charset-converter.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c
index 5a1f961..38316e7 100644
--- a/gedit/gedit-document-input-stream.c
+++ b/gedit/gedit-document-input-stream.c
@@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream *stream,
do
{
- n = read_line (dstream, buffer + read, space_left);
+ n = read_line (dstream, ((char*)buffer) + read, space_left);
read += n;
space_left -= n;
} while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0);
@@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream *stream,
newline = get_new_line (dstream);
- memcpy (buffer + read, newline, newline_size);
+ memcpy (((char*)buffer) + read, newline, newline_size);
read += newline_size;
dstream->priv->newline_added = TRUE;
diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c
index e32b0b1..6745ce3 100644
--- a/gedit/gedit-smart-charset-converter.c
+++ b/gedit/gedit-smart-charset-converter.c
@@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter,
do
{
res = g_converter_convert (G_CONVERTER (converter),
- inbuf + nread,
+ ((const char*)inbuf) + nread,
inbuf_size - nread,
out + nwritten,
out_size - nwritten,
--
1.7.4.4

3
meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
View File

@ -1,13 +1,14 @@
DESCRIPTION = "GNOME editor"
SECTION = "x11/gnome"
LICENSE = "GPLv2+"
PR = "r1"
PR = "r2"
DEPENDS = "gvfs enchant gconf gnome-doc-utils gnome-doc-utils-native glib-2.0 gtk+ gtksourceview2 iso-codes"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
inherit gnome gettext pythonnative
SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch"
SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b"
SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c"