From 4ca9e9c84628707a8a5a2b566cf34f3151d94ea6 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 29 Oct 2021 09:17:50 +0200 Subject: [PATCH 1/4] xfwm4-themes: fix SRCURL - fixed SRCURL --- xfwm4-themes.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xfwm4-themes.be0 b/xfwm4-themes.be0 index 5d8e0c4aa..2b9463c3c 100755 --- a/xfwm4-themes.be0 +++ b/xfwm4-themes.be0 @@ -1,8 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION xfwm4-themes-4.10.0-3 +# BEE_VERSION xfwm4-themes-4.10.0-4 -SRCURL[0]="http://archive.xfce.org/src/art/xfwm4-themes/${PKGVERSION[2]}/xfwm4-themes-${PKGVERSION}.tar.bz2" +# SRCURL[0]="http://archive.xfce.org/src/art/xfwm4-themes/${PKGVERSION[2]}/xfwm4-themes-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://beehive.molgen.mpg.de/eaa58362053a3549c8be0b32efd3c54f/xfwm4-themes-4.10.0.tar.bz2" # PATCHURL+=() @@ -29,4 +30,3 @@ SRCURL[0]="http://archive.xfce.org/src/art/xfwm4-themes/${PKGVERSION[2]}/xfwm4-t #mee_install() { # bee_install #} -## by default this may be 'make install DESTDIR="${D}"' From 0203871084f5b1d8fcfb81338abb27093b653fdf Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 29 Oct 2021 09:39:29 +0200 Subject: [PATCH 2/4] davfs2: fix SRCURL - fixed SRCURL - cleanup --- davfs2.be0 | 71 +++++++++--------------------------------------------- 1 file changed, 11 insertions(+), 60 deletions(-) diff --git a/davfs2.be0 b/davfs2.be0 index 8837bb23f..53f994680 100755 --- a/davfs2.be0 +++ b/davfs2.be0 @@ -1,44 +1,16 @@ #!/usr/bin/env beesh -# BEE_VERSION davfs2-1.5.5-0 +# BEE_VERSION davfs2-1.5.5-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://download.savannah.nongnu.org/releases/davfs2/davfs2-${PKGVERSION}.tar.gz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. +# SRCURL[0]="https://download.savannah.nongnu.org/releases/davfs2/davfs2-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/936f5077cfac3f5c7a142d6ac9e96394/davfs2-1.5.5.tar.gz" # 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 "${@}" #} @@ -47,9 +19,10 @@ build_in_sourcedir # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-nls +} #mee_build() { # bee_build @@ -58,32 +31,10 @@ build_in_sourcedir #mee_install() { # bee_install #} -## by default this may be 'make install DESTDIR="${D}"' mee_install_post() { - # Remove - # /etc/davfs2/ - # /etc/davfs2/certs/ - # /etc/davfs2/certs/private/ - # /etc/davfs2/secrets - # /etc/davfs2/davfs2.conf - start_cmd rm -rv ${D}/etc + cd ${D} + rm -rv etc + rm -rv usr/share/doc + rm -rv usr/share/man/{de,es} } - -############################################################################### -## -## 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 dfe67ff1b88b5344a201578b023ace0b6de33e44 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 29 Oct 2021 12:21:39 +0200 Subject: [PATCH 3/4] xfce4-screenshooter: fis SRCURL - fixed SRCURL - NLS=1 --- xfce4-screenshooter.be0 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xfce4-screenshooter.be0 b/xfce4-screenshooter.be0 index a503d4c53..d8661bf9a 100755 --- a/xfce4-screenshooter.be0 +++ b/xfce4-screenshooter.be0 @@ -1,11 +1,12 @@ #!/usr/bin/env beesh -# BEE_VERSION xfce4-screenshooter-1.9.5-0 +# BEE_VERSION xfce4-screenshooter-1.9.5-1 -SRCURL[0]="https://archive.xfce.org/src/apps/xfce4-screenshooter/${PKGVERSION[2]}/xfce4-screenshooter-${PKGVERSION}.tar.bz2" +#SRCURL[0]="https://archive.xfce.org/src/apps/xfce4-screenshooter/${PKGVERSION[2]}/xfce4-screenshooter-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://beehive.molgen.mpg.de/0354811cd2622d3de92e342c7eaa184d/xfce4-screenshooter-1.9.5.tar.bz2" # https://bugzilla.xfce.org/show_bug.cgi?id=15792 -PATCHURL+=(/src/mariux/patches/xfce4-screenshooter-fix-crash-in-libgtk-bug-15792.diff) +PATCHURL+=(https://beehive.molgen.mpg.de/ebffe7058ddd2a941d9c91832581abd0/xfce4-screenshooter-fix-crash-in-libgtk-bug-15792.diff) # EXCLUDE+=() @@ -18,9 +19,10 @@ PATCHURL+=(/src/mariux/patches/xfce4-screenshooter-fix-crash-in-libgtk-bug-15792 # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + sed -i '/^ALL_LINGUAS/ s/@ALL_LINGUAS@//' po/Makefile.in.in +} #mee_configure() { # bee_configure @@ -33,4 +35,3 @@ PATCHURL+=(/src/mariux/patches/xfce4-screenshooter-fix-crash-in-libgtk-bug-15792 #mee_install() { # bee_install #} -## by default this may be 'make install DESTDIR="${D}"' From 8c7446636b90b792f0867065bcc21fe7c71132ad Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 29 Oct 2021 13:52:05 +0200 Subject: [PATCH 4/4] perf: fix -j parser - getopts used right --- perf.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perf.be0 b/perf.be0 index de87c1b4c..7af4656c3 100755 --- a/perf.be0 +++ b/perf.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION perf-5.10.47-0 +# BEE_VERSION perf-5.10.47-1 # more info: https://foo.bar.com @@ -17,7 +17,7 @@ OPT_ARCHIVE_BUILD=no # honor -j while getopts ":j:" bmf ${BEE_MAKEFLAGS[@]}; do - export JOBS=${OPTARG} + [ $bmf == 'j' ] && export JOBS=${OPTARG} done PATH=/usr/local/system/perl/bin:/usr/local/system/python2/bin:${PATH}