From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- dev-util/flatpak-builder/Manifest | 6 +- .../files/flatpak-builder-1.0.11-musl.patch | 18 ++++++ .../files/flatpak-builder-1.2.2-musl.patch | 69 ++++++++++++++++++++++ .../flatpak-builder/flatpak-builder-1.0.11.ebuild | 2 + .../flatpak-builder/flatpak-builder-1.2.2.ebuild | 43 ++++++++++++++ 5 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch create mode 100644 dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch create mode 100644 dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild (limited to 'dev-util/flatpak-builder') diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest index de6fbc23628c..4dac70541742 100644 --- a/dev-util/flatpak-builder/Manifest +++ b/dev-util/flatpak-builder/Manifest @@ -1,3 +1,7 @@ +AUX flatpak-builder-1.0.11-musl.patch 626 BLAKE2B 83899e982e24f4045af7c494b92373eb712e9e34415bb4cf6a8f00edf8d08dc999e0f10e52fea03bf56d200b2a7503d2c8a85a54e5c9af76ea58739b8baaf339 SHA512 32595a1e9ef8e5693c69882849e89d66438f3bb36d9e2c2a4db2b1d84835636ed2db49703b18ead616df68aee8509cc5a1d4074ff49616134294d4a9f77b2a2a +AUX flatpak-builder-1.2.2-musl.patch 1977 BLAKE2B d6e9374fcd7249c206714beb1f14f856d41576ea04cf4e27779dfc95dbef7def2f27e5183518d930ef34bf111ba4264188bef6e78169227e0f8a59d479ffc842 SHA512 a63f6df29d0045e13796a7c7b033bad1941411f84018b05479e3ffa14bada0826e891fd8e83b9e3df741c27d8954893bb85070be69e92ff3de48904746886100 DIST flatpak-builder-1.0.11.tar.xz 459500 BLAKE2B aa5edebaa6a52a7dbf5cd68bfc356617e13556036979575369ee65e919b267f0ec6838524668793c394b9024f97309d71ceb094c26e3893dedc8884ea8d18d1f SHA512 27c15ecccee79c6a7545f11d7c8cd7b80d4e99dc9c48818dd722934dfbe61e02b258b3db59946badfe5e1e189b39b509a2dbff1404a31a42c29ed4993fb5ec26 -EBUILD flatpak-builder-1.0.11.ebuild 848 BLAKE2B cc0a9f7a81a13c5e0c5f5f07df5b13571edfae7026c3025d2f2ff285c91c6ca7e54eb960452820887231e33d5fd9cbaca3c00b7814e3fd3a58840b97bfb6ad1c SHA512 9f7751f07dce91715778bf31cabc4fb1a715e4ad4b2b143ac2361f5cb0b90d8251d117849f90f5fc5fa455f8be1570099bfcb1224f94d91cf6f0d69006c9354a +DIST flatpak-builder-1.2.2.tar.xz 503444 BLAKE2B f499d5a5bb313530b2a5c69c2aef897aead40e959495ee368f375e03b9bca3c224b377607d1ca213f8640b0f926d7b862b0a7502e1773661a8e5ee983340f53c SHA512 28ab004f5c4fdb7f43b7d3f0823d54dad0aa4f660d5bbe9969e0ce011a1e338e2442e676d1d4c197af60d61a0911b8715ba34244b547116887bbcdef589e1b47 +EBUILD flatpak-builder-1.0.11.ebuild 907 BLAKE2B 2f134f02ecf3371956c756d63920be5ddca46f4de07cdca25aff2b5fb48bad7215d99a015788067529cc67a8130752a49aa83d6a62f3d62cb8c73e580348a07f SHA512 f545a6ba6bf0f689761a4ef2d670213939be7eaf20bd93f27127dd0bccdd8712d4a2b482037bcdd26e87e690a8daac4f96c02a178e3af94c36414bca75f7255e +EBUILD flatpak-builder-1.2.2.ebuild 906 BLAKE2B cfbe124731f52e2a00564a25c0df26c01fd56c0cc1d080177f741c3acc4725ef40f6575768df4182e0ebd6fdc206c70a5a2e2ef771daf2eeeb356515cbac0b28 SHA512 ee5d845726d7c0b7e57105c38ba8d8e462fdc76811f758f55f50fde84b84f1ec0cc533722c9e19ef7321c5b074cd89169e7eb784857ef0d698eaf0afb3c4067c MISC metadata.xml 404 BLAKE2B 6dbef666c9bbd3347d28811890ab5b9ab1ebdf60895dc2d8146a88374a0c348706656e9758a92eaeb47bfa86f833313d669530460a1ee6ca7f81da1db542fb95 SHA512 bfb8bc1b79690c44e7e8171035e326bccc96e1df26d7fe12515e26290ef68b64f6eef1e86ab24530ea6b2c9cfc3240f1587b0d7c21686fdecf9ee8e53144b42b diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch new file mode 100644 index 000000000000..b5ef0ec15504 --- /dev/null +++ b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch @@ -0,0 +1,18 @@ +--- a/libglnx/glnx-macros.h ++++ b/libglnx/glnx-macros.h +@@ -28,6 +28,16 @@ + + G_BEGIN_DECLS + ++/* taken from glibc unistd.h and fixes musl */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + /* All of these are for C only. */ + #ifndef __GI_SCANNER__ diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch new file mode 100644 index 000000000000..626fbddd0352 --- /dev/null +++ b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch @@ -0,0 +1,69 @@ +diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c +index 668777a..b3ba5cb 100644 +--- a/subprojects/debugedit/tools/debugedit.c ++++ b/subprojects/debugedit/tools/debugedit.c +@@ -25,7 +25,11 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include ++#else ++#include "error.h" ++#endif + #include + #include + #include +diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h +new file mode 100644 +index 0000000..c330dc3 +--- /dev/null ++++ b/subprojects/debugedit/tools/error.h +@@ -0,0 +1,26 @@ ++#ifndef _ERROR_H ++#define _ERROR_H ++#include ++#include ++#include ++#include ++#include ++ ++static unsigned int error_message_count = 0; ++ ++static inline void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++} ++ ++#endif +diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h +index 6d8aca9..e3e4e33 100644 +--- a/subprojects/libglnx/glnx-macros.h ++++ b/subprojects/libglnx/glnx-macros.h +@@ -28,6 +28,16 @@ + + G_BEGIN_DECLS + ++/* taken from glibc unistd.h and fixes musl */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + /* All of these are for C only. */ + #ifndef __GI_SCANNER__ + diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild index a8017f003f1d..20d616e0056d 100644 --- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild +++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild @@ -33,6 +33,8 @@ BDEPEND=" ) " +PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch") + src_configure() { econf \ $(use_enable doc documentation) \ diff --git a/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild new file mode 100644 index 000000000000..f135df85fc71 --- /dev/null +++ b/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz" +DESCRIPTION="Tool to build flatpaks from source" +HOMEPAGE="http://flatpak.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="doc +yaml" + +RDEPEND=" + >=sys-apps/flatpak-0.99.1 + >=dev-util/ostree-2019.5:= + >=net-libs/libsoup-2.4:= + >=dev-libs/elfutils-0.8.12:= + >=dev-libs/glib-2.44:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + net-misc/curl:= + yaml? ( dev-libs/libyaml:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + doc? ( + app-text/xmlto + dev-libs/libxslt + ) +" + +PATCHES=("${FILESDIR}/flatpak-builder-1.2.2-musl.patch") + +src_configure() { + econf \ + $(use_enable doc documentation) \ + $(use_enable doc docbook-docs) \ + $(use_with yaml) +} -- cgit v1.2.3