From 3cd5d6398d394c43cee06ff148f592e7e9862076 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 12:42:48 +0100 Subject: [PATCH 1/7] lurch: Add version 0.6.8 [Description][1]: > This plugin brings Axolotl, by now renamed to double ratchet, to > libpurple applications such as Pidgin by implementing the XEP-0384: > OMEMO Encryption. For a higher-level overview, see the official OMEMO > homepage. Create the bee file with the command below. $ bee init https://github.com/gkdr/lurch/releases/download/v0.6.8/lurch-0.6.8-src.tar.gz creating lurch-0.6.8-0.bee from template '/etc/default/bee/templates/fallback' [1]: https://github.com/gkdr/lurch --- lurch-0.6.8-0.bee | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100755 lurch-0.6.8-0.bee diff --git a/lurch-0.6.8-0.bee b/lurch-0.6.8-0.bee new file mode 100755 index 000000000..200cd17b9 --- /dev/null +++ b/lurch-0.6.8-0.bee @@ -0,0 +1,77 @@ +#!/usr/bin/env beesh + +## 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://github.com/gkdr/lurch/releases/download/v${PKGVERSION}/lurch-${PKGVERSION}-src.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 ad4d931dd76956dd763d407df0181caf50a79a3b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 12:45:43 +0100 Subject: [PATCH 2/7] lurch: Convert to versionless bee file --- lurch-0.6.8-0.bee => lurch.be0 | 2 ++ 1 file changed, 2 insertions(+) rename lurch-0.6.8-0.bee => lurch.be0 (98%) diff --git a/lurch-0.6.8-0.bee b/lurch.be0 similarity index 98% rename from lurch-0.6.8-0.bee rename to lurch.be0 index 200cd17b9..91bc457b9 100755 --- a/lurch-0.6.8-0.bee +++ b/lurch.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION lurch-0.6.8-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.) From ab9ef95f61f525328612ef29677ae2261f3d46fe Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 12:50:11 +0100 Subject: [PATCH 3/7] mxml: Add version 2.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Description][1]: > Mini-XML is a tiny XML library that you can use to read and write XML > and XML-like data files in your application without requiring large > non-standard libraries. Mini-XML only requires an ANSI C compatible > compiler (GCC works, as do most vendors’ ANSI C compilers) and a make > program. > > Mini-XML supports reading of UTF-8 and UTF-16 and writing of UTF-8 > encoded XML files and strings. Data is stored in a linked-list tree > structure, preserving the XML data hierarchy, element names, > attributes, and attribute values are supported with no preset limits, > just available memory. Lurch depends on this library. Create the bee file with the command below. $ bee init https://github.com/michaelrsweet/mxml/releases/download/v2.12/mxml-2.12.tar.gz creating mxml-2.12-0.bee from template '/etc/default/bee/templates/fallback' [1]: https://www.msweet.org/mxml/ --- mxml-2.12-0.bee | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100755 mxml-2.12-0.bee diff --git a/mxml-2.12-0.bee b/mxml-2.12-0.bee new file mode 100755 index 000000000..db8d61468 --- /dev/null +++ b/mxml-2.12-0.bee @@ -0,0 +1,77 @@ +#!/usr/bin/env beesh + +## 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://github.com/michaelrsweet/mxml/releases/download/v${PKGVERSION}/mxml-${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 b0a72574b9bffa204fd6b435a1ab2a54f3fc4fd0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 12:52:08 +0100 Subject: [PATCH 4/7] mxml: Convert to versionless bee file --- mxml-2.12-0.bee => mxml.be0 | 2 ++ 1 file changed, 2 insertions(+) rename mxml-2.12-0.bee => mxml.be0 (98%) diff --git a/mxml-2.12-0.bee b/mxml.be0 similarity index 98% rename from mxml-2.12-0.bee rename to mxml.be0 index db8d61468..19121a5d3 100755 --- a/mxml-2.12-0.bee +++ b/mxml.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION mxml-2.12-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.) From 6c76728969322c3e9c6194dcd1e7ff7768029fa5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 13:02:19 +0100 Subject: [PATCH 5/7] mxml: Set extract strip level The release archive has no directory in it, so the strip level needs to be adapted. [1] [1]: https://github.com/michaelrsweet/mxml/issues/242 --- mxml.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mxml.be0 b/mxml.be0 index 19121a5d3..86880eaa4 100755 --- a/mxml.be0 +++ b/mxml.be0 @@ -32,6 +32,8 @@ SRCURL[0]="https://github.com/michaelrsweet/mxml/releases/download/v${PKGVERSION # sourcesubdir_append src +BEE_EXTRACT_STRIP=0 + ############################################################################### ## Change the default (auto-detected) steps to From b335b8889c16adcd521f7deae13f9644dd110137 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 13:09:07 +0100 Subject: [PATCH 6/7] mxml: Build in source directory Fix the error below. config.status: creating config.h [BEE] <= leaving bee_configure() .. [BEE] => entering bee_build() .. [BEE] make -j1 make: *** No rule to make target 'mxml-attr.c', needed by 'mxml-attr.o'. Stop. Command exited with non-zero status 2 --- mxml.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxml.be0 b/mxml.be0 index 86880eaa4..d9b446c12 100755 --- a/mxml.be0 +++ b/mxml.be0 @@ -22,7 +22,7 @@ SRCURL[0]="https://github.com/michaelrsweet/mxml/releases/download/v${PKGVERSION ## outside the source directory and needs to be built inside the source ## directory. -# build_in_sourcedir +build_in_sourcedir ############################################################################### ## bee cannot detect buildtypes specified in subdirectories. From e5bdb39fb224444dcb7316fbb960bcc3d8745a97 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 13:18:09 +0100 Subject: [PATCH 7/7] mxml: Use `DSTROOT` for specifying image path [mxml uses `DSTROOT`.][1] > Mini-XML is not a GNU project, and DESTDIR is not a widely-implemented > standard, just a GNU convention used for GNU/FSF projects. [1]: https://github.com/michaelrsweet/mxml/issues/99 --- mxml.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mxml.be0 b/mxml.be0 index d9b446c12..fc29f8304 100755 --- a/mxml.be0 +++ b/mxml.be0 @@ -57,9 +57,9 @@ BEE_EXTRACT_STRIP=0 # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + start_cmd make install DSTROOT="${D}" +} ## by default this may be 'make install DESTDIR="${D}"' ###############################################################################