From 3ba6c431df229938c8c470dfed5f566e606b3b3b Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 09:56:26 +0100 Subject: [PATCH 01/10] gtksourceview: Convert to versionless bee file Note, that we have gtksourceview-2 and gtksourceview-3 installed. The installed packages don't seem to conflict. This commit applies to gtksourceview-3 only. Technically, we could call this package gtksourview3 because it can coexist with a package gtksourceview2. Anyway, assuming that gtksourceview-2 is or will become obsolete anyway, keep things simple for now. --- gtksourceview-3.16.1-1.bee | 30 -------------- gtksourceview.be0 | 85 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 30 deletions(-) delete mode 100755 gtksourceview-3.16.1-1.bee create mode 100755 gtksourceview.be0 diff --git a/gtksourceview-3.16.1-1.bee b/gtksourceview-3.16.1-1.bee deleted file mode 100755 index d64aeef6c..000000000 --- a/gtksourceview-3.16.1-1.bee +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${PKGVERSION[2]}/gtksourceview-${PKGVERSION}.tar.xz" - -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/gtksourceview.be0 b/gtksourceview.be0 new file mode 100755 index 000000000..c64cf7c9a --- /dev/null +++ b/gtksourceview.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gtksourceview-3.16.1-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]="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${PKGVERSION[2]}/gtksourceview-${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 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 adacd47c5870612b82d623ec67a1f1bdfccb72df Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 10:01:37 +0100 Subject: [PATCH 02/10] gtksourceview: Update download url --- gtksourceview.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtksourceview.be0 b/gtksourceview.be0 index c64cf7c9a..18686f022 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]="http://ftp.gnome.org/pub/gnome/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 a8958be43c654db7b52558df26f6c54dfecbf599 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 10:06:05 +0100 Subject: [PATCH 03/10] gtksourceview: Update version from 3.16.1 to 3.24.6 Update is required for gedit 3.22.1: Requested 'gtksourceview-3.0 >= 3.21.2' but version of gtksourceview is 3.16.1 --- gtksourceview.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtksourceview.be0 b/gtksourceview.be0 index 18686f022..2e224ff0b 100755 --- a/gtksourceview.be0 +++ b/gtksourceview.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gtksourceview-3.16.1-1 +# BEE_VERSION gtksourceview-3.24.6-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 14d7153286a41873d9c2edd9c40ea3ff282238c4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 10:19:06 +0100 Subject: [PATCH 04/10] libpeas: Convert to versionless be file --- libpeas-1.14.0-0.bee | 31 ---------------- libpeas.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 31 deletions(-) delete mode 100755 libpeas-1.14.0-0.bee create mode 100755 libpeas.be0 diff --git a/libpeas-1.14.0-0.bee b/libpeas-1.14.0-0.bee deleted file mode 100755 index a9cf5348b..000000000 --- a/libpeas-1.14.0-0.bee +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/libpeas/${PKGVERSION[2]}/libpeas-${PKGVERSION}.tar.xz" - -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - - - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} diff --git a/libpeas.be0 b/libpeas.be0 new file mode 100755 index 000000000..b7c7d63c9 --- /dev/null +++ b/libpeas.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libpeas-1.14.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]="http://ftp.gnome.org/pub/gnome/sources/libpeas/${PKGVERSION[2]}/libpeas-${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 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 23d956c071bdba8450c67d98811db59c852d57f4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 10:19:54 +0100 Subject: [PATCH 05/10] libpeas: Update download url --- libpeas.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpeas.be0 b/libpeas.be0 index b7c7d63c9..a9a262b3d 100755 --- a/libpeas.be0 +++ b/libpeas.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://ftp.gnome.org/pub/gnome/sources/libpeas/${PKGVERSION[2]}/libpeas-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.gnome.org/sources/libpeas/${PKGVERSION[2]}/libpeas-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 1deceb31917f611d6592d2434d906539db9b4475 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 10:20:50 +0100 Subject: [PATCH 06/10] libpeas: Update version from 1.14.0 to 1.22.0 Update is required for gedit-3.22.0: Requested 'libpeas-1.0 >= 1.14.1' but version of libpeas is 1.14.0 Requested 'libpeas-gtk-1.0 >= 1.14.1' but version of libpeas-gtk is 1.14.0 --- libpeas.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpeas.be0 b/libpeas.be0 index a9a262b3d..341ebbf32 100755 --- a/libpeas.be0 +++ b/libpeas.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libpeas-1.14.0-0 +# BEE_VERSION libpeas-1.22.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 a4d911def946f74912ea3a5b849eda8a8b6069ec Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 09:10:57 +0100 Subject: [PATCH 07/10] gedit: Convert to versionless bee file --- gedit-3.16.3-0.bee | 30 ---------------- gedit.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 30 deletions(-) delete mode 100755 gedit-3.16.3-0.bee create mode 100755 gedit.be0 diff --git a/gedit-3.16.3-0.bee b/gedit-3.16.3-0.bee deleted file mode 100755 index 5cc5cc8ac..000000000 --- a/gedit-3.16.3-0.bee +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://ftp.acc.umu.se/pub/GNOME/sources/gedit/${PKGVERSION[2]}/gedit-${PKGVERSION}.tar.xz" - -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/gedit.be0 b/gedit.be0 new file mode 100755 index 000000000..2e1d5647e --- /dev/null +++ b/gedit.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gedit-3.16.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]="http://ftp.acc.umu.se/pub/GNOME/sources/gedit/${PKGVERSION[2]}/gedit-${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 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 40b8910df1745dd1397fde74627a84b19ee19641 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 09:15:26 +0100 Subject: [PATCH 08/10] gedit: Update download url --- gedit.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit.be0 b/gedit.be0 index 2e1d5647e..97b74cde2 100755 --- a/gedit.be0 +++ b/gedit.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://ftp.acc.umu.se/pub/GNOME/sources/gedit/${PKGVERSION[2]}/gedit-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.gnome.org/sources/gedit/${PKGVERSION[2]}/gedit-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From ec7d74d4242677d55c76b2d9116289f4f727736a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 09:16:06 +0100 Subject: [PATCH 09/10] gedit: Update version from 3.16.3 to 3.22.1 --- gedit.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit.be0 b/gedit.be0 index 97b74cde2..b18d9d322 100755 --- a/gedit.be0 +++ b/gedit.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gedit-3.16.3-0 +# BEE_VERSION gedit-3.22.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.) From ecc2c6cbfec8293ed2e13ce2c7d7d25b608c2376 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 23 Jan 2018 10:03:01 +0100 Subject: [PATCH 10/10] gedit: Remove ispell Disable gspell support, because currently we don't have it installed. configure: error: gspell library not found or too old. Use --disable-spell to build without spell plugin. --- gedit.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gedit.be0 b/gedit.be0 index b18d9d322..90e990df0 100755 --- a/gedit.be0 +++ b/gedit.be0 @@ -53,9 +53,10 @@ SRCURL[0]="https://download.gnome.org/sources/gedit/${PKGVERSION[2]}/gedit-${PKG # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-spell +} #mee_build() { # bee_build