diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch | 85 | ||||
-rw-r--r-- | meta/recipes-support/libsoup/libsoup_2.2.105.bb | 5 |
2 files changed, 88 insertions, 2 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch new file mode 100644 index 000000000..c85ec149a --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch @@ -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); diff --git a/meta/recipes-support/libsoup/libsoup_2.2.105.bb b/meta/recipes-support/libsoup/libsoup_2.2.105.bb index 697caaa08..9b5d4f817 100644 --- a/meta/recipes-support/libsoup/libsoup_2.2.105.bb +++ b/meta/recipes-support/libsoup/libsoup_2.2.105.bb @@ -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" |