From f8cfc6986b4bf778c61f00422e56a0514584b814 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 10:38:18 +0100 Subject: [PATCH 1/9] glib: Restart from scratch (del, init, be0, rev++) --- glib-1.2.10-0.bee | 33 -------------------- glib.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 33 deletions(-) delete mode 100755 glib-1.2.10-0.bee create mode 100755 glib.be0 diff --git a/glib-1.2.10-0.bee b/glib-1.2.10-0.bee deleted file mode 100755 index 6d9600e08..000000000 --- a/glib-1.2.10-0.bee +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz" - -PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/glib-1.2.10-gcc34-1.patch" - -BEE_CONFIGURE=compat - -# EXCLUDE="" - - - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} - cp /usr/share/libtool/config/config.sub config.sub -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install - chmod -v 755 ${D}/usr/lib/libgmodule-1.2.so.0.0.10 -} diff --git a/glib.be0 b/glib.be0 new file mode 100755 index 000000000..a84bdbc13 --- /dev/null +++ b/glib.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION glib-1.2.10-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]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/glib-${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 8c302c228c92d298ce8fbb8b393151747f5f136d Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 10:41:49 +0100 Subject: [PATCH 2/9] glib: Add necessary patches Patches are from recent slackware source build. --- glib.be0 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/glib.be0 b/glib.be0 index a84bdbc13..011562189 100755 --- a/glib.be0 +++ b/glib.be0 @@ -16,6 +16,17 @@ SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/glib-${PKGVERSION}.tar. ## The sources will be patched in the order of the array. # PATCHURL+=() +XPATCHROOT=${BEE_DOWNLOADDIR} +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-isowarning.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc34.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-underquoted.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-no_undefined.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-multilib.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-unused-dep.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-autotools.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-format.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc5.patch.gz) +PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc9.patch.gz) ############################################################################### ## Uncomment the next statement, if the software may not be able to be built From 2fcf437f3dbac3c02d7c271aeab056d8266a09f1 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 11:06:00 +0100 Subject: [PATCH 3/9] glib: Adjust outdated build tools - packaged config.guess/config.sub aren't aware of modern CPU's - make libs shareable on 64bit (-fPIC) - don't use libtool from package --- glib.be0 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/glib.be0 b/glib.be0 index 011562189..991bb3ac2 100755 --- a/glib.be0 +++ b/glib.be0 @@ -54,17 +54,19 @@ PATCHURL+=(${XPATCHROOT}/glib-1.2.10-gcc9.patch.gz) # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + cp -p /usr/share/automake-1.15/config.{guess,sub} . +} +export CFLAGS='-O2 -fPIC' #mee_configure() { # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build LIBTOOL=/usr/bin/libtool +} #mee_install() { # bee_install From 91cecbec4e9779db1a44ad6e3f5087d912b3d2ca Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 11:45:40 +0100 Subject: [PATCH 4/9] glib: remove bogus rpath from libs --- glib.be0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/glib.be0 b/glib.be0 index 991bb3ac2..0f1652eb9 100755 --- a/glib.be0 +++ b/glib.be0 @@ -73,6 +73,11 @@ mee_build() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + patchelf --remove-rpath ${D}/usr/lib/libgmodule-1.2.so.0.0.10 + patchelf --remove-rpath ${D}/usr/lib/libgthread-1.2.so.0.0.10 +} + ############################################################################### ## ## Additional hints: From c90d1ecb815331db9d06edee75c61aa0510c9b49 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 12:54:00 +0100 Subject: [PATCH 5/9] gtk+: Restart from scratch (del, init, be0, rev++) --- gtk+-1.2.10-0.bee | 32 ------------------- gtk+.be0 | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 32 deletions(-) delete mode 100755 gtk+-1.2.10-0.bee create mode 100755 gtk+.be0 diff --git a/gtk+-1.2.10-0.bee b/gtk+-1.2.10-0.bee deleted file mode 100755 index 52e8101dd..000000000 --- a/gtk+-1.2.10-0.bee +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz" - -PATCHURL[0]="" - -BEE_CONFIGURE=compat - -# EXCLUDE="" - - - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} - cp /usr/share/libtool/config/config.sub config.sub -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} diff --git a/gtk+.be0 b/gtk+.be0 new file mode 100755 index 000000000..633c2371d --- /dev/null +++ b/gtk+.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gtk+-1.2.10-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]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/gtk+-${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 fdba0f9f6aa9bddb248afa1e349b647aab9e3b95 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 12:56:08 +0100 Subject: [PATCH 6/9] gtk+: Add necessary patches Patches are from recent slackware source build. --- gtk+.be0 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gtk+.be0 b/gtk+.be0 index 633c2371d..9703df023 100755 --- a/gtk+.be0 +++ b/gtk+.be0 @@ -16,6 +16,36 @@ SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar. ## The sources will be patched in the order of the array. # PATCHURL+=() +XPATCHROOT=${BEE_DOWNLOADDIR} +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ahiguti.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.8-wrap-alnum.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-alignment.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-expose.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-focus.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-encoding.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ctext.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-utf8fontset.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-kpenter.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-themeswitch.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-pixmapref.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-missingchar.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ukfont.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-deletedir.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-fontwarning.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-troughpaint.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-localecrash.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-dndorder.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-clistfocusrow.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-bellvolume.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-libtool.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-gtkgdkdep.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-underquoted.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-ppc64.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-no_undefined.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-multilib.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-unused-deps.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-autotools.patch.gz) +PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-format.patch.gz) ############################################################################### ## Uncomment the next statement, if the software may not be able to be built From 53c618cb6053e686708a32bb18bc658ff5207c1a Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 13:00:10 +0100 Subject: [PATCH 7/9] gtk+: Adjust outdated build tools - packaged config.guess/config.sub aren't aware of modern CPU's - make libs shareable on 64bit (-fPIC) - don't use libtool from package --- gtk+.be0 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gtk+.be0 b/gtk+.be0 index 9703df023..45d226230 100755 --- a/gtk+.be0 +++ b/gtk+.be0 @@ -73,17 +73,20 @@ PATCHURL+=(${XPATCHROOT}/gtk+-1.2.10-format.patch.gz) # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + cp -p /usr/share/automake-1.15/config.{guess,sub} . +} +export CFLAGS='-O2 -fPIC' +export CXXFLAGS='-O2 -fPIC' #mee_configure() { # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build LIBTOOL=/usr/bin/libtool +} #mee_install() { # bee_install From 8dcadf63339f6ba657d3de7d92da388468aa8b25 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 13:01:06 +0100 Subject: [PATCH 8/9] gtk+: remove bogus rpath from libs --- gtk+.be0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtk+.be0 b/gtk+.be0 index 45d226230..fc6d39474 100755 --- a/gtk+.be0 +++ b/gtk+.be0 @@ -93,6 +93,10 @@ mee_build() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + patchelf --remove-rpath ${D}/usr/lib/libgtk-1.2.so.0.9.1 +} + ############################################################################### ## ## Additional hints: From e1292f6ff65ac417a2ccdf52637b7ed80c22e68d Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 13:32:54 +0100 Subject: [PATCH 9/9] glib: Set executable bits on libgmodule So ldd won't complain --- glib.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/glib.be0 b/glib.be0 index 0f1652eb9..281b20acf 100755 --- a/glib.be0 +++ b/glib.be0 @@ -76,6 +76,7 @@ mee_build() { mee_install_post() { patchelf --remove-rpath ${D}/usr/lib/libgmodule-1.2.so.0.0.10 patchelf --remove-rpath ${D}/usr/lib/libgthread-1.2.so.0.0.10 + chmod -v 0755 ${D}/usr/lib/libgmodule-1.2.so.0.0.10 } ###############################################################################