From bb3af4965deb4b448ee4185d4872fa8a4aa28a85 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:02:08 +0200 Subject: [PATCH 01/10] gspell: Add version 1.8.1 [Description][1]: > gspell provides a flexible API to add spell-checking to a GTK+ > application. [1]: https://wiki.gnome.org/Projects/gspell --- gspell.be0 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 gspell.be0 diff --git a/gspell.be0 b/gspell.be0 new file mode 100755 index 000000000..deef22f49 --- /dev/null +++ b/gspell.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gspell-1.8.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/gspell/${PKGVERSION[2]}/gspell-${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+=() + +############################################################################### +## 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 fc1772763d7c37d8d4ca88c8a26bec8b536a5a2a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:10:48 +0200 Subject: [PATCH 02/10] enchant: Strip trailing space --- enchant-1.6.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enchant-1.6.0-0.bee b/enchant-1.6.0-0.bee index 8e02a61dc..882f5314d 100755 --- a/enchant-1.6.0-0.bee +++ b/enchant-1.6.0-0.bee @@ -17,7 +17,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 6161697305bd7fec4b6e0cf245414c9f2795be94 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:11:48 +0200 Subject: [PATCH 03/10] enchant: Use current bee file template from `scripts/TEMPLATE.be0` --- enchant-1.6.0-0.bee | 81 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 17 deletions(-) diff --git a/enchant-1.6.0-0.bee b/enchant-1.6.0-0.bee index 882f5314d..4453c43bf 100755 --- a/enchant-1.6.0-0.bee +++ b/enchant-1.6.0-0.bee @@ -1,30 +1,77 @@ -#!/bin/env beesh +#!/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]="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/enchant-1.6.0.tar.gz" -PATCHURL[0]="" +############################################################################### +## 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 -PGRP=( uncategorized ) +############################################################################### +## 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 -# BEE_CONFIGURE=compat +############################################################################### +## 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}" -# EXCLUDE="" +#mee_extract() { +# bee_extract "${@}" +#} -mee_patch() { - bee_patch -} +#mee_patch() { +# bee_patch "${@}" +#} -mee_configure() { - bee_configure -} +#mee_configure() { +# bee_configure +#} -mee_build() { - bee_build -} +#mee_build() { +# bee_build +#} -mee_install() { - bee_install -} +#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 b9523100bbcdb7fa0a4b44f639b6c706e3ec24ea Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:12:34 +0200 Subject: [PATCH 04/10] enchant: Use `PKGVERSION` --- enchant-1.6.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enchant-1.6.0-0.bee b/enchant-1.6.0-0.bee index 4453c43bf..97350dd6e 100755 --- a/enchant-1.6.0-0.bee +++ b/enchant-1.6.0-0.bee @@ -7,7 +7,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.netbsd.org/pub/pkgsrc/distfiles/enchant-1.6.0.tar.gz" +SRCURL[0]="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/enchant-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 4b9da118aefb6f67e8b9b2aa83ae861ed792610f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:13:06 +0200 Subject: [PATCH 05/10] enchant: Convert to versionless bee file --- enchant-1.6.0-0.bee => enchant.be0 | 2 ++ 1 file changed, 2 insertions(+) rename enchant-1.6.0-0.bee => enchant.be0 (98%) diff --git a/enchant-1.6.0-0.bee b/enchant.be0 similarity index 98% rename from enchant-1.6.0-0.bee rename to enchant.be0 index 97350dd6e..9cbe561a5 100755 --- a/enchant-1.6.0-0.bee +++ b/enchant.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION enchant-1.6.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 0af09a4ae7b954bd3fe8d8fc5af8c22a2deff2e2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:14:14 +0200 Subject: [PATCH 06/10] enchant: Update version from 1.6.0 to 2.2.3 Also update the URL according to [1]. [1]: http://www.linuxfromscratch.org/blfs/view/8.2/general/enchant.html --- enchant.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/enchant.be0 b/enchant.be0 index 9cbe561a5..d735c13fc 100755 --- a/enchant.be0 +++ b/enchant.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION enchant-1.6.0-0 +# BEE_VERSION enchant-2.2.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.) @@ -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.netbsd.org/pub/pkgsrc/distfiles/enchant-${PKGVERSION}.tar.gz" +SRCURL[0]="https://github.com/AbiWord/enchant/releases/download/v${PKGVERSION}/enchant-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 9c3397703184d42422ca6e5467236ce610fc0390 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:15:01 +0200 Subject: [PATCH 07/10] enchant: Prevent installation of static versions of libraries --- enchant.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/enchant.be0 b/enchant.be0 index d735c13fc..6e1c8c251 100755 --- a/enchant.be0 +++ b/enchant.be0 @@ -47,9 +47,10 @@ SRCURL[0]="https://github.com/AbiWord/enchant/releases/download/v${PKGVERSION}/e # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From 8533a5d803f798567efde1e3d7fcda471a4f194b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:24:16 +0200 Subject: [PATCH 08/10] enchant: Create compatibility links for enchant 1.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the package is not installed in parallel ensure compatibility [1]. > rm -rf /usr/include/enchant; ln -sfn ...: Create symlinks for this > package version so that other other packages can find it using the old > name. The warning below is shown. ``` [BEE] => entering mee_install_post() .. ‘/dev/shm/bee-root/enchant/enchant-2.2.3-0/image//usr/include/enchant’ -> ‘enchant-2’ ‘/dev/shm/bee-root/enchant/enchant-2.2.3-0/image//usr/bin/enchant’ -> ‘enchant-2’ ‘/dev/shm/bee-root/enchant/enchant-2.2.3-0/image//usr/lib/libenchant.so’ -> ‘libenchant-2.so’ ‘/dev/shm/bee-root/enchant/enchant-2.2.3-0/image//usr/lib/pkgconfig/enchant.pc’ -> ‘enchant-2.pc’ [BEE] <= leaving mee_install_post() .. [BEE] changing to image directory: /dev/shm/bee-root/enchant/enchant-2.2.3-0/image [BEE] WARNING: system and image files named '/usr/include/enchant' differ [BEE] image : symbolic link to enchant-2 [BEE] system: directory [BEE] -> creating package enchant-2.2.3-0.x86_64.bee.tar.bz2 .. ``` [1]: http://www.linuxfromscratch.org/blfs/view/svn/general/enchant.html --- enchant.be0 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/enchant.be0 b/enchant.be0 index 6e1c8c251..2cf2eacc3 100755 --- a/enchant.be0 +++ b/enchant.be0 @@ -61,6 +61,13 @@ mee_configure() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + ln -sfv enchant-2 ${D}/${INCLUDEDIR}/enchant + ln -sfv enchant-2 ${D}/${BINDIR}/enchant + ln -sfv libenchant-2.so ${D}/${LIBDIR}/libenchant.so && + ln -sfv enchant-2.pc ${D}/${LIBDIR}/pkgconfig/enchant.pc +} + ############################################################################### ## ## Additional hints: From 336a08aeb5536b2d46849f91594950592e7754d8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:30:19 +0200 Subject: [PATCH 09/10] gedit: Enable spell-check plugin This reverts commit ecc2c6cb (gedit: Remove ispell) as the dependencies are now packaged for MarIuX. --- gedit.be0 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gedit.be0 b/gedit.be0 index 6d1f54a9c..98b25eba2 100755 --- a/gedit.be0 +++ b/gedit.be0 @@ -53,10 +53,9 @@ SRCURL[0]="https://download.gnome.org/sources/gedit/${PKGVERSION[2]}/gedit-${PKG # bee_patch "${@}" #} -mee_configure() { - bee_configure \ - --disable-spell -} +#mee_configure() { +# bee_configure +#} #mee_build() { # bee_build From bdd8049d03f0cc53c3f5bc3e4a911d84176d0f91 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 18 Jul 2018 14:30:31 +0200 Subject: [PATCH 10/10] gedit: Increment revision to 1 --- gedit.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedit.be0 b/gedit.be0 index 98b25eba2..07abce1fc 100755 --- a/gedit.be0 +++ b/gedit.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gedit-3.28.1-0 +# BEE_VERSION gedit-3.28.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.)