From 56112c29f0b4d9bca540780c3d235ff32dcc539c Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Thu, 5 Sep 2019 17:55:51 +0200 Subject: [PATCH 1/6] graphviz: be0 conversion --- graphviz-2.26.3-0.bee | 30 --------------- graphviz.be0 | 85 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 30 deletions(-) delete mode 100755 graphviz-2.26.3-0.bee create mode 100755 graphviz.be0 diff --git a/graphviz-2.26.3-0.bee b/graphviz-2.26.3-0.bee deleted file mode 100755 index 161aeeb48..000000000 --- a/graphviz-2.26.3-0.bee +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-${PKGVERSION}.tar.gz" - -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/graphviz.be0 b/graphviz.be0 new file mode 100755 index 000000000..a43b266cb --- /dev/null +++ b/graphviz.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION graphviz-2.26.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]="https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/graphviz/2.26.3-10ubuntu1.2/graphviz_2.26.3.orig.tar.gz ${PKGNAME}-${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+=() + +############################################################################### +## 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 --with-ghostscript=no +} + +#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 3652f4e1dcec888554ff10f1d29cb193d4028ff7 Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Tue, 10 Sep 2019 14:12:41 +0200 Subject: [PATCH 2/6] graphviz: update from 2.26 -> 2.42 --- graphviz.be0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index a43b266cb..4b7bc33a4 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION graphviz-2.26.3-0 +# BEE_VERSION graphviz-2.42.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.) @@ -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://launchpad.net/ubuntu/+archive/primary/+sourcefiles/graphviz/2.26.3-10ubuntu1.2/graphviz_2.26.3.orig.tar.gz ${PKGNAME}-${PKGVERSION}.tar.gz" +SRCURL[0]="https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVERSION}/graphviz-stable_release_${PKGVERSION}.tar.gz graphviz-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -53,9 +53,9 @@ SRCURL[0]="https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/graphviz/2 # bee_patch "${@}" #} -mee_configure() { - bee_configure --with-ghostscript=no -} +#mee_configure() { +# bee_configure +#} #mee_build() { # bee_build From 6963bd56d18348692c2a5496f5dc5c2647147634 Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Tue, 10 Sep 2019 14:12:41 +0200 Subject: [PATCH 3/6] graphviz_compat: Add version 2.26.3 --- graphviz_compat.be0 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 graphviz_compat.be0 diff --git a/graphviz_compat.be0 b/graphviz_compat.be0 new file mode 100755 index 000000000..2bba804ff --- /dev/null +++ b/graphviz_compat.be0 @@ -0,0 +1,10 @@ +#!/usr/bin/env beesh + +# BEE_VERSION graphviz_compat-2.26.3-0 + +mee_install() { + cd ${D} + start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 /usr/lib/libcdt.so.4.0.0 + start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 /usr/lib/libgraph.so.4.0.0 + start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 /usr/lib/libgvc.so.5.0.0 +} From ddf60edd39da9634ff007470d6e96bbc178c0a12 Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Wed, 11 Sep 2019 12:31:12 +0200 Subject: [PATCH 4/6] graphviz: fix missing library for gvpack --- graphviz.be0 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index 4b7bc33a4..4b79acfb0 100755 --- a/graphviz.be0 +++ b/graphviz.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://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVERSION}/graphviz-stable_release_${PKGVERSION}.tar.gz graphviz-${PKGVERSION}.tar.gz" +SRCURL[0]="https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVERSION}/${PKGNAME}-stable_release_${PKGVERSION}.tar.gz ${PKGNAME}-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -53,9 +53,10 @@ SRCURL[0]="https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVE # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,/usr/lib/graphviz +} #mee_build() { # bee_build From 170fb795f86dc45f9cb14a78a0d7c3df00f2c36e Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Wed, 11 Sep 2019 15:49:59 +0200 Subject: [PATCH 5/6] graphviz: increment build number --- graphviz.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphviz.be0 b/graphviz.be0 index 4b79acfb0..446f73910 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION graphviz-2.42.0-0 +# BEE_VERSION graphviz-2.42.0-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.) From b3c42a24e3825caecf19b8d16ec80cb2a506d437 Mon Sep 17 00:00:00 2001 From: Niclas Hofmann Date: Wed, 11 Sep 2019 15:52:43 +0200 Subject: [PATCH 6/6] graphviz: extract symbol links as well /usr/lib/libcdt.so.4 /usr/lib/libgraph.so.4 /usr/lib/libgvc.so.5 --- graphviz_compat.be0 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/graphviz_compat.be0 b/graphviz_compat.be0 index 2bba804ff..bded1c89a 100755 --- a/graphviz_compat.be0 +++ b/graphviz_compat.be0 @@ -4,7 +4,11 @@ mee_install() { cd ${D} - start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 /usr/lib/libcdt.so.4.0.0 - start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 /usr/lib/libgraph.so.4.0.0 - start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 /usr/lib/libgvc.so.5.0.0 + start_cmd tar xpf /src/mariux/beeroot/packages/graphviz-2.26.3-0.x86_64.bee.tar.bz2 \ + /usr/lib/libcdt.so.4.0.0 \ + /usr/lib/libgraph.so.4.0.0 \ + /usr/lib/libgvc.so.5.0.0 \ + /usr/lib/libcdt.so.4 \ + /usr/lib/libgraph.so.4 \ + /usr/lib/libgvc.so.5 }