From 1ba231efbe204db64ce6736b79fa93f4f52d5e12 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:43:43 +0200 Subject: [PATCH 1/8] graphviz: Update from version 2.42.0 to 2.42.2 clean up bee-file increase version --- graphviz.be0 | 61 +++++++--------------------------------------------- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index 446f73910..fa33a2156 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -1,50 +1,21 @@ #!/usr/bin/env beesh -# BEE_VERSION graphviz-2.42.0-1 +# BEE_VERSION graphviz-2.42.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.) - -############################################################################### -## 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}/${PKGNAME}-stable_release_${PKGVERSION}.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 +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 "${@}" #} @@ -62,25 +33,9 @@ mee_configure() { # 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/ -## +mee_install() { + bee_install + #find ${D} -ls + #exit +} + From b1557c9176f74bc0f399d5e547e3cc0170f57c44 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:44:52 +0200 Subject: [PATCH 2/8] Graphviz: bring back configure script --- graphviz.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index fa33a2156..6a3a33c6e 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -20,9 +20,10 @@ build_in_sourcedir # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + cd ${S} + ./autogen.sh &> /dev/null +} mee_configure() { bee_configure -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_VERBOSE_MAKEFILE=ON \ From ff1881d553b2cda9f9c69df4aeb2b3e393e64ba0 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:45:36 +0200 Subject: [PATCH 3/8] graphviz: force autotools --- graphviz.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/graphviz.be0 b/graphviz.be0 index 6a3a33c6e..6c6459947 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -5,6 +5,7 @@ SRCURL[0]="https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVERSION}/${PKGNAME}-stable_release_${PKGVERSION}.tar.gz ${PKGNAME}-${PKGVERSION}.tar.gz" +BEE_BUILDTYPE=autotools # PATCHURL+=() From 0c4a22ddedb1772aa4f9f5cfed50d57612934319 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:46:20 +0200 Subject: [PATCH 4/8] graphiz: remove 64 from lib --- graphviz.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/graphviz.be0 b/graphviz.be0 index 6c6459947..34ca43f7d 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -23,6 +23,7 @@ build_in_sourcedir mee_patch() { cd ${S} + start_cmd sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac ./autogen.sh &> /dev/null } From a67e98a0287c62c26a3ff954caca9aa5b645ade3 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:47:45 +0200 Subject: [PATCH 5/8] graphviz: add configure option to make it simular to cmake --- graphviz.be0 | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index 34ca43f7d..467da559b 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -28,8 +28,37 @@ mee_patch() { } mee_configure() { - bee_configure -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,/usr/lib/graphviz + bee_configure --disable-swig \ + --with-webp=no \ + --with-poppler=no \ + --with-rsvg=no \ + --with-visio=no \ + --with-gdk=no \ + --with-gdk-pixbuf=no \ + --with-gtk=no \ + --with-gtkgl=no \ + --with-gtkglext=no \ + --with-gts=no \ + --with-ann=no \ + --with-glade=no \ + --with-qt=no \ + --with-smyrna=no \ + --with-ortho=no \ + --with-digcola=no \ + --with-ipsepcola=no \ + --disable-sharp \ + --disable-go \ + --with-ghostscript=no \ + --disable-guile \ + --disable-lua \ + --disable-tcl \ + --with-freetype2=no \ + --with-fontconfig=no \ + --without-x \ + --without-glut \ + --disable-perl \ + --without-libgd + #exit } #mee_build() { From fc1144cd0170f06f47918e372243c0f3890a30b3 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:48:21 +0200 Subject: [PATCH 6/8] graphviz: remove pdf and html docu --- graphviz.be0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphviz.be0 b/graphviz.be0 index 467da559b..73fe0e10f 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -71,3 +71,7 @@ mee_install() { #exit } +mee_install_post(){ + start_cmd rm -rf ${D}${DATAROOTDIR}/graphviz/doc +} +## by default this may be 'make install DESTDIR="${D}"' From f3f368718e7740a7dedbe33fcf96f308ba862d72 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 10:51:06 +0200 Subject: [PATCH 7/8] graphviz: remove comments and add one --- graphviz.be0 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index 73fe0e10f..e5bcd5b0e 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -8,7 +8,7 @@ SRCURL[0]="https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVE BEE_BUILDTYPE=autotools # PATCHURL+=() - +# by cmd --version, you will get 2.43.0 # EXCLUDE+=() @@ -58,7 +58,6 @@ mee_configure() { --without-glut \ --disable-perl \ --without-libgd - #exit } #mee_build() { @@ -67,8 +66,6 @@ mee_configure() { mee_install() { bee_install - #find ${D} -ls - #exit } mee_install_post(){ From 51065438cc69097e60312a06e83c5067cc170cdc Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Oct 2019 11:22:19 +0200 Subject: [PATCH 8/8] graphviz: add Paul's wishes --- graphviz.be0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/graphviz.be0 b/graphviz.be0 index e5bcd5b0e..991f75e7a 100755 --- a/graphviz.be0 +++ b/graphviz.be0 @@ -1,14 +1,14 @@ #!/usr/bin/env beesh # BEE_VERSION graphviz-2.42.2-0 - +# by cmd --version, you will get 2.43.0 SRCURL[0]="https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PKGVERSION}/${PKGNAME}-stable_release_${PKGVERSION}.tar.gz ${PKGNAME}-${PKGVERSION}.tar.gz" BEE_BUILDTYPE=autotools # PATCHURL+=() -# by cmd --version, you will get 2.43.0 + # EXCLUDE+=() @@ -64,9 +64,9 @@ mee_configure() { # bee_build #} -mee_install() { - bee_install -} +#mee_install() { +# bee_install +#} mee_install_post(){ start_cmd rm -rf ${D}${DATAROOTDIR}/graphviz/doc