From patchwork Tue Jan 26 19:42:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1431889 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=bqdl2Frg; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DQHF90CtGz9sVy for ; Wed, 27 Jan 2021 06:42:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C641E2035B; Tue, 26 Jan 2021 19:42:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hBmf+zpYeu9x; Tue, 26 Jan 2021 19:42:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0843E2040B; Tue, 26 Jan 2021 19:42:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EEEFB1BF973 for ; Tue, 26 Jan 2021 19:42:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC144859CF for ; Tue, 26 Jan 2021 19:42:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BeohFR0pZCD2 for ; Tue, 26 Jan 2021 19:42:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs03.rockwellcollins.com (da1vs03.rockwellcollins.com [205.175.227.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B883D85643 for ; Tue, 26 Jan 2021 19:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id; bh=A1VzSJcNk2pZNvwioNrWL9guMb+ttOWUDmvbQBPsto0=; b=bqdl2Frgn1qZHNew/BYF12wocqs/TXtI2MRmf+1H5zVhzKbvEoKgJV70 my67kG2fgIwllozcMKX+Dapy38hIFyFwKj7rKdkI8IZb/DRoR+yPipDpy Qp2aUfiS9gP4vKIAbSrHDoXolfVCx5OwJPl1KrG8O3akv9QBByi3hn2aC ofanHWRrkngYfGITPiyrCoa5JuwaR0XWyVc2BvGw66H6L3MDZ26tmZaV1 F8KIp2XFseQUB6/7uqMt2YRcqcosCjBZiE9MQw6q5cLLV6RtzxX88qs8R Kg7WtZGHRJXp3Hrk4xF7q5a9pihkgfb5w3Q9Z/Kr/3GIlDSz5JJ7+80ur A==; IronPort-SDR: d5kaW2F84uXznyfYpz5uqJrsiAb/FGmHQ7l+Resi6BsUQfSyLjR+jg+RfhZfdP/LxiqbJ0B1yt t2PjTG8B51oqrGdUBeNe+QMRKNY7MuwZc2oTEdVo6RroVdm+4dCAlfpecur+WVM0wqTXMWmm7u z6O3xrckC0X/9ccrnL1l0dj5iD/B02x86dsdFqaYiMt0ZAhTJhiQwe+sNu96YMd+QTtmWzIoWh EFUCTfc1yjY4Bmh1UbnibNB2/+i08BUo/i81cCi5bEDUMicom1L+KxVWGgG0ThtotKYW4KzkMY 8BM= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr01.rockwellcollins.com) ([205.175.227.14]) by da1vs03.rockwellcollins.com with ESMTP; 26 Jan 2021 13:42:13 -0600 X-Received: from biscuits.rockwellcollins.com (biscuits.rockwellcollins.lab [10.148.119.137]) by ciulimr01.rockwellcollins.com (Postfix) with ESMTP id C96BB600E4; Tue, 26 Jan 2021 13:42:12 -0600 (CST) From: Matt Weber To: buildroot@buildroot.org Date: Tue, 26 Jan 2021 13:42:11 -0600 Message-Id: <20210126194212.20688-1-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [RFC 1/2] appstream-glib: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matt Weber MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Christian Stewart AppStream-GLib is a library providing serialization and deserialization support for the AppStream metadata format. This is a dependency of Flatpak. DO NOT MERGE, this patch is being provided as an example that was used for some prototyping that wasn't completed. Signed-off-by: Christian Stewart Signed-off-by: Matt Weber --- package/Config.in | 1 + ...necessary-gtk-dependency-for-builder.patch | 30 +++++++++++++++++ package/appstream-glib/Config.in | 22 +++++++++++++ package/appstream-glib/appstream-glib.mk | 32 +++++++++++++++++++ package/appstream-glib/json-glib.hash | 5 +++ 5 files changed, 90 insertions(+) create mode 100644 package/appstream-glib/0001-build-Remove-unnecessary-gtk-dependency-for-builder.patch create mode 100644 package/appstream-glib/Config.in create mode 100644 package/appstream-glib/appstream-glib.mk create mode 100644 package/appstream-glib/json-glib.hash diff --git a/package/Config.in b/package/Config.in index 12bd0608e3..735c080989 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1840,6 +1840,7 @@ menu "Networking" endmenu menu "Other" + source "package/appstream-glib/Config.in" source "package/apr/Config.in" source "package/apr-util/Config.in" source "package/argp-standalone/Config.in" diff --git a/package/appstream-glib/0001-build-Remove-unnecessary-gtk-dependency-for-builder.patch b/package/appstream-glib/0001-build-Remove-unnecessary-gtk-dependency-for-builder.patch new file mode 100644 index 0000000000..38cce9342e --- /dev/null +++ b/package/appstream-glib/0001-build-Remove-unnecessary-gtk-dependency-for-builder.patch @@ -0,0 +1,30 @@ +From c2ea2b38da6fd4f2dbfb1a26980edd3e3faf5876 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Wed, 5 Dec 2018 18:06:53 +0200 +Subject: [PATCH] build: Remove unnecessary gtk dependency for builder + +Builder checks for gtk+, but the result isn't used anywhere, thus +introducing an unnecessary gtk+ dependency. +-Dbuilder=true -Dfonts=true would still depend on gdk, but a +-Dbuilder=true -Dfonts=false build doesn't anymore. + +Closes: #274 +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a26b88a..a8649d5 100644 +--- a/meson.build ++++ b/meson.build +@@ -60,7 +60,6 @@ gdkpixbuf = dependency('gdk-pixbuf-2.0', version : '>= 2.31.5') + + # builder (default enabled) + if get_option('builder') +- gtk = dependency('gtk+-3.0') + gmodule = dependency('gmodule-2.0') + if get_option('rpm') + rpm = dependency('rpm') +-- +2.18.1 + diff --git a/package/appstream-glib/Config.in b/package/appstream-glib/Config.in new file mode 100644 index 0000000000..3a148cdc5b --- /dev/null +++ b/package/appstream-glib/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_APPSTREAM_GLIB + bool "appstream-glib" + depends on !BR2_STATIC_LIBS # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + depends on BR2_USE_WCHAR # glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBARCHIVE + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE # gdk-pixbuf + help + AppStream-GLib is a library providing serialization and + deserialization support for the AppStream metadata format. + + https://github.com/hughsie/appstream-glib + +comment "appstream-glib needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/appstream-glib/appstream-glib.mk b/package/appstream-glib/appstream-glib.mk new file mode 100644 index 0000000000..536a375ef5 --- /dev/null +++ b/package/appstream-glib/appstream-glib.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# appstream-glib +# +################################################################################ + +APPSTREAM_GLIB_VERSION = appstream_glib_0_7_14 +APPSTREAM_GLIB_SITE = $(call github,hughsie,appstream-glib,$(APPSTREAM_GLIB_VERSION)) +APPSTREAM_GLIB_LICENSE = LGPL-2.0+ +APPSTREAM_GLIB_LICENSE_FILES = COPYING +APPSTREAM_GLIB_INSTALL_STAGING = YES + +# RPM has a cross-dependency failure +APPSTREAM_GLIB_CONF_OPTS = \ + -Dintrospection=false \ + -Drpm=false \ + -Dstemmer=false \ + -Dfonts=false +APPSTREAM_GLIB_DEPENDENCIES = \ + $(TARGET_NLS_DEPENDENCIES) \ + host-gperf \ + host-libglib2 \ + host-pkgconf \ + gdk-pixbuf \ + json-glib \ + libarchive \ + libglib2 \ + libsoup \ + $(if $(BR2_ENABLE_LOCALE),,libiconv) \ + libyaml + +$(eval $(meson-package)) diff --git a/package/appstream-glib/json-glib.hash b/package/appstream-glib/json-glib.hash new file mode 100644 index 0000000000..fae4df36d4 --- /dev/null +++ b/package/appstream-glib/json-glib.hash @@ -0,0 +1,5 @@ +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.2.sha256sum +sha256 2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8 json-glib-1.4.2.tar.xz + +# Hash for license file: +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING