From b7d7405bf178102c9921ec204aded744a5cd41e9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:20:26 +0200 Subject: [PATCH 1/9] fribidi: Convert to versionless bee file --- fribidi-0.19.5-0.bee => fribidi.be0 | 2 ++ 1 file changed, 2 insertions(+) rename fribidi-0.19.5-0.bee => fribidi.be0 (98%) diff --git a/fribidi-0.19.5-0.bee b/fribidi.be0 similarity index 98% rename from fribidi-0.19.5-0.bee rename to fribidi.be0 index d614b7115..6ce94627a 100755 --- a/fribidi-0.19.5-0.bee +++ b/fribidi.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION fribidi-0.19.5-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 29648151e203a4d0975851086d7ee7230ba62a55 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:21:27 +0200 Subject: [PATCH 2/9] fribidi: Use current bee file template from `scripts/TEMPLATE.be0` --- fribidi.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fribidi.be0 b/fribidi.be0 index 6ce94627a..422290f03 100755 --- a/fribidi.be0 +++ b/fribidi.be0 @@ -24,8 +24,8 @@ SRCURL[0]="http://fribidi.org/download/fribidi-${PKGVERSION}.tar.bz2" # 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 +## 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 @@ -54,7 +54,7 @@ SRCURL[0]="http://fribidi.org/download/fribidi-${PKGVERSION}.tar.bz2" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { @@ -73,7 +73,7 @@ SRCURL[0]="http://fribidi.org/download/fribidi-${PKGVERSION}.tar.bz2" ## 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. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## From 4bce5c59e4fa764bb2d78c0eb88914f4cec97a7e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:24:51 +0200 Subject: [PATCH 3/9] fribidi: Use new source URL at GitHub (also moves to HTTPS) The project moved to GitHub and the old URL is invalid. --- fribidi.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fribidi.be0 b/fribidi.be0 index 422290f03..84ea6cd2f 100755 --- a/fribidi.be0 +++ b/fribidi.be0 @@ -9,7 +9,7 @@ ## 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]="http://fribidi.org/download/fribidi-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://github.com/fribidi/fribidi/releases/download/v${PKGVERSION}/fribidi-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From ea4f1770ae9a1f7a0f8b845fda1ca99113ed06ec Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:25:17 +0200 Subject: [PATCH 4/9] fribidi: Update version from 0.19.5 to 1.0.2 Release notes for 1.0.2 [1]: > * Added meson build system. > * glib dependency was completely removed even for tests. > * Tests now run on Visual Studio (through meson). > * Cleanup of obsolete options > * Travis support. [1]: https://github.com/fribidi/fribidi/releases/tag/v1.0.2 --- fribidi.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fribidi.be0 b/fribidi.be0 index 84ea6cd2f..3b5d970a8 100755 --- a/fribidi.be0 +++ b/fribidi.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION fribidi-0.19.5-0 +# BEE_VERSION fribidi-1.0.2-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 ff25c644dec13085568131859d92682ff2b71819 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:38:53 +0200 Subject: [PATCH 5/9] fribidi: Do not build documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Work around the configuration error below. It’s also what BLFS does [1]. ``` checking for c2man... no configure: error: c2man is required to build documentation ``` [1]: http://www.linuxfromscratch.org/blfs/view/svn/general/fribidi.html --- fribidi.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fribidi.be0 b/fribidi.be0 index 3b5d970a8..a08d66e96 100755 --- a/fribidi.be0 +++ b/fribidi.be0 @@ -53,9 +53,10 @@ SRCURL[0]="https://github.com/fribidi/fribidi/releases/download/v${PKGVERSION}/f # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-docs +} #mee_build() { # bee_build From 9e7d66b94eb682a032ae6766b2e0f2f7a3897064 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 14:53:51 +0200 Subject: [PATCH 6/9] pango: Convert to versionless bee file --- pango-1.39.0-0.bee => pango.be0 | 2 ++ 1 file changed, 2 insertions(+) rename pango-1.39.0-0.bee => pango.be0 (98%) diff --git a/pango-1.39.0-0.bee b/pango.be0 similarity index 98% rename from pango-1.39.0-0.bee rename to pango.be0 index 6eb413eb4..a4bc32fa1 100755 --- a/pango-1.39.0-0.bee +++ b/pango.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION pango-1.39.0-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 a23038e7f32276bee117deeb41c63ffd34a07bee Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:15:27 +0200 Subject: [PATCH 7/9] pango: Use current bee file template from `scripts/TEMPLATE.be0` --- pango.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pango.be0 b/pango.be0 index a4bc32fa1..55d9935e1 100755 --- a/pango.be0 +++ b/pango.be0 @@ -24,8 +24,8 @@ SRCURL[0]="ftp://ftp.gnome.org/pub/gnome/sources/pango/${PKGVERSION[2]}/pango-${ # 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 +## 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 @@ -54,7 +54,7 @@ SRCURL[0]="ftp://ftp.gnome.org/pub/gnome/sources/pango/${PKGVERSION[2]}/pango-${ #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { @@ -73,7 +73,7 @@ SRCURL[0]="ftp://ftp.gnome.org/pub/gnome/sources/pango/${PKGVERSION[2]}/pango-${ ## 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. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## From 4da40da7b630a4a2ea40fa0ad6a9eb3f1861e6aa Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:17:21 +0200 Subject: [PATCH 8/9] pango: Securely download source archive Use HTTPS to securely download the source archive. --- pango.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pango.be0 b/pango.be0 index 55d9935e1..79bf9b54f 100755 --- a/pango.be0 +++ b/pango.be0 @@ -9,7 +9,7 @@ ## 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]="ftp://ftp.gnome.org/pub/gnome/sources/pango/${PKGVERSION[2]}/pango-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/pango/${PKGVERSION[2]}/pango-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 8ba738e749e174601b86bf3112e95eb4ab915c03 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 16 May 2018 15:17:40 +0200 Subject: [PATCH 9/9] pango: Update version from 1.39.0 to 1.42.1 --- pango.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pango.be0 b/pango.be0 index 79bf9b54f..502a16f52 100755 --- a/pango.be0 +++ b/pango.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION pango-1.39.0-0 +# BEE_VERSION pango-1.42.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.)