From 10eb78757330003b4fe32491236d43d8970020ed Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Wed, 1 Oct 2025 09:08:19 +0300 Subject: [PATCH] dev-util/flatpak-builder-1.4.6 fixed deps --- dev-util/flatpak-builder/Manifest | 1 + .../files/flatpak-builder-1.2.2-musl.patch | 69 +++++++++++++++++++ .../flatpak-builder-1.4.6-r3.ebuild | 43 ++++++++++++ dev-util/flatpak-builder/metadata.xml | 18 +++++ .../dev-util/flatpak-builder-1.4.6-r3 | 13 ++++ 5 files changed, 144 insertions(+) create mode 100644 dev-util/flatpak-builder/Manifest 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.4.6-r3.ebuild create mode 100644 dev-util/flatpak-builder/metadata.xml create mode 100644 metadata/md5-cache/dev-util/flatpak-builder-1.4.6-r3 diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest new file mode 100644 index 0000000..be1c551 --- /dev/null +++ b/dev-util/flatpak-builder/Manifest @@ -0,0 +1 @@ +DIST flatpak-builder-1.4.6.tar.xz 621076 BLAKE2B 065bc01bd1fec181454d32de8280f55990c3a5a4f160c4af25722aca4d1942f38fce84f419c558e9c61a386f43ff7b8ea90058c8fb9ddafb7966b2f486e0b04e SHA512 be065fc5ccd7b6669cc852b5687d725d7b5aba40a492522c8ce4e9498310048d24cfa3f3e8ee5e24d990e73eb915becaa0cd181ced78508623d7696ea737f7a8 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 0000000..626fbdd --- /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.4.6-r3.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.4.6-r3.ebuild new file mode 100644 index 0000000..8e38d2d --- /dev/null +++ b/dev-util/flatpak-builder/flatpak-builder-1.4.6-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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=" + >=dev-util/ostree-2019.5:= + >=dev-libs/elfutils-0.8.12:= + >=dev-libs/glib-2.44:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + net-misc/curl:= + >=sys-apps/flatpak-0.99.1 + yaml? ( dev-libs/libyaml:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/appstream[compose] + >=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) +} diff --git a/dev-util/flatpak-builder/metadata.xml b/dev-util/flatpak-builder/metadata.xml new file mode 100644 index 0000000..5eaa7bd --- /dev/null +++ b/dev-util/flatpak-builder/metadata.xml @@ -0,0 +1,18 @@ + + + + + zmedico@gentoo.org + Zac Medico + + + stefan.cristian+git@rogentos.ro + Stefan Cristian B. + + + flatpak/flatpak-builder + + + Use libyaml for yaml support + + diff --git a/metadata/md5-cache/dev-util/flatpak-builder-1.4.6-r3 b/metadata/md5-cache/dev-util/flatpak-builder-1.4.6-r3 new file mode 100644 index 0000000..595294b --- /dev/null +++ b/metadata/md5-cache/dev-util/flatpak-builder-1.4.6-r3 @@ -0,0 +1,13 @@ +BDEPEND=dev-libs/appstream[compose] >=sys-devel/gettext-0.18.2 virtual/pkgconfig doc? ( app-text/xmlto dev-libs/libxslt ) +DEFINED_PHASES=configure +DEPEND=>=dev-util/ostree-2019.5:= >=dev-libs/elfutils-0.8.12:= >=dev-libs/glib-2.44:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= net-misc/curl:= >=sys-apps/flatpak-0.99.1 yaml? ( dev-libs/libyaml:= ) +DESCRIPTION=Tool to build flatpaks from source +EAPI=8 +HOMEPAGE=http://flatpak.org/ +IUSE=doc +yaml +KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 +LICENSE=LGPL-2.1+ +RDEPEND=>=dev-util/ostree-2019.5:= >=dev-libs/elfutils-0.8.12:= >=dev-libs/glib-2.44:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= net-misc/curl:= >=sys-apps/flatpak-0.99.1 yaml? ( dev-libs/libyaml:= ) +SLOT=0 +SRC_URI=https://github.com/flatpak/flatpak-builder/releases/download/1.4.6/flatpak-builder-1.4.6.tar.xz +_md5_=f1331d8a79ed6fc435cd1ee2471e18a9