From f37d90c9473c8d7f4af488720b0d5795dbe9110d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 14 Jun 2024 13:02:27 +0200 Subject: [PATCH 1/5] autoconf-archive: Add version 2023.02.20 [Description][1]: > The GNU Autoconf Archive is a collection of more than 500 macros for > GNU Autoconf that have been contributed as free software by friendly > supporters of the cause from all over the Internet. Needed for tpm tools [2][3]. [1]: https://www.gnu.org/software/autoconf-archive/Introduction.html [2]: https://github.com/tpm2-software/tpm2-tools/issues/3407 [3]: https://github.com/tpm2-software/tpm2-tss/issues/2375 --- autoconf-archive.be0 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 autoconf-archive.be0 diff --git a/autoconf-archive.be0 b/autoconf-archive.be0 new file mode 100755 index 000000000..a122a34fc --- /dev/null +++ b/autoconf-archive.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION autoconf-archive-2023.02.20-0 + +SRCURL[0]="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2023.02.20.tar.xz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From 205eb333ea7d5ca9aeac7f5514ee3ca9ad0d8b28 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 14 Jun 2024 13:06:48 +0200 Subject: [PATCH 2/5] autoconf-archive: Download source archive from beehive.molgen.mpg.de --- autoconf-archive.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autoconf-archive.be0 b/autoconf-archive.be0 index a122a34fc..b385f9e04 100755 --- a/autoconf-archive.be0 +++ b/autoconf-archive.be0 @@ -2,7 +2,8 @@ # BEE_VERSION autoconf-archive-2023.02.20-0 -SRCURL[0]="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2023.02.20.tar.xz" +#SRCURL[0]="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2023.02.20.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/1a9ee97d3503d134e16c87c4fa1119cf/autoconf-archive-2023.02.20.tar.xz" # PATCHURL+=() From 8ab90b2cd424526579d7a0996351485bd06d0c40 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 14 Jun 2024 13:08:43 +0200 Subject: [PATCH 3/5] gnome-common: Strip trailing space --- gnome-common-3.18.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-common-3.18.0-0.bee b/gnome-common-3.18.0-0.bee index 0659f802b..cdcf7c9e3 100755 --- a/gnome-common-3.18.0-0.bee +++ b/gnome-common-3.18.0-0.bee @@ -52,7 +52,7 @@ SRCURL[0]="https://download.gnome.org/sources/gnome-common/${PKGVERSION[2]}/gnom #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 8ad81444eb8e0f648ec6ec5af69edb8f6b6d6315 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 14 Jun 2024 13:12:12 +0200 Subject: [PATCH 4/5] gnome-common: Remove two headers provided by autoconf-archive [BEE] /src/mariux/beeroot/bee-files/autoconf-archive-2023.02.20-0.bee '/home/pmenzel/bee-files/./autoconf-archive.be0' -> '/src/mariux/beeroot/bee-files/autoconf-archive-2023.02.20-0.bee' [BEE] Conflicts with installed package found: gnome-common-3.18.0-0.x86_64: [BEE] /usr/share/aclocal/ax_check_enable_debug.m4 [BEE] /usr/share/aclocal/ax_code_coverage.m4 --- gnome-common-3.18.0-0.bee | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnome-common-3.18.0-0.bee b/gnome-common-3.18.0-0.bee index cdcf7c9e3..994c7dd5d 100755 --- a/gnome-common-3.18.0-0.bee +++ b/gnome-common-3.18.0-0.bee @@ -59,10 +59,13 @@ SRCURL[0]="https://download.gnome.org/sources/gnome-common/${PKGVERSION[2]}/gnom # bee_build #} -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' +mee_install() { + bee_install + # Provided by autoconf-archive + start_cmd rm ${D}${DATADIR}/aclocal/ax_check_enable_debug.m4 + start_cmd rm ${D}${DATADIR}/aclocal/ax_code_coverage.m4 +} +# by default this may be 'make install DESTDIR="${D}"' ############################################################################### ## From 4dac900d2ca5ef541816fd7cbf4623de966e6de4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 14 Jun 2024 13:13:28 +0200 Subject: [PATCH 5/5] gnome-common: Increment revision from 3.18.0-0 to 3.18.0-1 --- gnome-common-3.18.0-0.bee => gnome-common-3.18.0-1.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gnome-common-3.18.0-0.bee => gnome-common-3.18.0-1.bee (100%) diff --git a/gnome-common-3.18.0-0.bee b/gnome-common-3.18.0-1.bee similarity index 100% rename from gnome-common-3.18.0-0.bee rename to gnome-common-3.18.0-1.bee