[jhbuild/build-libpsl: 3/3] core-deps: build libpsl instead of having it as a sysdep
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/build-libpsl: 3/3] core-deps: build libpsl instead of having it as a sysdep
- Date: Wed, 5 Feb 2020 20:11:10 +0000 (UTC)
commit 12517b327838b40d66932968bc0a4aeb71fb9a70
Author: Christoph Reiter <reiter christoph gmail com>
Date: Tue Feb 4 13:14:20 2020 +0100
core-deps: build libpsl instead of having it as a sysdep
libsoup requires it and the last Ubuntu LTS has a too old version
Fixes #57
modulesets/gnome-suites-core-deps-latest.modules | 11 +++++++++++
modulesets/gnome-sysdeps-latest.modules | 5 -----
2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules
b/modulesets/gnome-suites-core-deps-latest.modules
index 3ea3da7c..89ad13a3 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1614,6 +1614,17 @@
</dependencies>
</meson>
+ <autotools id="libpsl" autogenargs="--enable-runtime=libicu --enable-builtin=libicu">
+ <branch repo="github-tar"
+ version="0.21.0"
+ module="rockdaboot/libpsl/releases/download/libpsl-${version}/libpsl-${version}.tar.gz"
+ checkoutdir="libpsl-${version}"
+ hash="sha256:41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"/>
+ <dependencies>
+ <dep package="libicu"/>
+ </dependencies>
+ </autotools>
+
<meson id="libsoup" mesonargs="-Dtls_check=false -Dvapi=enabled">
<branch/>
<dependencies>
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index 6996c9a7..d95c376b 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -516,11 +516,6 @@
version="0.17"/>
</systemmodule>
- <systemmodule id="libpsl">
- <pkg-config>libpsl.pc</pkg-config>
- <branch repo="system"/>
- </systemmodule>
-
<systemmodule id="libcanberra">
<pkg-config>libcanberra-gtk.pc</pkg-config>
<branch repo="system"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]