Merge pull request #2014 from mariux64/update-qt5-5.12.7-to-5.15.2-in…

…cl-support Update qt5 5.12.7 to 5.15.2 incl support
mariux64 · Feb 17, 2021 · ec37802 · ec37802
2 parents d690bd8 + 2ab4f23
commit ec37802
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/QScintilla.be0 b/QScintilla.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION QScintilla-2.11.2-0
+# BEE_VERSION QScintilla-2.11.6-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,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://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"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.

diff --git a/qt5.be0 b/qt5.be0
@@ -1,8 +1,9 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION qt5-5.12.7-0
+# BEE_VERSION qt5-5.15.2-0
 
-SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz"
+# 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"
 
 PREFIX=/usr/local/qt5
 
@@ -23,17 +24,23 @@ mee_configure_pre() {
 }
 
 mee_configure() {
+
     start_cmd ${S}/configure \
         -prefix ${PREFIX} \
         -bindir ${BINDIR} \
         -libdir ${LIBDIR} \
+        -plugindir ${LIBDIR}/plugins \
         -headerdir ${INCLUDEDIR} \
         -sysconfdir ${SYSCONFDIR} \
         -nomake examples \
         -opensource \
         -confirm-license \
         -no-strip \
-        -no-pch
+        -no-pch \
+        -verbose \
+        -xcb \
+        -qpa xcb \
+        -opengl
 
 }
 

diff --git a/qtlinks.be0 b/qtlinks.be0
@@ -1,6 +1,6 @@
 #!/bin/env beesh
 
-# BEE_VERSION qtlinks-1.0.1-4
+# BEE_VERSION qtlinks-1.0.1-5
 
 mee_install() {
   mkdir -p $D/usr/local/bin
@@ -30,6 +30,8 @@ mee_install() {
     ln -s $f $D/usr/local/lib/
   done
 
+  ln -s /usr/local/qt5/lib/plugins $D/usr/local/lib/
+
   for f in /usr/local/qt5/lib/pkgconfig/*.pc;do
     ln -s $f $D/usr/local/lib/pkgconfig/
   done

diff --git a/qwt.be0 b/qwt.be0
@@ -1,10 +1,10 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION qwt-6.1.4-1
+# BEE_VERSION qwt-6.1.5-0
 
 #SRCURL[0]="https://downloads.sourceforge.net/project/qwt/qwt/${PKGVERSION}/qwt-${PKGVERSION}.tar.bz2"
 
-SRCURL[0]="https://beehive.molgen.mpg.de/4fb1852f694420e3ab9c583526edecc5/qwt-6.1.4.tar.bz2"
+SRCURL[0]="https://beehive.molgen.mpg.de/d65582f99312796ed42c3be3208ed3db/qwt-6.1.5.tar.bz2"
 
 # PATCHURL[0]=""