glib_networking, bump to version 2.80.1 (#13715)

This commit is contained in:
Schrijvers Luc
2026-02-04 18:07:48 +01:00
committed by GitHub
parent 8559989dbb
commit f0c34c92f4
2 changed files with 61 additions and 22 deletions

View File

@@ -11,50 +11,53 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
2008-2010 Collabora Ltd.
1995-2010 Several others"
LICENSE="GNU LGPL v2"
REVISION="3"
SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.72/glib-networking-$portVersion.tar.xz"
CHECKSUM_SHA256="cd2a084c7bb91d78e849fb55d40e472f6d8f6862cddc9f12c39149359ba18268"
REVISION="1"
SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib-networking/${portVersion%.*}/glib-networking-$portVersion.tar.xz"
CHECKSUM_SHA256="b80e2874157cd55071f1b6710fa0b911d5ac5de106a9ee2a4c9c7bee61782f8e"
SOURCE_DIR="glib-networking-$portVersion"
PATCHES="glib_networking-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
ARCHITECTURES="ALL !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
glib_networking$secondaryArchSuffix = $portVersion compat >= 2
lib:libglib_networking_2.0$secondaryArchSuffix = $portVersion compat >= 2
lib:libglib_networking_2.0$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
ca_root_certificates
gsettings_desktop_schemas$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libffi$secondaryArchSuffix
lib:libgio_2.0$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libgmp$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libgobject_2.0$secondaryArchSuffix
lib:libproxy$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
ca_root_certificates
gsettings_desktop_schemas$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix >= 3
devel:libgio_2.0$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libgmp$secondaryArchSuffix
devel:libgmodule_2.0$secondaryArchSuffix
devel:libgobject_2.0$secondaryArchSuffix
devel:libproxy$secondaryArchSuffix
devel:libssl$secondaryArchSuffix >= 3
devel:libtasn1$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:intltool_update
cmd:ld$secondaryArchSuffix
cmd:make
cmd:gio_querymodules
cmd:meson
cmd:msgfmt$secondaryArchSuffix
cmd:ninja
cmd:python3
cmd:pkg_config$secondaryArchSuffix
"
@@ -64,11 +67,15 @@ BUILD()
CFLAGS="-D_BSD_SOURCE" \
LDFLAGS="-lbsd -lgnu -lnetwork" meson build \
-Dopenssl=enabled \
--buildtype=release \
--prefix=$prefix --includedir=$includeDir \
--libdir=$libDir --datadir=$dataDir --bindir=$binDir \
--localedir=$dataDir/locale
--prefix=$prefix \
--bindir=$binDir \
--datadir=$dataDir \
--includedir=$includeDir \
--libdir=$libDir \
--localedir=$dataDir/locale \
-Dopenssl=enabled \
-Dgnutls=disabled
ninja $jobArgs -C build
}
@@ -76,4 +83,14 @@ BUILD()
INSTALL()
{
ninja -C build install
# cleanup
rm -rf $dataDir/dbus-1
rm -rf $libDir/systemd
}
TEST()
{
unset meson
meson test -C build --print-errorlogs
}

View File

@@ -0,0 +1,22 @@
From 0414941d8dbf9d93f4a72441758203c2baf6d2b2 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Fri, 20 Jun 2025 17:00:08 +0200
Subject: Disable check for libdl on Haiku too
diff --git a/tls/tests/meson.build b/tls/tests/meson.build
index 6c51ac7..4915f21 100644
--- a/tls/tests/meson.build
+++ b/tls/tests/meson.build
@@ -71,7 +71,7 @@ foreach backend: backends
'-D_GNU_SOURCE',
]
- if not ['windows'].contains(host_system)
+ if not ['windows', 'haiku'].contains(host_system)
program_deps += cc.find_library('dl')
endif
--
2.52.0