Skip to content

Update qt5 5.15.2 to 5.15.5 incl support #2716

Merged
merged 7 commits into from Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions QScintilla.be0
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION QScintilla-2.11.6-0
# BEE_VERSION QScintilla-2.13.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.)
Expand All @@ -9,8 +9,8 @@
## 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://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_gpl-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/343cd0c2c8b425518df2e51eb994fbc6/QScintilla-2.11.6.tar.gz"
#SRCURL[0]="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_src-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/af0dab4ff9908e0d41934aff6ce2348d/QScintilla_src-2.13.3.tar.gz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand All @@ -31,7 +31,7 @@ build_in_sourcedir
## 'src' or 'cmake' or ..
## use 'sourcesubdir_append' to specify this directory if known.

sourcesubdir_append Qt4Qt5
sourcesubdir_append src

###############################################################################
## Change the default (auto-detected) steps to
Expand Down
79 changes: 79 additions & 0 deletions QScintilla_designer_plugin.be0
@@ -0,0 +1,79 @@
#!/usr/bin/env beesh

# BEE_VERSION QScintilla_designer_plugin-2.13.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://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_src-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/af0dab4ff9908e0d41934aff6ce2348d/QScintilla_src-2.13.3.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 designer

###############################################################################
## 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() {
qmake
}

mee_build() {
make ${BEE_MAKEFLAGS}
}

mee_install() {
make install INSTALL_ROOT=${D}
}
## 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/
##
17 changes: 17 additions & 0 deletions qt4_compat-4.7.4-0.be0
@@ -0,0 +1,17 @@
#!/usr/bin/env beesh

# BEE_VERSION qt4_compat-4.7.4-0

mee_install() {
cd ${D}
tar xvpf /src/mariux/beeroot/packages/qt4-4.7.4-0.x86_64.bee.tar.bz2 \
/usr/local/qt4/lib/libQtCore.so.4.7.4 \
/usr/local/qt4/lib/libQtCore.so.4.7 \
/usr/local/qt4/lib/libQtCore.so.4 \
/usr/local/qt4/lib/libQtGui.so.4.7.4 \
/usr/local/qt4/lib/libQtGui.so.4.7 \
/usr/local/qt4/lib/libQtGui.so.4 \
/usr/local/qt4/lib/libQtXml.so.4.7.4 \
/usr/local/qt4/lib/libQtXml.so.4.7 \
/usr/local/qt4/lib/libQtXml.so.4
}
37 changes: 10 additions & 27 deletions qt5.be0
@@ -1,9 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION qt5-5.15.2-1
# BEE_VERSION qt5-5.15.5_20220705_ea4efc06-0

# SRCURL[0]="https://download.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
SRCURL[0]="https://beehive.molgen.mpg.de/e1447db4f06c841d8947f0a6ce83a7b5/qt-everywhere-src-5.15.2.tar.xz"
# origin: https://invent.kde.org/qt/qt/qt5.git - branch kde/5.15
SRCURL[0]="https://beehive.molgen.mpg.de/1566026e325525d550c60fee32ecc2b8/qt-everywhere-src-5.15.5_20220705_ea4efc06.tar.lz"

PREFIX=/usr/local/qt5

Expand All @@ -13,49 +13,32 @@ BMF=$(beegetopt --option j: -- ${BEE_MAKEFLAGS})
# export for build and install
export NINJAJOBS=${BMF/ -- */}

# build_in_sourcedir

###############################################################################
# NOTE:
# webengine is the new webkit (sigh). To obtain a 'lean and mean' qt toolkit,
# this is the way to dump all web related stuff.
# mee_extract_post() {
# start_cmd rm -rf ${S}/qtweb*
# }

# At the time of building the system libevent is a complete mess. But it also makes
# sense to keep this in future builds.

mee_patch() {
bee_patch "${@}"
sed -e '/webengine-system-libevent/ s/=true\s*$/=false/' -i ${S}/qtwebengine/src/core/config/linux.pri
}

