Skip to content

Update qt5 5.10.1 to 5.12.4 incl support #1195

Merged
merged 15 commits into from
Aug 13, 2019
Merged
78 changes: 78 additions & 0 deletions QScintilla.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#!/usr/bin/env beesh

# BEE_VERSION QScintilla-2.11.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://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_gpl-${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 Qt4Qt5

###############################################################################
## 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: 12 additions & 5 deletions qt5.be0
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
#!/usr/bin/env beesh

# BEE_VERSION qt5-5.10.1-2
# BEE_VERSION qt5-5.12.4-0

SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz"

PREFIX=/usr/local/qt5

# https://bugreports.qt.io/browse/QTBUG-37417
build_in_sourcedir
# build_in_sourcedir

# BEE_MAKEFLAGS=-j1
###############################################################################
# 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*
# }

mee_configure() {
start_cmd ${S}/configure \
Expand All @@ -21,7 +26,9 @@ mee_configure() {
-nomake examples \
-opensource \
-confirm-license \
-no-strip
-no-strip \
-no-pch

}

mee_build() {
Expand Down
4 changes: 3 additions & 1 deletion qtlinks.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/env beesh

# BEE_VERSION qtlinks-1.0.1-0
# BEE_VERSION qtlinks-1.0.1-1

mee_install() {

Expand All @@ -13,6 +13,8 @@ mee_install() {

# qt4

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

Choose a reason for hiding this comment

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

If you need a QMake symlink, it shouldn’t be created in the qtlinks package.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Did you overlook this comment?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

kinda, because it's somewhere in the middle of the page.
Also it makes no sense to me -- qmake is part of qt, and this package provides links to qt-stuff.


for f in /usr/local/qt4/lib/pkgconfig/*.pc;do
ln -s $f $D/usr/local/lib/pkgconfig/
done
Expand Down
12 changes: 7 additions & 5 deletions qtwebkit.be0
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env beesh

# BEE_VERSION qtwebkit-5.212-0
# BEE_VERSION qtwebkit-5.212-1

SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz"
# mind the timestamp! | here |
SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/1563413169/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz"

# PATCHURL+=()

Expand All @@ -25,12 +26,13 @@ mee_configure() {
bee_configure \
-DPORT=Qt \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_LD_GOLD=no \
-DUSE_LIBHYPHEN=no
}

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

#mee_install() {
# make INSTALL_ROOT=${D} install
Expand Down
11 changes: 6 additions & 5 deletions qwt-6.0.1-0.bee → qwt.be0
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#!/usr/bin/env beesh

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

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

PATCHURL[0]=""

# BEE_CONFIGURE=compat

# BEE_BUILDTYPE=

EXCLUDE=( $(pkg-config QtCore --variable=prefix)/doc )
EXCLUDE=( $(pkg-config Qt5Core --variable=prefix)/doc )

build_in_sourcedir

Expand All @@ -21,16 +23,15 @@ build_in_sourcedir
#}

mee_patch_post() {
sed -i ${S}/qwtconfig.pri \
-e 's,QWT_INSTALL_PREFIX.*=.*$,QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX],'
sed -i ${S}/qwtconfig.pri -e '/^\s\s*QWT_INSTALL_PREFIX/ s,QWT,# QWT,'
}

mee_configure() {
qmake
}

mee_build() {
make
make ${BEE_MAKEFLAGS}
}

mee_install() {
Expand Down