From ad5ce8fa440f8e0129805e1953e81a109a0a03fb Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Mon, 4 Nov 2019 14:02:08 +0100 Subject: [PATCH 01/29] libestr: update to 0.1.11 - rsyslog says so - be0ify - SRCURL --- libestr-0.1.0-0.bee | 30 ------------------------------ libestr.be0 | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 30 deletions(-) delete mode 100755 libestr-0.1.0-0.bee create mode 100755 libestr.be0 diff --git a/libestr-0.1.0-0.bee b/libestr-0.1.0-0.bee deleted file mode 100755 index 58c57de25..000000000 --- a/libestr-0.1.0-0.bee +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://downloads.sourceforge.net/project/libestr/libestr-0.1.0.tar.gz" - -PATCHURL[0]="" - -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - -mee_patch() { - bee_patch -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} - diff --git a/libestr.be0 b/libestr.be0 new file mode 100755 index 000000000..a959665eb --- /dev/null +++ b/libestr.be0 @@ -0,0 +1,38 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libestr-0.1.11-0 + +# more info: https://libestr.adiscon.com +# dependency of rsyslog + +SRCURL[0]="https://libestr.adiscon.com/files/download/libestr-${PKGVERSION}.tar.gz" + +# 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 49a395a141b7c2ca3ae291d48edc72ac7546efd9 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Mon, 4 Nov 2019 14:12:16 +0100 Subject: [PATCH 02/29] libfastjson: add version 0.99.8 - rsyslog says so --- libfastjson.be0 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 libfastjson.be0 diff --git a/libfastjson.be0 b/libfastjson.be0 new file mode 100755 index 000000000..17de943c4 --- /dev/null +++ b/libfastjson.be0 @@ -0,0 +1,38 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libfastjson-0.99.8-0 + +# rsyslog dependency + +SRCURL[0]="https://github.com/rsyslog/libfastjson/archive/v${PKGVERSION}.tar.gz ${PKGNAME}-${PKGFULLVERSION}.tar.gz" + +# PATCHURL+=() + +build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_configure() { + autoreconf -fvi + bee_configure +} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From 674f57520bb0f4196f8b0f9910ed7ef5019d1834 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Tue, 5 Nov 2019 12:38:38 +0100 Subject: [PATCH 03/29] rsyslog: update to 8.1910 - be0ify - disable static - disable new fancy shiny stuff --- rsyslog-6.1.2-0.bee | 30 ----------------------------- rsyslog.be0 | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 30 deletions(-) delete mode 100755 rsyslog-6.1.2-0.bee create mode 100755 rsyslog.be0 diff --git a/rsyslog-6.1.2-0.bee b/rsyslog-6.1.2-0.bee deleted file mode 100755 index d12460f8e..000000000 --- a/rsyslog-6.1.2-0.bee +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://www.rsyslog.com/files/download/rsyslog/rsyslog-6.1.2.tar.gz" - -PATCHURL[0]="" - -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - -mee_patch() { - bee_patch -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} - diff --git a/rsyslog.be0 b/rsyslog.be0 new file mode 100755 index 000000000..9b3d1a39e --- /dev/null +++ b/rsyslog.be0 @@ -0,0 +1,46 @@ +#!/usr/bin/env beesh + +# BEE_VERSION rsyslog-8.1910.0-1 + +# more info: https://foo.bar.com + +SRCURL[0]="http://www.rsyslog.com/files/download/rsyslog/rsyslog-${PKGVERSION}.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_configure() { + bee_configure \ + --disable-silent-rules \ + --disable-fmhash \ + --disable-fmhttp \ + --disable-default-tests \ + --disable-helgrind \ + --disable-static + +# PS1='xxx ' bash -norc +} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +mee_install_post() { + mkdir -vp ${D}/etc/systemd/system + ln -vs /lib/systemd/system/rsyslog.service ${D}/etc/systemd/system/syslog.service +} From 25ccd11c03004a5b82e3e5f36f349c0559fa5d2e Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Tue, 5 Nov 2019 12:39:33 +0100 Subject: [PATCH 04/29] libestr: disable shared - get rid of dependency --- libestr.be0 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libestr.be0 b/libestr.be0 index a959665eb..a6abe0fd2 100755 --- a/libestr.be0 +++ b/libestr.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libestr-0.1.11-0 +# BEE_VERSION libestr-0.1.11-1 # more info: https://libestr.adiscon.com # dependency of rsyslog @@ -21,9 +21,10 @@ SRCURL[0]="https://libestr.adiscon.com/files/download/libestr-${PKGVERSION}.tar. # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-shared +} #mee_build() { # bee_build From 0031f36bfc3e56409fe33fe1a6f6c4d7cee219a0 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Tue, 5 Nov 2019 12:39:57 +0100 Subject: [PATCH 05/29] libfastjson: disable shared - get rid of dependency --- libfastjson.be0 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libfastjson.be0 b/libfastjson.be0 index 17de943c4..1acf68ae3 100755 --- a/libfastjson.be0 +++ b/libfastjson.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libfastjson-0.99.8-0 +# BEE_VERSION libfastjson-0.99.8-1 # rsyslog dependency @@ -22,7 +22,9 @@ build_in_sourcedir mee_configure() { autoreconf -fvi - bee_configure + bee_configure \ + --disable-shared +# PS1='xxx ' bash -norc } #mee_build() { From 744791261b828f913a02a0eb1adab48475ce2635 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Tue, 5 Nov 2019 13:15:56 +0100 Subject: [PATCH 06/29] mxml: update to 3.1 - 2.12 did not build anymore --- mxml.be0 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mxml.be0 b/mxml.be0 index fc29f8304..3530b0fa8 100755 --- a/mxml.be0 +++ b/mxml.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mxml-2.12-0 +# BEE_VERSION mxml-3.1-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -30,9 +30,9 @@ build_in_sourcedir ## 'src' or 'cmake' or .. ## use 'sourcesubdir_append' to specify this directory if known. -# sourcesubdir_append src +# sourcesubdir_append mxml-3.1 -BEE_EXTRACT_STRIP=0 +# BEE_EXTRACT_STRIP=0 ############################################################################### @@ -60,6 +60,9 @@ BEE_EXTRACT_STRIP=0 mee_install() { start_cmd make install DSTROOT="${D}" } +mee_install_post() { + rm -vrf ${D}/usr/share/doc +} ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From 588a8fd1e324a1f9eab63effc5b9f37f2470afd5 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Wed, 6 Nov 2019 08:53:41 +0100 Subject: [PATCH 07/29] go: update to 1.13.4 - bump version - fix installation --- go.be0 | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/go.be0 b/go.be0 index dde392157..d3f2b5df9 100755 --- a/go.be0 +++ b/go.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION go-1.13.1-0 +# BEE_VERSION go-1.13.4-1 SRCURL[0]="https://storage.googleapis.com/golang/go1.4-bootstrap-20171003.tar.gz" SRCURL[1]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz" @@ -49,37 +49,30 @@ mee_build() { mee_install() { # The binaries expect /scratch/local/bee-root/go/go-1.10-0/source to be copied or moved to /usr/lib/go - mkdir -p ${D}${BINDIR} + mkdir -pv ${D}${BINDIR} - cp -r ${S}/../bin/. ${D}${BINDIR} - - mkdir -p ${D}${LIBDIR}/go + cp -rv ${S}/../bin/. ${D}${BINDIR} # strace -s 200 -e file ${S}/../bin/go install -buildmode=shared std # Install standardlibs https://golang.org/pkg/#stdlib - LIBS="builtin context debug expvar go image io math \ - path runtime strings testing unicode bufio bytes \ - compress crypto encoding flag hash index mime net plugin reflect \ - sort sync text unsafe archive cmd container database errors \ - fmt html internal log os regexp strconv syscall time" - - echo "LIBS=${LIBS}" + mkdir -pv ${D}${LIBDIR}/go/src - mkdir -p ${D}${LIBDIR}/go/src - for i in $LIBS; do - cp -r ${S}/${i} ${D}${LIBDIR}/go/src + cd ${S} + for i in *; do + if [ -d "${i}" ]; then + cp -rv ${i} ${D}${LIBDIR}/go/src + fi done #Install tools for go - mkdir -p ${D}${LIBDIR}/go/pkg - cp -r ${S}/../pkg/tool ${D}${LIBDIR}/go/pkg - cp -r ${S}/../pkg/include ${D}${LIBDIR}/go/pkg - cp -r ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go/pkg + mkdir -pv ${D}${LIBDIR}/go/pkg + cp -rv ${S}/../pkg/tool ${D}${LIBDIR}/go/pkg + cp -rv ${S}/../pkg/include ${D}${LIBDIR}/go/pkg + cp -rv ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go/pkg } -mee_install_post() { -# exit - : -} +#mee_install_post() { +# exit +#} From 8f455fb2efd68e1dd174ac8dd2782aa70a50967a Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Wed, 6 Nov 2019 09:00:42 +0100 Subject: [PATCH 08/29] hub: update 2.12.4 to 2.12.8 - bump version - optimize mee_getsources - rebuild with go1.13.4 --- hub.be0 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hub.be0 b/hub.be0 index e5f8bfc02..d951fb05c 100755 --- a/hub.be0 +++ b/hub.be0 @@ -1,19 +1,23 @@ #!/bin/env beesh -# BEE_VERSION hub-2.12.3-0 +# BEE_VERSION hub-2.12.8-0 SRCURL[0]="https://github.com/github/hub.git" export GOPATH=${B}/bee_go mee_getsources() { - cd ${S} - git clone \ + mkdir -vp ${F} + cd ${F} + + [ -d ${PKGNAME} ] || git clone \ --config transfer.fsckobjects=false \ --config receive.fsckobjects=false \ --config fetch.fsckobjects=false \ - ${SRCURL} . - git checkout v${PKGFULLVERSION} + ${SRCURL} ${PKGNAME} + cd ${S} + git clone ${F}/${PKGNAME} . + git checkout --quiet v${PKGFULLVERSION} } From f8cfc6986b4bf778c61f00422e56a0514584b814 Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 10:38:18 +0100 Subject: [PATCH 09/29] glib: Restart from scratch (del, init, be0, rev++) --- glib-1.2.10-0.bee | 33 -------------------- glib.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 33 deletions(-) delete mode 100755 glib-1.2.10-0.bee create mode 100755 glib.be0 diff --git a/glib-1.2.10-0.bee b/glib-1.2.10-0.bee deleted file mode 100755 index 6d9600e08..000000000 --- a/glib-1.2.10-0.bee +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz" - -PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/glib-1.2.10-gcc34-1.patch" - -BEE_CONFIGURE=compat - -# EXCLUDE="" - - - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} - cp /usr/share/libtool/config/config.sub config.sub -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install - chmod -v 755 ${D}/usr/lib/libgmodule-1.2.so.0.0.10 -} diff --git a/glib.be0 b/glib.be0 new file mode 100755 index 000000000..a84bdbc13 --- /dev/null +++ b/glib.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION glib-1.2.10-1 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/glib-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 8c302c228c92d298ce8fbb8b393151747f5f136d Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 10:41:49 +0100 Subject: [PATCH 10/29] glib: Add necessary patches Patches are from recent slackware source build. --- glib.be0 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/glib.be0 b/glib.be0 index a84bdbc13..011562189 100755 --- a/glib.be0 +++ b/glib.be0 @@ -16,6 +16,17 @@ SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/glib-${PKGVERSION}.tar. ## The sources will be patched in the order of the array. # PATCHURL+=() +XPATCHROOT=${BEE_DOWNLOADDIR} +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-isowarning.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc34.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-underquoted.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-no_undefined.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-multilib.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-unused-dep.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-autotools.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-format.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc5.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc9.patch.gz) ############################################################################### ## Uncomment the next statement, if the software may not be able to be built From 2fcf437f3dbac3c02d7c271aeab056d8266a09f1 Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 11:06:00 +0100 Subject: [PATCH 11/29] glib: Adjust outdated build tools - packaged config.guess/config.sub aren't aware of modern CPU's - make libs shareable on 64bit (-fPIC) - don't use libtool from package --- glib.be0 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/glib.be0 b/glib.be0 index 011562189..991bb3ac2 100755 --- a/glib.be0 +++ b/glib.be0 @@ -54,17 +54,19 @@ PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc9.patch.gz) # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + cp -p /usr/share/automake-1.15/config.{guess,sub} . +} +export CFLAGS='-O2 -fPIC' #mee_configure() { # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build LIBTOOL=/usr/bin/libtool +} #mee_install() { # bee_install From 6d8bed11f9e2854afb34ea0075fd5f37c0dbf24e Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Wed, 6 Nov 2019 11:40:56 +0100 Subject: [PATCH 12/29] syncthing: update 1.3.0 to 1.3.1 - sync sync sync --- syncthing.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing.be0 b/syncthing.be0 index 89d0ca154..5640e96e2 100755 --- a/syncthing.be0 +++ b/syncthing.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION syncthing-1.3.0-0 +# BEE_VERSION syncthing-1.3.1-0 ## The source URL(s) array SRCURL[0]="https://github.com/syncthing/syncthing/releases/download/v${PKGVERSION}/syncthing-source-v${PKGVERSION}.tar.gz syncthing-v${PKGVERSION}.tar.gz" From 91cecbec4e9779db1a44ad6e3f5087d912b3d2ca Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 11:45:40 +0100 Subject: [PATCH 13/29] glib: remove bogus rpath from libs --- glib.be0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/glib.be0 b/glib.be0 index 991bb3ac2..0f1652eb9 100755 --- a/glib.be0 +++ b/glib.be0 @@ -73,6 +73,11 @@ mee_build() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + patchelf --remove-rpath ${D}/usr/lib/libgmodule-1.2.so.0.0.10 + patchelf --remove-rpath ${D}/usr/lib/libgthread-1.2.so.0.0.10 +} + ############################################################################### ## ## Additional hints: From c90d1ecb815331db9d06edee75c61aa0510c9b49 Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 12:54:00 +0100 Subject: [PATCH 14/29] gtk+: Restart from scratch (del, init, be0, rev++) --- gtk+-1.2.10-0.bee | 32 ------------------- gtk+.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 32 deletions(-) delete mode 100755 gtk+-1.2.10-0.bee create mode 100755 gtk+.be0 diff --git a/gtk+-1.2.10-0.bee b/gtk+-1.2.10-0.bee deleted file mode 100755 index 52e8101dd..000000000 --- a/gtk+-1.2.10-0.bee +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz" - -PATCHURL[0]="" - -BEE_CONFIGURE=compat - -# EXCLUDE="" - - - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} - cp /usr/share/libtool/config/config.sub config.sub -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} diff --git a/gtk+.be0 b/gtk+.be0 new file mode 100755 index 000000000..633c2371d --- /dev/null +++ b/gtk+.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gtk+-1.2.10-1 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From fdba0f9f6aa9bddb248afa1e349b647aab9e3b95 Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 12:56:08 +0100 Subject: [PATCH 15/29] gtk+: Add necessary patches Patches are from recent slackware source build. --- gtk+.be0 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gtk+.be0 b/gtk+.be0 index 633c2371d..9703df023 100755 --- a/gtk+.be0 +++ b/gtk+.be0 @@ -16,6 +16,36 @@ SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar. ## The sources will be patched in the order of the array. # PATCHURL+=() +XPATCHROOT=${BEE_DOWNLOADDIR} +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ahiguti.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.8-wrap-alnum.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-alignment.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-expose.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-focus.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-encoding.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ctext.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-utf8fontset.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-kpenter.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-themeswitch.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-pixmapref.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-missingchar.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ukfont.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-deletedir.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-fontwarning.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-troughpaint.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-localecrash.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-dndorder.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-clistfocusrow.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-bellvolume.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-libtool.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-gtkgdkdep.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-underquoted.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ppc64.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-no_undefined.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-multilib.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-unused-deps.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-autotools.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-format.patch.gz) ############################################################################### ## Uncomment the next statement, if the software may not be able to be built From 53c618cb6053e686708a32bb18bc658ff5207c1a Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 13:00:10 +0100 Subject: [PATCH 16/29] gtk+: Adjust outdated build tools - packaged config.guess/config.sub aren't aware of modern CPU's - make libs shareable on 64bit (-fPIC) - don't use libtool from package --- gtk+.be0 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gtk+.be0 b/gtk+.be0 index 9703df023..45d226230 100755 --- a/gtk+.be0 +++ b/gtk+.be0 @@ -73,17 +73,20 @@ PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-format.patch.gz) # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + cp -p /usr/share/automake-1.15/config.{guess,sub} . +} +export CFLAGS='-O2 -fPIC' +export CXXFLAGS='-O2 -fPIC' #mee_configure() { # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build LIBTOOL=/usr/bin/libtool +} #mee_install() { # bee_install From 8dcadf63339f6ba657d3de7d92da388468aa8b25 Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 13:01:06 +0100 Subject: [PATCH 17/29] gtk+: remove bogus rpath from libs --- gtk+.be0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtk+.be0 b/gtk+.be0 index 45d226230..fc6d39474 100755 --- a/gtk+.be0 +++ b/gtk+.be0 @@ -93,6 +93,10 @@ mee_build() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + patchelf --remove-rpath ${D}/usr/lib/libgtk-1.2.so.0.9.1 +} + ############################################################################### ## ## Additional hints: From fd630b629a8a4e31a8bfeaa80cb1c44b682e5fc4 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Wed, 6 Nov 2019 13:03:02 +0100 Subject: [PATCH 18/29] rclone: update to 1.50.1 - build only via git supported --- rclone.be0 | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/rclone.be0 b/rclone.be0 index 6d6189d91..56a36e1c1 100755 --- a/rclone.be0 +++ b/rclone.be0 @@ -1,11 +1,25 @@ #!/bin/env beesh -# BEE_VERSION rclone-1.49.2-0 +# BEE_VERSION rclone-1.50.1-1 -SRCURL[0]="https://github.com/rclone/rclone/archive/v${PKGVERSION}.tar.gz ${PKGNAME}-${PKGVERSION}.tar.gz" +SRCURL[0]="https://github.com/rclone/rclone.git" export GOPATH=${B}/bee_go +mee_getsources() { + mkdir -vp ${F} + cd ${F} + [ -d ${PKGNAME}-git ] || \ + git clone \ + --config transfer.fsckobjects=false \ + --config receive.fsckobjects=false \ + --config fetch.fsckobjects=false \ + ${SRCURL} ${PKGNAME}-git + cd ${S} + git clone ${F}/${PKGNAME}-git . + git checkout --quiet v${PKGFULLVERSION} +} + #mee_patch() { # bee_patch #} @@ -14,13 +28,12 @@ export GOPATH=${B}/bee_go # bee_configure #} -mee_build() { - bee_build -} +#mee_build() { +# bee_build +#} mee_install() { bee_install mkdir -p ${D}/usr/share/man/man1 cp ${S}/rclone.1 ${D}/usr/share/man/man1 - } From e1292f6ff65ac417a2ccdf52637b7ed80c22e68d Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 13:32:54 +0100 Subject: [PATCH 19/29] glib: Set executable bits on libgmodule So ldd won't complain --- glib.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/glib.be0 b/glib.be0 index 0f1652eb9..281b20acf 100755 --- a/glib.be0 +++ b/glib.be0 @@ -76,6 +76,7 @@ mee_build() { mee_install_post() { patchelf --remove-rpath ${D}/usr/lib/libgmodule-1.2.so.0.0.10 patchelf --remove-rpath ${D}/usr/lib/libgthread-1.2.so.0.0.10 + chmod -v 0755 ${D}/usr/lib/libgmodule-1.2.so.0.0.10 } ############################################################################### From a0bf2d53a66eee071c80c0b20949c81e07cbb62b Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Wed, 6 Nov 2019 13:48:19 +0100 Subject: [PATCH 20/29] bison: update from 3.0.4 to 3.4.2 - be0nicify - disable NLS --- bison.be0 | 73 +++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 61 deletions(-) diff --git a/bison.be0 b/bison.be0 index 479d82de8..194886142 100755 --- a/bison.be0 +++ b/bison.be0 @@ -1,50 +1,15 @@ #!/usr/bin/env beesh -# BEE_VERSION bison-3.0.4-0 - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. +# BEE_VERSION bison-3.4.2-0 SRCURL[0]="http://ftp.gnu.org/gnu/bison/bison-${PKGVERSION}.tar.xz" -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - # PATCHURL+=() -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - # build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} @@ -53,34 +18,20 @@ SRCURL[0]="http://ftp.gnu.org/gnu/bison/bison-${PKGVERSION}.tar.xz" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} - -mee_build() { - bee_build - make check +mee_configure() { + bee_configure \ + --disable-nls } +#mee_build() { +# bee_build +# make check +#} + #mee_install() { # bee_install #} -## by default this may be 'make install DESTDIR="${D}"' -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## +mee_install_post() { + rm -rvf ${D}/usr/share/doc +} From 18756b909712908507095e619fcb6d11c7a656fb Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 14:32:15 +0100 Subject: [PATCH 21/29] bsdiff: Start from scratch (init,be0) --- bsdiff.be0 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 bsdiff.be0 diff --git a/bsdiff.be0 b/bsdiff.be0 new file mode 100755 index 000000000..bceb00489 --- /dev/null +++ b/bsdiff.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION bsdiff-4.3-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://www.daemonology.net/bsdiff/bsdiff-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From fa3474eaebc915b5e4497b3c3fde1b06321b4047 Mon Sep 17 00:00:00 2001 From: thomas <kreitler@molgen.mpg.de> Date: Wed, 6 Nov 2019 14:36:23 +0100 Subject: [PATCH 22/29] bsdiff: Fix/circumvent makefile The Makefile would be best rewritten from scratch. (Maybe in the next release) --- bsdiff.be0 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/bsdiff.be0 b/bsdiff.be0 index bceb00489..5f2f1cb7b 100755 --- a/bsdiff.be0 +++ b/bsdiff.be0 @@ -43,9 +43,9 @@ SRCURL[0]="https://www.daemonology.net/bsdiff/bsdiff-${PKGVERSION}.tar.gz" # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + sed -e '/^\.ifndef/ s/^\.//' -e '/^\.endif/ s/^\.//' -i ${S}/Makefile +} #mee_configure() { # bee_configure @@ -55,9 +55,16 @@ SRCURL[0]="https://www.daemonology.net/bsdiff/bsdiff-${PKGVERSION}.tar.gz" # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + mkdir -vp ${D}/usr/bin + cp -v ${B}/bsdiff ${D}/usr/bin + cp -v ${B}/bspatch ${D}/usr/bin + chmod -v 755 ${D}/usr/bin/* + mkdir -vp ${D}/usr/share/man/man1 + cp -v ${B}/bsdiff.1 ${D}/usr/share/man/man1 + cp -v ${B}/bspatch.1 ${D}/usr/share/man/man1 + chmod -v 644 ${D}/usr/share/man/man1/* +} ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From b86c11f5bacfd0706365238c6b6435e08437222d Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Thu, 7 Nov 2019 10:56:06 +0100 Subject: [PATCH 23/29] json-glib: update to 1.4.4 - enable single language support --- by rm po/LINGUAS. thanks meson. - disable introspection, thanks static - enable test-suite removal --- json-glib.be0 | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 json-glib.be0 diff --git a/json-glib.be0 b/json-glib.be0 new file mode 100755 index 000000000..0fa828ea9 --- /dev/null +++ b/json-glib.be0 @@ -0,0 +1,41 @@ +#!/usr/bin/env beesh + +# BEE_VERSION json-glib-1.4.4-0 + +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/json-glib/${PKGVERSION[2]}/json-glib-${PKGVERSION}.tar.xz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +BEE_BUILDTYPE=meson + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_patch_post() { + echo "" > po/LINGUAS +} + +#mee_configure() { +# +#} + +#mee_build() { +# bee_build +#} + +mee_install() { + bee_install + # rm /usr/share/installed-tests + rm -rvf ${D}/usr/share + # rm ./usr/libexec/installed-tests + rm -rvf ${D}/usr/libexec +} From 7104b7b8560296ab7cfb33e7e8a0d2ba1ecaba22 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Thu, 7 Nov 2019 11:35:15 +0100 Subject: [PATCH 24/29] appstream-glib: install 0.7.16 evince fails with `/usr/bin/msgfmt: cannot locate ITS rules for evince-pdfdocument.metainfo.xml.in`. installation of 'appstream' is the suggested fix --- appstream-glib.be0 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 appstream-glib.be0 diff --git a/appstream-glib.be0 b/appstream-glib.be0 new file mode 100755 index 000000000..1917f332f --- /dev/null +++ b/appstream-glib.be0 @@ -0,0 +1,38 @@ +#!/usr/bin/env beesh + +# BEE_VERSION appstream-glib-0.7.16-0 + + +SRCURL[0]="https://github.com/hughsie/appstream-glib/archive/appstream_glib_${PKGVERSION//./_}.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_configure() { + bee_configure \ + -Dstemmer=false +} + + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From ed8afa7ecde1c3b51dcd5e77d3d754313ae34baf Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Thu, 7 Nov 2019 11:36:15 +0100 Subject: [PATCH 25/29] evince: update to 3.34.1 - rebuild --- evince.be0 | 74 +++++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/evince.be0 b/evince.be0 index cf0b5b596..2972800b5 100755 --- a/evince.be0 +++ b/evince.be0 @@ -1,52 +1,21 @@ #!/usr/bin/env beesh -# BEE_VERSION evince-3.30.0-1 +# BEE_VERSION evince-3.34.1-1 -BEE_BUILDTYPE=configure - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) +# requires: +# bee update json-glib-1.4.4-0 +# bee update appstream-glib-0.7.16-0 -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. +BEE_BUILDTYPE=configure SRCURL[0]="https://download.gnome.org/sources/evince/${PKGVERSION[2]}/evince-${PKGVERSION}.tar.xz" -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - # PATCHURL+=() -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - # build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} @@ -56,7 +25,13 @@ SRCURL[0]="https://download.gnome.org/sources/evince/${PKGVERSION[2]}/evince-${P #} mee_configure() { - bee_configure --enable-introspection --disable-static + bee_configure \ + --enable-introspection \ + --disable-static \ + --disable-nls \ + --disable-libgnome-desktop \ + --disable-nautilus \ + --disable-thumbnailer } #mee_build() { @@ -69,25 +44,10 @@ mee_configure() { ## by default this may be 'make install DESTDIR="${D}"' mee_install_post() { - start_cmd mv -v ${D}${DATAROOTDIR}/applications/{org.gnome.Evince-previewer,evince-previewer}.desktop - start_cmd mv -v ${D}${DATAROOTDIR}/applications/{org.gnome.Evince,evince}.desktop + start_cmd mv -v ${D}${DATAROOTDIR}/applications/{org.gnome.Evince-previewer,evince-previewer}.desktop + start_cmd mv -v ${D}${DATAROOTDIR}/applications/{org.gnome.Evince,evince}.desktop + for i in bg ca cs da de el en_GB es eu fi fr gl hu id it ja ko lv nl oc pl pt_BR ro ru sl sr sv te uk vi zh_CN zh_HK zh_TW; do + rm -rf ${D}/usr/share/help/${i} + done } - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From e0106ab97df17beba613d9ccacbe8bb7e230fdd4 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Thu, 7 Nov 2019 12:08:52 +0100 Subject: [PATCH 26/29] keepassxc: update to 2.5.0 - keepassxc says: you must update --- keepassxc.be0 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/keepassxc.be0 b/keepassxc.be0 index f550924c9..d8781ce47 100755 --- a/keepassxc.be0 +++ b/keepassxc.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION keepassxc-2.4.3-0 +# BEE_VERSION keepassxc-2.5.0-0 SRCURL[0]="https://github.com/keepassxreboot/keepassxc/archive/${PKGVERSION}.tar.gz keepassxc-${PKGVERSION}.tar.gz" @@ -20,11 +20,12 @@ SRCURL[0]="https://github.com/keepassxreboot/keepassxc/archive/${PKGVERSION}.tar #} mee_configure() { - bee_configure -DQt5X11Extras_DIR=/usr/local/qt5/lib/cmake/Qt5X11Extras \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_XC_KEESHARE=ON \ - -DKEEPASSXC_BUILD_TYPE=Release \ - -DWITH_XC_BROWSER=ON + bee_configure \ + -DQt5X11Extras_DIR=/usr/local/qt5/lib/cmake/Qt5X11Extras \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_XC_KEESHARE=ON \ + -DKEEPASSXC_BUILD_TYPE=Release \ + -DWITH_XC_BROWSER=ON } #mee_build() { From 5f49d20a0a8a66488b64ab1d3c337ca8cab08511 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Thu, 7 Nov 2019 12:12:22 +0100 Subject: [PATCH 27/29] keepassx: remove - work more efficient with kee<TAB> - this version is old and stinky --- keepassx.be0 | 87 ---------------------------------------------------- 1 file changed, 87 deletions(-) delete mode 100755 keepassx.be0 diff --git a/keepassx.be0 b/keepassx.be0 deleted file mode 100755 index 3d89a135a..000000000 --- a/keepassx.be0 +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION keepassx-2.0.3-0 - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - -SRCURL[0]="https://www.keepassx.org/releases/${PKGVERSION}/keepassx-${PKGVERSION}.tar.gz" - -PATH=/usr/local/qt4/bin:$PATH - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -# PATCHURL+=() - -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be built -## outside the source directory and needs to be built inside the source -## directory. - -# build_in_sourcedir - -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - -# sourcesubdir_append src - - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From 2f44c9202d178df2ccc94f571a7a26a4f1fcd101 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Thu, 7 Nov 2019 13:27:34 +0100 Subject: [PATCH 28/29] Revert "rsyslog: update to 8.1910" --- libestr-0.1.0-0.bee | 30 +++++++++++++++++++++++++++++ libestr.be0 | 39 -------------------------------------- libfastjson.be0 | 40 --------------------------------------- rsyslog-6.1.2-0.bee | 30 +++++++++++++++++++++++++++++ rsyslog.be0 | 46 --------------------------------------------- 5 files changed, 60 insertions(+), 125 deletions(-) create mode 100755 libestr-0.1.0-0.bee delete mode 100755 libestr.be0 delete mode 100755 libfastjson.be0 create mode 100755 rsyslog-6.1.2-0.bee delete mode 100755 rsyslog.be0 diff --git a/libestr-0.1.0-0.bee b/libestr-0.1.0-0.bee new file mode 100755 index 000000000..58c57de25 --- /dev/null +++ b/libestr-0.1.0-0.bee @@ -0,0 +1,30 @@ +#!/bin/env beesh + +SRCURL[0]="http://downloads.sourceforge.net/project/libestr/libestr-0.1.0.tar.gz" + +PATCHURL[0]="" + +PGRP=( uncategorized ) + + + +# BEE_CONFIGURE=compat + +# EXCLUDE="" + +mee_patch() { + bee_patch +} + +mee_configure() { + bee_configure +} + +mee_build() { + bee_build +} + +mee_install() { + bee_install +} + diff --git a/libestr.be0 b/libestr.be0 deleted file mode 100755 index a6abe0fd2..000000000 --- a/libestr.be0 +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION libestr-0.1.11-1 - -# more info: https://libestr.adiscon.com -# dependency of rsyslog - -SRCURL[0]="https://libestr.adiscon.com/files/download/libestr-${PKGVERSION}.tar.gz" - -# PATCHURL+=() - -# build_in_sourcedir - -# sourcesubdir_append src - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -mee_configure() { - bee_configure \ - --disable-shared -} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} - -#mee_install_post() { -# exit -#} diff --git a/libfastjson.be0 b/libfastjson.be0 deleted file mode 100755 index 1acf68ae3..000000000 --- a/libfastjson.be0 +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION libfastjson-0.99.8-1 - -# rsyslog dependency - -SRCURL[0]="https://github.com/rsyslog/libfastjson/archive/v${PKGVERSION}.tar.gz ${PKGNAME}-${PKGFULLVERSION}.tar.gz" - -# PATCHURL+=() - -build_in_sourcedir - -# sourcesubdir_append src - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -mee_configure() { - autoreconf -fvi - bee_configure \ - --disable-shared -# PS1='xxx ' bash -norc -} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} - -#mee_install_post() { -# exit -#} diff --git a/rsyslog-6.1.2-0.bee b/rsyslog-6.1.2-0.bee new file mode 100755 index 000000000..d12460f8e --- /dev/null +++ b/rsyslog-6.1.2-0.bee @@ -0,0 +1,30 @@ +#!/bin/env beesh + +SRCURL[0]="http://www.rsyslog.com/files/download/rsyslog/rsyslog-6.1.2.tar.gz" + +PATCHURL[0]="" + +PGRP=( uncategorized ) + + + +# BEE_CONFIGURE=compat + +# EXCLUDE="" + +mee_patch() { + bee_patch +} + +mee_configure() { + bee_configure +} + +mee_build() { + bee_build +} + +mee_install() { + bee_install +} + diff --git a/rsyslog.be0 b/rsyslog.be0 deleted file mode 100755 index 9b3d1a39e..000000000 --- a/rsyslog.be0 +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION rsyslog-8.1910.0-1 - -# more info: https://foo.bar.com - -SRCURL[0]="http://www.rsyslog.com/files/download/rsyslog/rsyslog-${PKGVERSION}.tar.gz" - -# PATCHURL+=() - -# build_in_sourcedir - -# sourcesubdir_append src - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -mee_configure() { - bee_configure \ - --disable-silent-rules \ - --disable-fmhash \ - --disable-fmhttp \ - --disable-default-tests \ - --disable-helgrind \ - --disable-static - -# PS1='xxx ' bash -norc -} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} - -mee_install_post() { - mkdir -vp ${D}/etc/systemd/system - ln -vs /lib/systemd/system/rsyslog.service ${D}/etc/systemd/system/syslog.service -} From f0eb2fc2b94b0aa713bb343aa7ee8ad557b11498 Mon Sep 17 00:00:00 2001 From: Peter Marquardt <wwwutz@molgen.mpg.de> Date: Fri, 8 Nov 2019 09:39:09 +0100 Subject: [PATCH 29/29] e2fsprogs: static build - fix build as user by going static `bee_install(): /sbin/ldconfig: Can't create temporary cache file /etc/ld.so.cache~: Permission denied` - enable single language - enable verbose make - speed up build --- e2fsprogs.be0 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/e2fsprogs.be0 b/e2fsprogs.be0 index 1e3f36836..ad9fabc73 100755 --- a/e2fsprogs.be0 +++ b/e2fsprogs.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION e2fsprogs-1.45.4-0 +# BEE_VERSION e2fsprogs-1.45.4-1 ## The source URL(s) array SRCURL[0]="https://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-${PKGVERSION}.tar.gz" @@ -28,17 +28,18 @@ SRCURL[0]="https://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-${PKGVERSION} mee_configure() { # blkid, uuid, fsck are used from util-linux. bee_configure \ + --enable-verbose-makecmds \ --with-root-prefix= \ - --enable-elf-shlibs \ --disable-libblkid \ --disable-libuuid \ --disable-uuidd \ - --disable-fsck + --disable-fsck \ + --disable-nls } mee_build() { bee_build - start_cmd make check +# start_cmd make check } #mee_install() {