sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libsoup: Fix for glib-2.0 2.32.2 

(From OE-Core rev: d3efcf15cee6734b4bf2277346ceba9a991fbd0f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2012-05-04 17:56:16 -07:00 committed by Richard Purdie
parent 22f682b857
commit 7903a285ee
2 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch Normal file
View File

@ -0,0 +1,85 @@
Fix for glib-2.0 version 2.32.2
Upstream-Status: Pending
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: libsoup-2.2.105/libsoup/soup-date.h
===================================================================
--- libsoup-2.2.105.orig/libsoup/soup-date.h
+++ libsoup-2.2.105/libsoup/soup-date.h
@@ -7,7 +7,7 @@
#define SOUP_DATE_H 1
#include <time.h>
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
Index: libsoup-2.2.105/libsoup/soup-method.h
===================================================================
--- libsoup-2.2.105.orig/libsoup/soup-method.h
+++ libsoup-2.2.105/libsoup/soup-method.h
@@ -6,7 +6,7 @@
#ifndef SOUP_METHOD_H
#define SOUP_METHOD_H 1
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
Index: libsoup-2.2.105/libsoup/soup-portability.h
===================================================================
--- libsoup-2.2.105.orig/libsoup/soup-portability.h
+++ libsoup-2.2.105/libsoup/soup-portability.h
@@ -6,7 +6,7 @@
#ifndef SOUP_PORTABILITY_H
#define SOUP_PORTABILITY_H
-#include <glibconfig.h>
+#include <glib.h>
#ifdef G_OS_WIN32
Index: libsoup-2.2.105/libsoup/soup-status.h
===================================================================
--- libsoup-2.2.105.orig/libsoup/soup-status.h
+++ libsoup-2.2.105/libsoup/soup-status.h
@@ -8,7 +8,7 @@
#ifndef SOUP_STATUS_H
#define SOUP_STATUS_H 1
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
Index: libsoup-2.2.105/libsoup/soup-types.h
===================================================================
--- libsoup-2.2.105.orig/libsoup/soup-types.h
+++ libsoup-2.2.105/libsoup/soup-types.h
@@ -6,7 +6,7 @@
#ifndef SOUP_TYPES_H
#define SOUP_TYPES_H 1
-#include <glib/gtypes.h>
+#include <glib.h>
#include <glib-object.h>
#include <libsoup/soup-status.h>
Index: libsoup-2.2.105/tests/revserver.c
===================================================================
--- libsoup-2.2.105.orig/tests/revserver.c
+++ libsoup-2.2.105/tests/revserver.c
@@ -11,7 +11,7 @@
#include <libsoup/soup-address.h>
#include <libsoup/soup-socket.h>
-#include <glib/gthread.h>
+#include <glib.h>
static void rev_read (SoupSocket *sock, GString *buf);
static void rev_write (SoupSocket *sock, GString *buf);

5
meta/recipes-support/libsoup/libsoup_2.2.105.bb
View File

@ -2,12 +2,13 @@ DESCRIPTION = "An HTTP library implementation in C"
SECTION = "x11/gnome/libs"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
PR = "r3"
PR = "r4"
DEPENDS = "glib-2.0 gnutls libxml2"
SRC_URI = "${GNOME_MIRROR}/${BPN}/2.2/${BPN}-${PV}.tar.bz2 \
file://dprintf_conflict_with_eglibc.patch"
file://dprintf_conflict_with_eglibc.patch \
file://fix-for-new-glib.patch"
SRC_URI[md5sum] = "7fa48b06a0e2b0ff3d2fa45cf331f169"
SRC_URI[sha256sum] = "3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f"