mee_configure() {
MAKEFLAGS=${BEE_MAKEFLAGS} \
start_cmd ${S}/configure \
${S}/configure \
Copy link
Collaborator

Choose a reason for hiding this comment

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

I’d keep the start_cmd to be in line with bee_configure() and friends.

-confirm-license \
-opensource \
-prefix ${PREFIX} \
-bindir ${BINDIR} \
-libdir ${LIBDIR} \
-plugindir ${LIBDIR}/plugins \
-headerdir ${INCLUDEDIR} \
-sysconfdir ${SYSCONFDIR} \
-nomake examples \
-opensource \
-confirm-license \
-nomake tests \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do they fail to be disabled, or were they never used/run in the first place?

-no-strip \
-no-pch \
-verbose \
-xcb \
-qpa xcb \
-qpa "xcb;wayland" \
-opengl

}

mee_build() {
start_cmd make ${BEE_MAKEFLAGS}
make ${BEE_MAKEFLAGS}
}

mee_install() {
start_cmd make INSTALL_ROOT=${D} install
make INSTALL_ROOT=${D} install
}
29 changes: 10 additions & 19 deletions qtlinks.be0
@@ -1,26 +1,12 @@
#!/bin/env beesh

# BEE_VERSION qtlinks-1.0.1-5
# BEE_VERSION qtlinks-1.0.2-0

mee_install() {
mkdir -p $D/usr/local/bin
mkdir -p $D/usr/local/lib
mkdir $D/usr/local/lib/pkgconfig
mkdir $D/usr/local/lib/cmake

# qt4

ln -s /usr/local/qt4/bin/qmake $D/usr/local/bin/qmake4

for f in /usr/local/qt4/lib/pkgconfig/*.pc;do
ln -s $f $D/usr/local/lib/pkgconfig/
done

for f in /usr/local/qt4/lib/lib*.so*;do
ln -s $f $D/usr/local/lib/
done

# qt5
mkdir $D/usr/local/lib/plugins

for f in /usr/local/qt5/bin/*; do
ln -s $f $D/usr/local/bin/
Expand All @@ -30,10 +16,15 @@ mee_install() {
ln -s $f $D/usr/local/lib/
done

ln -s /usr/local/qt5/lib/plugins $D/usr/local/lib/
for part in pkgconfig plugins; do
for f in /usr/local/qt5/lib/$part/*;do
ln -s $f $D/usr/local/lib/$part/
done
done

for f in /usr/local/qt5/lib/pkgconfig/*.pc;do
ln -s $f $D/usr/local/lib/pkgconfig/
# handle remaining qt4_compat libs
for f in /usr/local/qt4/lib/lib*.so*;do
ln -s $f $D/usr/local/lib/
done

# this doesn't work as the files (eg Qt5Core/Qt5CoreConfig.cmake) use expressions like
Expand Down
11 changes: 6 additions & 5 deletions qwt.be0
@@ -1,10 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION qwt-6.1.5-0
# BEE_VERSION qwt-6.2.0-0

#SRCURL[0]="https://downloads.sourceforge.net/project/qwt/qwt/${PKGVERSION}/qwt-${PKGVERSION}.tar.bz2"

SRCURL[0]="https://beehive.molgen.mpg.de/d65582f99312796ed42c3be3208ed3db/qwt-6.1.5.tar.bz2"
# Origin https://sourceforge.net/projects/qwt/files/qwt/6.2.0/qwt-6.2.0.tar.bz2
SRCURL[0]="https://beehive.molgen.mpg.de/00c94f0af8b29d4785cec47351127c00/qwt-6.2.0.tar.bz2"

# PATCHURL[0]=""

Expand All @@ -25,7 +24,9 @@ build_in_sourcedir
#}

mee_patch_post() {
sed -i ${S}/qwtconfig.pri -e '/^\s\s*QWT_INSTALL_PREFIX/ s,QWT,# QWT,'
sed -i ${S}/qwtconfig.pri \
-e '/^\s\s*QWT_INSTALL_PREFIX/ s,QWT,# QWT,' \
-e '/^QWT_INSTALL_PLUGINS/ s,/plugins,/lib/plugins,'
}

mee_configure() {
Expand Down