diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-05 22:24:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-05 22:24:31 +0100 |
commit | 0234a4013e6d1821ab7db449aa7867d7141324a8 (patch) | |
tree | 5ab2ccf666de1127eec29b931b11e63b89b02392 /app-arch/gcab | |
parent | 44a22ab89258383202cae3037c3a5685aa903251 (diff) |
gentoo auto-resync : 05:09:2023 - 22:24:31
Diffstat (limited to 'app-arch/gcab')
-rw-r--r-- | app-arch/gcab/Manifest | 3 | ||||
-rw-r--r-- | app-arch/gcab/files/1.5-meson-git-version-is-optional.patch | 35 | ||||
-rw-r--r-- | app-arch/gcab/gcab-1.5.ebuild | 56 |
3 files changed, 0 insertions, 94 deletions
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest index 17bfab9f2c50..bea4eabc45b4 100644 --- a/app-arch/gcab/Manifest +++ b/app-arch/gcab/Manifest @@ -1,6 +1,3 @@ -AUX 1.5-meson-git-version-is-optional.patch 1143 BLAKE2B 55152a557ec7ee282ae22c9df3bab54bae2b26fbfbf59304c48e03536d69799e02f8d5005ef567de4ee9d0cac76b0372483b9bbb05e7c0d0d04d730bbcdd5edf SHA512 85ade30168a287a3cb22b0faf12a4176e1e244b8470411e6a821fe8631f45a33b343739f9fe282b8f8fedbf2770a6b518480943a0c6bb01045c7a97d2b71cd50 -DIST gcab-1.5.tar.xz 81728 BLAKE2B ba1793a8374e2dac412ca2807343781013f5be8d79e444ef0a136fbf903dd9a47809b3dec4703ebd19d196a7046a0c8405ae8463c2f7338fdc5eaf979436e8e1 SHA512 2a9b7d2720abbb5527d478ac760898ae254d08b7aa929fbb21753296e5a07c51d62e134a3f8b1b21d9b557d4093505194e09823ddbaf58465d37b372f37534b7 DIST gcab-1.6.tar.xz 82088 BLAKE2B 04e78229649f1c5cee8d9a9a52e6489264a0356fd21830b71f09c7a22ac73a91ae721f5a99bedbe7556265c1bdd134b3500aad580407c31b0aac487ef1810bf8 SHA512 26b8dcf47ba98e7cc073a551d1c965c13a72d298c8a4e124823bdbb20fe314c8f687232df9ae824a54d81f96fe7d9ac1a40aed24e51f8706595079cec2c61fc9 -EBUILD gcab-1.5.ebuild 1196 BLAKE2B 0c72673f05aeeb2b570483b6a2b375f8e5c8100c152b489f9f78bc994ac7ed7a31010906508871a8bdc44e20c8ac473ad2b78c68d330f47515f42e2d0893674e SHA512 a5f7a45f445250cf8e22d249c0ac15153965e0b326fde23b4d5e6da23bcc9b24c9fc378f610bdbbd9702d7afceef220c122df90e2cb172f10b914706f17a0039 EBUILD gcab-1.6.ebuild 1126 BLAKE2B d74678606e9ceddd702d45592ec5d980d9965561ce656789afb695d8cd89113d07225c97a6bee6eaffa5fb97b96139935cb5cd687406daa44a5db4b12fa6d594 SHA512 5f26995404ccb4247a881925b69c5ff59e24949dd653c9b5161fcd90bfedd77a27617c4e209e3451466f486cb9e5b0b9eb535fdc4146c3fe4d6099f9db6ec7f9 MISC metadata.xml 345 BLAKE2B d32d83f8c7d6db7c4d0c22125c547f3e838fd8154b2aa80c230ecc9c64a5edc84814f50bbc159c5921fcd767eea8c2eb65e08217eb284094a6fe122ee5a1e34a SHA512 83301d336de47bf8ab99a9b50097981433220039e2769c4dfe4779a7c2309fa69e5613fa209470f19e21de17a40177757e6abaa73c58f4145f0ef7ef1f1af5d4 diff --git a/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch b/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch deleted file mode 100644 index 6bfbaecf78a6..000000000000 --- a/app-arch/gcab/files/1.5-meson-git-version-is-optional.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ad0baea50359c1978a9224ee60bf98d97bfb991f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> -Date: Fri, 5 Aug 2022 11:13:41 +0400 -Subject: [PATCH] meson: git version is optional -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -My bad, git may be present, but running "git abbrev" from the tarball -extracted project can fail. - -Fix commit a755e2ae77035aad9644adadaec5ecf15e9656ba ("meson: fix new -warning about run_command()") - -Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 15fd5cd..5eba715 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,7 +8,7 @@ project('gcab', 'c', - git_version = [] - git = find_program('git', required: false) - if git.found() -- git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: true).stdout().strip().split('-') -+ git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: false).stdout().strip().split('-') - endif - - # libtool versioning --- -2.35.1 - diff --git a/app-arch/gcab/gcab-1.5.ebuild b/app-arch/gcab/gcab-1.5.ebuild deleted file mode 100644 index 8cb66f2e3206..000000000000 --- a/app-arch/gcab/gcab-1.5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson vala xdg - -DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files" -HOMEPAGE="https://wiki.gnome.org/msitools https://gitlab.gnome.org/GNOME/gcab" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -IUSE="gtk-doc +introspection test vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.62.0:2 - sys-libs/zlib - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.3 - ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PV}-meson-git-version-is-optional.patch -) - -src_prepare() { - default - xdg_environment_reset - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - $(meson_use introspection) - -Dnls=true - $(meson_use vala vapi) - $(meson_use test tests) - -Dinstalled_tests=false - ) - meson_src_configure -} |