From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bc9ck3C6cz333d for ; Tue, 8 Jul 2025 19:08:38 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bc9cf66TKz2y3W for ; Tue, 8 Jul 2025 19:08:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4bc9cd4qF3zg1; Tue, 8 Jul 2025 19:08:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1752001713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFbrzbHQOr26OKELiLOVSPZykqvY6IqzoEbjiY+CaAY=; b=Q/1YHFDIBV4qKFHnJ8WcY/emjjQkYLmMBRvhVi+0FtHHxtMZt5EWKEkMW3fKdMeqLz7x4M uotM0p7UZ1cMPxDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1752001713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFbrzbHQOr26OKELiLOVSPZykqvY6IqzoEbjiY+CaAY=; b=RY6r9OpUsoJxec4fROwXAlFR398Z2jZq/KiiyzRPAaPWWVmC8PdIAPsxvWFYTKBb/ntKEQ Q5sO9HJ/HSQmWjy09ptFuF9JcjWfQ9hhcVsLcP9sZRtgbtxSNjGQVL6YuiUdf8J6JiEMh8 FbOI6b6ibLX/3m/zaY9si86/p9Pfx2oIkDpf+2aRsKyubk9BYN/I2UsXHNgpaLuimwvyS5 TFn2+Vb2pFoxgDN7jr8m0v2L4P/ZN4WCGvzvu2EHxM7eXnZVP2VzA8lKVhu8D3EsIvyHY0 t5U7XXF/lNoVnc5AuiAkJuoiXKlwzJ0Pn291LKNDx9zbRhDRgkeP1ZN7tmjlUQ== Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: Mime-Version: 1.0 Subject: Re: [PATCH 1/3] json-glib: New package Date: Tue, 8 Jul 2025 20:08:31 +0100 Message-Id: References: <693392d3-4b68-4e8a-8c55-b908cae8c2dd@ipfire.org> Cc: =?utf-8?Q?Daniel_Weism=C3=BCller?= , "IPFire: Development-List" In-Reply-To: <693392d3-4b68-4e8a-8c55-b908cae8c2dd@ipfire.org> To: Adolf Belka Oops, sorry, that was me. Please send a patch and I will merge it tomorrow m= orning! > On 8 Jul 2025, at 19:33, Adolf Belka wrote: >=20 > =EF=BB=BFHi Daniel, >=20 > json-glib is failing to build because it has a run-time dependency for gio= and that is provided by glib which comes after json-glib in make.sh >=20 > You will need to shift glib so it comes before json-glib. >=20 > You will also need to figure out what needs to be uncommented from the gli= b rootfile so that it will be available at run-time. >=20 > Regards, >=20 > Adolf. >=20 >=20 >> On 08/07/2025 17:04, Daniel Weism=C3=BCller wrote: >> This package is required for swtpm. >> Signed-off-by: Daniel Weism=C3=BCller >> --- >> config/rootfiles/common/json-glib | 118 ++++++++++++++++++++++++++++++ >> lfs/json-glib | 84 +++++++++++++++++++++ >> make.sh | 1 + >> 3 files changed, 203 insertions(+) >> create mode 100644 config/rootfiles/common/json-glib >> create mode 100644 lfs/json-glib >> diff --git a/config/rootfiles/common/json-glib b/config/rootfiles/common/= json-glib >> new file mode 100644 >> index 000000000..d403c7c28 >> --- /dev/null >> +++ b/config/rootfiles/common/json-glib >> @@ -0,0 +1,118 @@ >> +#usr/bin/json-glib-format >> +#usr/bin/json-glib-validate >> +#usr/include/json-glib-1.0 >> +#usr/include/json-glib-1.0/json-glib >> +#usr/include/json-glib-1.0/json-glib/json-builder.h >> +#usr/include/json-glib-1.0/json-glib/json-enum-types.h >> +#usr/include/json-glib-1.0/json-glib/json-generator.h >> +#usr/include/json-glib-1.0/json-glib/json-glib.h >> +#usr/include/json-glib-1.0/json-glib/json-gobject.h >> +#usr/include/json-glib-1.0/json-glib/json-gvariant.h >> +#usr/include/json-glib-1.0/json-glib/json-parser.h >> +#usr/include/json-glib-1.0/json-glib/json-path.h >> +#usr/include/json-glib-1.0/json-glib/json-reader.h >> +#usr/include/json-glib-1.0/json-glib/json-types.h >> +#usr/include/json-glib-1.0/json-glib/json-utils.h >> +#usr/include/json-glib-1.0/json-glib/json-version-macros.h >> +#usr/include/json-glib-1.0/json-glib/json-version.h >> +#usr/lib/libjson-glib-1.0.so >> +usr/lib/libjson-glib-1.0.so.0 >> +usr/lib/libjson-glib-1.0.so.0.1000.6 >> +#usr/lib/pkgconfig/json-glib-1.0.pc >> +#usr/libexec/installed-tests >> +#usr/libexec/installed-tests/json-glib-1.0 >> +#usr/libexec/installed-tests/json-glib-1.0/array >> +#usr/libexec/installed-tests/json-glib-1.0/boxed >> +#usr/libexec/installed-tests/json-glib-1.0/builder >> +#usr/libexec/installed-tests/json-glib-1.0/generator >> +#usr/libexec/installed-tests/json-glib-1.0/gvariant >> +#usr/libexec/installed-tests/json-glib-1.0/invalid >> +#usr/libexec/installed-tests/json-glib-1.0/invalid.json >> +#usr/libexec/installed-tests/json-glib-1.0/node >> +#usr/libexec/installed-tests/json-glib-1.0/object >> +#usr/libexec/installed-tests/json-glib-1.0/parser >> +#usr/libexec/installed-tests/json-glib-1.0/path >> +#usr/libexec/installed-tests/json-glib-1.0/reader >> +#usr/libexec/installed-tests/json-glib-1.0/serialize-complex >> +#usr/libexec/installed-tests/json-glib-1.0/serialize-full >> +#usr/libexec/installed-tests/json-glib-1.0/serialize-simple >> +#usr/libexec/installed-tests/json-glib-1.0/skip-bom.json >> +#usr/libexec/installed-tests/json-glib-1.0/stream-load.json >> +#usr/share/installed-tests >> +#usr/share/installed-tests/json-glib-1.0 >> +#usr/share/installed-tests/json-glib-1.0/array.test >> +#usr/share/installed-tests/json-glib-1.0/boxed.test >> +#usr/share/installed-tests/json-glib-1.0/builder.test >> +#usr/share/installed-tests/json-glib-1.0/generator.test >> +#usr/share/installed-tests/json-glib-1.0/gvariant.test >> +#usr/share/installed-tests/json-glib-1.0/invalid.test >> +#usr/share/installed-tests/json-glib-1.0/node.test >> +#usr/share/installed-tests/json-glib-1.0/object.test >> +#usr/share/installed-tests/json-glib-1.0/parser.test >> +#usr/share/installed-tests/json-glib-1.0/path.test >> +#usr/share/installed-tests/json-glib-1.0/reader.test >> +#usr/share/installed-tests/json-glib-1.0/serialize-complex.test >> +#usr/share/installed-tests/json-glib-1.0/serialize-full.test >> +#usr/share/installed-tests/json-glib-1.0/serialize-simple.test >> +#usr/share/locale/ab/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/as/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/be/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/bg/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/bs/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ca/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/cs/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/da/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/de/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/el/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/en_GB/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/eo/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/es/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/et/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/eu/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/fa/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/fr/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/fur/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/gl/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/he/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/hi/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/hr/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/hu/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/id/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/it/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ja/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ka/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/kab/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ko/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ky/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/lt/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/lv/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ml/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ms/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/nb/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ne/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/nl/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/oc/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/or/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/pa/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/pl/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/pt/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/pt_BR/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ro/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ru/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/sk/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/sl/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/sr/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/sr@latin/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/sv/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/te/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/tg/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/th/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/tr/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/ug/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/uk/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/vi/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/zh_CN/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/zh_HK/LC_MESSAGES/json-glib-1.0.mo >> +#usr/share/locale/zh_TW/LC_MESSAGES/json-glib-1.0.mo >> diff --git a/lfs/json-glib b/lfs/json-glib >> new file mode 100644 >> index 000000000..00617cd93 >> --- /dev/null >> +++ b/lfs/json-glib >> @@ -0,0 +1,84 @@ >> +########################################################################= ####### >> +# = # >> +# IPFire.org - A linux based firewall = # >> +# Copyright (C) 2007-2025 IPFire Team = # >> +# = # >> +# This program is free software: you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation, either version 3 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# This program is distributed in the hope that it will be useful, = # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >> +# GNU General Public License for more details. = # >> +# = # >> +# You should have received a copy of the GNU General Public License = # >> +# along with this program. If not, see . = # >> +# = # >> +########################################################################= ####### >> + >> +########################################################################= ####### >> +# Definitions >> +########################################################################= ####### >> + >> +include Config >> + >> +VER =3D 1.10.6 >> + >> +THISAPP =3D json-glib-$(VER) >> +DL_FILE =3D $(THISAPP).tar.xz >> +DL_FROM =3D $(URL_IPFIRE) >> +DIR_APP =3D $(DIR_SRC)/$(THISAPP) >> +TARGET =3D $(DIR_INFO)/$(THISAPP) >> + >> +########################################################################= ####### >> +# Top-level Rules >> +########################################################################= ####### >> + >> +objects =3D $(DL_FILE) >> + >> +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> + >> +$(DL_FILE)_BLAKE2 =3D 125ba305d5d33ecb1a1fbe46322c5035c7f97bd49e8eeef26e= 3c9c5d829693978fdc10bbe3d926cd4d07f8fd80c9df282d5ff7fe80ab4a6ab8e17c93e9d362= d4 >> + >> +install : $(TARGET) >> + >> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> + >> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> + >> +b2 : $(subst %,%_BLAKE2,$(objects)) >> + >> +dist: >> + @$(PAK) >> + >> +########################################################################= ####### >> +# Downloading, checking, b2sum >> +########################################################################= ####### >> + >> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >> + @$(CHECK) >> + >> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >> + @$(LOAD) >> + >> +$(subst %,%_BLAKE2,$(objects)) : >> + @$(B2SUM) >> + >> +########################################################################= ####### >> +# Installation Details >> +########################################################################= ####### >> + >> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> + @$(PREBUILD) >> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >> + cd $(DIR_APP) && meson setup \ >> + --prefix=3D/usr \ >> + --sysconfdir=3D/etc \ >> + --libdir=3D/usr/lib \ >> + builddir/ >> + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) >> + cd $(DIR_APP) && ninja -C builddir/ install >> + @rm -rf $(DIR_APP) >> + @$(POSTBUILD) >> diff --git a/make.sh b/make.sh >> index 57a0ff2cf..3412c8f5a 100755 >> --- a/make.sh >> +++ b/make.sh >> @@ -1514,6 +1514,7 @@ build_system() { >> lfsmake2 libarchive >> lfsmake2 cmake >> lfsmake2 json-c >> + lfsmake2 json-glib >> lfsmake2 tcl >> lfsmake2 python3-MarkupSafe >> lfsmake2 python3-Jinja2 >=20 >=20