From 765fe0c56049fb9189548bf49f12b87500673a68 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:55:35 +0200 Subject: [PATCH 01/15] libpsl: Add version 0.21.0 libsoup 2.66.2 depends on libpsl. From the [description][1]: > The libpsl package provides a library for accessing and resolving > information from the Public Suffix List (PSL). The PSL is a set of > domain names beyond the standard suffixes, such as .com. [1]: http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libpsl.html --- libpsl.be0 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 libpsl.be0 diff --git a/libpsl.be0 b/libpsl.be0 new file mode 100755 index 000000000..2f2d9fcea --- /dev/null +++ b/libpsl.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libpsl-0.21.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.) + +############################################################################### +## 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/rockdaboot/libpsl/releases/download/libpsl-${PKGVERSION}/libpsl-${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 c79eaa33d0bc1d89cf9faf5cbb85ae4392bf53f9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:45:41 +0200 Subject: [PATCH 02/15] libsoup: Convert to versionless bee file --- libsoup-2.53.2-0.bee => libsoup.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libsoup-2.53.2-0.bee => libsoup.be0 (93%) diff --git a/libsoup-2.53.2-0.bee b/libsoup.be0 similarity index 93% rename from libsoup-2.53.2-0.bee rename to libsoup.be0 index fd614fbaf..546c219f1 100755 --- a/libsoup-2.53.2-0.bee +++ b/libsoup.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libsoup-2.53.2-0 + SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 8bcfdf1d4d840ff79484c3cb0393a66833a408cd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:47:08 +0200 Subject: [PATCH 03/15] libsoup: Securely download source archive over HTTPS --- libsoup.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsoup.be0 b/libsoup.be0 index 546c219f1..a66d7442a 100755 --- a/libsoup.be0 +++ b/libsoup.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libsoup-2.53.2-0 -SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 8cbef3b250526b224e7000f90acf8314cbc7099f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:47:45 +0200 Subject: [PATCH 04/15] libsoup: Use download.gnome.org in source URL --- libsoup.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsoup.be0 b/libsoup.be0 index a66d7442a..58e473ddf 100755 --- a/libsoup.be0 +++ b/libsoup.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libsoup-2.53.2-0 -SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.gnome.org/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" PATCHURL[0]="" From bd0c241154fcd6c8beac24c6c01da3de9b3db7c7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:50:23 +0200 Subject: [PATCH 05/15] libsoup: Use current bee file template --- libsoup.be0 | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/libsoup.be0 b/libsoup.be0 index 58e473ddf..ff3fbb299 100755 --- a/libsoup.be0 +++ b/libsoup.be0 @@ -2,21 +2,42 @@ # BEE_VERSION libsoup-2.53.2-0 -SRCURL[0]="https://download.gnome.org/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" +## 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. -PATCHURL[0]="" +SRCURL[0]="https://download.gnome.org/sources/libsoup/${PKGVERSION[2]}/libsoup-${PKGVERSION}.tar.xz" -# BEE_CONFIGURE=compat +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -# BEE_BUILDTYPE= +# PATCHURL+=() -# 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 "${@}" @@ -37,3 +58,22 @@ mee_configure() { #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 466d5d629d4fdd4f6416d2272ca9abe6396a3147 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:51:17 +0200 Subject: [PATCH 06/15] libsoup: Update version from 2.53.2 to 2.66.2 gedit 3.32.2 requires at least version 2.60.0. > Run-time dependency libsoup-2.4 found: NO (tried cmake) > > meson.build:88:0: ERROR: Invalid version of dependency, need 'libsoup-2.4' ['>= 2.60.0'] found '2.53.2'. Switch to Meson as build system. --- libsoup.be0 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libsoup.be0 b/libsoup.be0 index ff3fbb299..1d2ad6dfb 100755 --- a/libsoup.be0 +++ b/libsoup.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libsoup-2.53.2-0 +# BEE_VERSION libsoup-2.66.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.) @@ -48,7 +48,9 @@ SRCURL[0]="https://download.gnome.org/sources/libsoup/${PKGVERSION[2]}/libsoup-$ #} mee_configure() { - bee_configure --enable-introspection + bee_configure \ + -Dvapi=true \ + -Dgssapi=false } #mee_build() { From 6430a245210a22a5fcf2bc96c8d777f7caac332f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:29:48 +0200 Subject: [PATCH 07/15] gtksourceview: Update version from 3.24.6 to 3.24.11 --- gtksourceview.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtksourceview.be0 b/gtksourceview.be0 index 2e224ff0b..6ac015f14 100755 --- a/gtksourceview.be0 +++ b/gtksourceview.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gtksourceview-3.24.6-0 +# BEE_VERSION gtksourceview-3.24.11-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 3b53f21ee57ae4354b48270543dd1d5ccab79ffb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:30:25 +0200 Subject: [PATCH 08/15] gtksourceview: Remove double slash in path --- gtksourceview.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtksourceview.be0 b/gtksourceview.be0 index 6ac015f14..f46e4335c 100755 --- a/gtksourceview.be0 +++ b/gtksourceview.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]="https://download.gnome.org/sources/gtksourceview//${PKGVERSION[2]}/gtksourceview-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.gnome.org/sources/gtksourceview/${PKGVERSION[2]}/gtksourceview-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 9c7742d387a40a2320d29ac65e654605eec07fee Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:39:12 +0200 Subject: [PATCH 09/15] gtksourceview: Update version from 3.24.11 to 4.4.0 gedit actually requires gtksourceview-4. Only gedit depends on libgtksourceview, so do the major update without a compatibilty package. --- gtksourceview.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtksourceview.be0 b/gtksourceview.be0 index f46e4335c..e9affd167 100755 --- a/gtksourceview.be0 +++ b/gtksourceview.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gtksourceview-3.24.11-0 +# BEE_VERSION gtksourceview-4.4.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 94162b94de1d5bd39c12a42aeacf9aaa54625ebd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Sep 2019 13:28:10 +0200 Subject: [PATCH 10/15] gedit: Update version from 3.28.2 to 3.32.2 Monospace fonts are not used currently, despite being configured that way. But, this update does not help either. --- gedit.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit.be0 b/gedit.be0 index 07abce1fc..5226a0af6 100755 --- a/gedit.be0 +++ b/gedit.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gedit-3.28.1-1 +# BEE_VERSION gedit-3.32.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 9ab2cec4ef1340b4f30838994a7c9eefd9db02f3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 10:55:59 +0200 Subject: [PATCH 11/15] gedit-latex: Convert to versionless bee file --- gedit-latex-3.2.1-0.bee => gedit-latex.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gedit-latex-3.2.1-0.bee => gedit-latex.be0 (91%) diff --git a/gedit-latex-3.2.1-0.bee b/gedit-latex.be0 similarity index 91% rename from gedit-latex-3.2.1-0.bee rename to gedit-latex.be0 index 0ebc64b27..f4c2be0e0 100755 --- a/gedit-latex-3.2.1-0.bee +++ b/gedit-latex.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION gedit-latex-3.2.1-0 + SRCURL[0]="http://download.gnome.org/sources/gedit-latex/${PKGVERSION[2]}/gedit-latex-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 1c0f4c6f84cb6181492ad0d8bccc3a61d5bb18bb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 10:56:16 +0200 Subject: [PATCH 12/15] gedit-latex: Strip trailing space --- gedit-latex.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit-latex.be0 b/gedit-latex.be0 index f4c2be0e0..4e97b3234 100755 --- a/gedit-latex.be0 +++ b/gedit-latex.be0 @@ -23,7 +23,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 9e84c63a87e040b33f1357fa9b21b0430b487cb5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 10:56:58 +0200 Subject: [PATCH 13/15] gedit-latex: Securely download source archive over HTTPS --- gedit-latex.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit-latex.be0 b/gedit-latex.be0 index 4e97b3234..3d2d51c5f 100755 --- a/gedit-latex.be0 +++ b/gedit-latex.be0 @@ -2,7 +2,7 @@ # BEE_VERSION gedit-latex-3.2.1-0 -SRCURL[0]="http://download.gnome.org/sources/gedit-latex/${PKGVERSION[2]}/gedit-latex-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://download.gnome.org/sources/gedit-latex/${PKGVERSION[2]}/gedit-latex-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 1ec81f710c830419697717ee2033befb0c78898d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 10:58:05 +0200 Subject: [PATCH 14/15] gedit-latex: Use current bee file template --- gedit-latex.be0 | 56 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/gedit-latex.be0 b/gedit-latex.be0 index 3d2d51c5f..97f280641 100755 --- a/gedit-latex.be0 +++ b/gedit-latex.be0 @@ -2,24 +2,49 @@ # BEE_VERSION gedit-latex-3.2.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.) + +############################################################################### +## 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.gnome.org/sources/gedit-latex/${PKGVERSION[2]}/gedit-latex-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## 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. -# BEE_BUILDTYPE= +# build_in_sourcedir -# EXCLUDE="" +############################################################################### +## 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 ${@} +# bee_extract "${@}" #} #mee_patch() { -# bee_patch ${@} +# bee_patch "${@}" #} #mee_configure() { @@ -33,3 +58,22 @@ PATCHURL[0]="" #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 50abe0061ee384a6b3502eb62c7fffc85b27757e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 10:58:53 +0200 Subject: [PATCH 15/15] gedit-latex: Update version from 3.2.1 to 3.20.0 The current version fails to load with the error below. > An error occurred: Plugin loader 'python' was not found --- gedit-latex.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit-latex.be0 b/gedit-latex.be0 index 97f280641..b2738f1e8 100755 --- a/gedit-latex.be0 +++ b/gedit-latex.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gedit-latex-3.2.1-0 +# BEE_VERSION gedit-latex-3.20.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.)