libsoup3: bump version

This commit is contained in:
Gerasim Troeglazov
2022-11-29 12:56:21 +10:00
parent b60c8f77a7
commit b420b3f613
3 changed files with 78 additions and 42 deletions

View File

@@ -5,9 +5,9 @@ GNOME applications, and also has a synchronous API, for use in threaded applicat
HOMEPAGE="https://wiki.gnome.org/Projects/libsoup/"
COPYRIGHT="2005 - 2015 The GNOME Project"
LICENSE="GNU LGPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/libsoup/${portVersion%.*}/libsoup-$portVersion.tar.xz"
CHECKSUM_SHA256="2832370698ca8f9fbf174c345b73d89b60561103a626c2df70726b0707f79bd3"
CHECKSUM_SHA256="83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1"
SOURCE_DIR="libsoup-$portVersion"
PATCHES="libsoup3-$portVersion.patchset"
@@ -77,7 +77,8 @@ BUILD()
--includedir=$includeDir \
-Dtls_check=false \
-Dintrospection=enabled \
-Dvapi=enabled
-Dvapi=enabled \
-Dtests=false
ninja -C build
}

View File

@@ -1,39 +0,0 @@
From 0236e20781e2fabae53934d9b8dfbf3ea737591f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 25 Nov 2015 01:25:58 +0000
Subject: libsoup, fix build
diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
index 2e81849..c0bcb89 100644
--- a/libsoup/auth/soup-auth-digest.c
+++ b/libsoup/auth/soup-auth-digest.c
@@ -9,6 +9,10 @@
#include <config.h>
#endif
+#ifdef __HAIKU__
+#include <unistd.h>
+#endif
+
#include <string.h>
#include "auth/soup-auth-digest-private.h"
diff --git a/libsoup/auth/soup-auth-ntlm.c b/libsoup/auth/soup-auth-ntlm.c
index 7108a32..da8e69b 100644
--- a/libsoup/auth/soup-auth-ntlm.c
+++ b/libsoup/auth/soup-auth-ntlm.c
@@ -16,6 +16,10 @@
#include <glib.h>
+#ifdef __HAIKU__
+#include <unistd.h>
+#endif
+
#include "soup-auth-ntlm.h"
#include "soup.h"
#include "soup-message-private.h"
--
2.36.1

View File

@@ -0,0 +1,74 @@
From a42b50b928fc7e03c4f3122aa95a2b6dcb74b88b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 25 Nov 2015 01:25:58 +0000
Subject: libsoup, fix build
diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
index 2e81849..c0bcb89 100644
--- a/libsoup/auth/soup-auth-digest.c
+++ b/libsoup/auth/soup-auth-digest.c
@@ -9,6 +9,10 @@
#include <config.h>
#endif
+#ifdef __HAIKU__
+#include <unistd.h>
+#endif
+
#include <string.h>
#include "auth/soup-auth-digest-private.h"
diff --git a/libsoup/auth/soup-auth-ntlm.c b/libsoup/auth/soup-auth-ntlm.c
index 7108a32..da8e69b 100644
--- a/libsoup/auth/soup-auth-ntlm.c
+++ b/libsoup/auth/soup-auth-ntlm.c
@@ -16,6 +16,10 @@
#include <glib.h>
+#ifdef __HAIKU__
+#include <unistd.h>
+#endif
+
#include "soup-auth-ntlm.h"
#include "soup.h"
#include "soup-message-private.h"
--
2.37.3
From 4c2972783c10babfea108374a6aad5f05648a30c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 29 Nov 2022 12:51:22 +1000
Subject: link with libnetwork
diff --git a/meson.build b/meson.build
index e9f1a6d..d731652 100644
--- a/meson.build
+++ b/meson.build
@@ -45,6 +45,11 @@ if host_system == 'sunos'
add_project_link_arguments('-lsocket', language: 'c')
endif
+if host_system == 'haiku'
+ add_project_arguments('-D__EXTENSIONS__', language: 'c')
+ add_project_link_arguments('-lnetwork', language: 'c')
+endif
+
common_flags = [
'-DHAVE_CONFIG_H',
]
@@ -81,6 +86,8 @@ else
'-Wno-sign-compare',
'-Wno-cast-function-type',
'-Wno-missing-field-initializers',
+ '-Wno-nonull',
+ '-Wno-error=nonnull',
]
if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 'address,undefined' or \
--
2.37.3