diff --git a/net-libs/glib_networking/glib_networking-2.54.1.recipe b/net-libs/glib_networking/glib_networking-2.72.2.recipe similarity index 70% rename from net-libs/glib_networking/glib_networking-2.54.1.recipe rename to net-libs/glib_networking/glib_networking-2.72.2.recipe index 294006e40..22105b39e 100644 --- a/net-libs/glib_networking/glib_networking-2.54.1.recipe +++ b/net-libs/glib_networking/glib_networking-2.72.2.recipe @@ -11,13 +11,13 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 2008-2010 Collabora Ltd. 1995-2010 Several others" LICENSE="GNU LGPL v2" -REVISION="8" -SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.54/glib-networking-$portVersion.tar.xz" -CHECKSUM_SHA256="eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f" +REVISION="1" +SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.72/glib-networking-$portVersion.tar.xz" +CHECKSUM_SHA256="cd2a084c7bb91d78e849fb55d40e472f6d8f6862cddc9f12c39149359ba18268" SOURCE_DIR="glib-networking-$portVersion" -ARCHITECTURES="all ?x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" glib_networking$secondaryArchSuffix = $portVersion compat >= 2 @@ -46,32 +46,32 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:intltool_update cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:meson + cmd:ninja + cmd:python3 cmd:pkg_config$secondaryArchSuffix - cmd:python " BUILD() { - autoreconf -fi - export CFLAGS=-D_BSD_SOURCE - runConfigure ./configure --disable-maintainer-mode \ - --with-ca-certificates=/system/data/ssl/CARootCertificates.pem + sed -e '/meson.add_install_script/ s/^#*/#/' -i meson.build - make $jobArgs + CFLAGS="-D_BSD_SOURCE" \ + LDFLAGS="-lbsd -lgnu -lnetwork" meson build \ + --buildtype=release \ + --prefix=$prefix --includedir=$includeDir \ + --libdir=$libDir --datadir=$dataDir --bindir=$binDir \ + --localedir=$dataDir/locale + + ninja $jobArgs -C build } INSTALL() { - find -type f -name 'Makefile' -exec sed -i "s|^GIO_MODULE_DIR =.*|GIO_MODULE_DIR = $libDir/gio/modules|g" {} \; - make install - - rm $libDir/gio/modules/libgiognutls.la + ninja -C build install }