Skip to content

Update graphviz 2.42.0 to 2.42.2 #1412

Merged
merged 8 commits into from
Oct 24, 2019
Merged
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 46 additions & 58 deletions graphviz.be0
Original file line number Diff line number Diff line change
@@ -1,86 +1,74 @@
#!/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.
BEE_BUILDTYPE=autotools

# 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.
# by cmd --version, you will get 2.43.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this useful in the bee file? If yes, add it right under or above BEE_VERSION.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is only a hint. I have moved it under BEE_VERSION


# 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 "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}
mee_patch() {
cd ${S}
start_cmd sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac
./autogen.sh &> /dev/null
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn’t bee run that automatically, if it detects a autogen.sh?

Prefix with start_cmd?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, bee dont do it

start_cmd dont work so I have removed it

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, bee dont do it

For the future, use the BEE_BUILDTYPE=autogen, cf. https://github.com/bee/bee/blob/master/buildtypes/autogen.sh.in and /usr/libexec/bee/beesh.d/autogen.sh.

}

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 \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the future, if you also add the first switch on the next line, the indentation of all switches can be smaller.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

next time

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ups, I slipped

--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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why disable so many features?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see commit a67e98a

}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'
mee_install() {
bee_install
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be commented out again?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I have forgotten this


###############################################################################
##
## 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_post(){
start_cmd rm -rf ${D}${DATAROOTDIR}/graphviz/doc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why they deviate from DOCDIR=${DATAROOTDIR}/doc/${PKGNAME}.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because they are special :-)

}
## by default this may be 'make install DESTDIR="${D}"'