[skip-ci] qt5: fixed minor issues in PKGBUILDs'

This commit is contained in:
Francesco Marinucci 2018-10-18 17:11:00 +02:00
parent b6dbb2f82e
commit a0156393b4
5 changed files with 9 additions and 45 deletions

View File

@ -2,16 +2,16 @@
pkgname=qt5-doc
pkgver=5.11.2
pkgrel=1
arch=('any')
arch=('x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework (Documentation)'
depends=('qt5-base')
makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss')
makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'clang')
groups=('qt5')
_pkgfqn="qt-everywhere-src-${pkgver}"
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/single/${_pkgfqn}.tar.xz")
md5sums=('07b54e751ca7b4fcf180fc66df405b1d')
md5sums=('152a8ade9c11fe33ff5bc95310a1bb64')
prepare() {
cd ${_pkgfqn}

View File

@ -11,7 +11,7 @@ makedepends=()
groups=('qt5')
_pkgfqn="qt-everywhere-src-${pkgver}"
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/single/${_pkgfqn}.tar.xz")
md5sums=('')
md5sums=('152a8ade9c11fe33ff5bc95310a1bb64')
package() {
_base="$pkgdir"/usr/share/doc/qt5/examples

View File

@ -7,18 +7,15 @@ url='http://qt-project.org/'
license=('LGPL3' 'LGPL2.1' 'BSD')
pkgdesc='Provides support for web applications using the Chromium browser project'
depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss'
'libevent' 'snappy' 'nss' 'protobuf' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx')
'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx')
makedepends=('python2' 'git' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools')
groups=('qt5')
options=('debug')
_pkgfqn="${pkgname/5-/}-everywhere-src-${pkgver}"
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz"
qtwebengine-harmony.patch qtwebengine-ffmpeg4.patch
qtwebengine-wayland.patch::"http://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=a66d4cd8")
qtwebengine-harmony.patch)
md5sums=('183b1e44bac4f70b54a77a9e569ff554'
'254061cb349cff714230b7cca83b0a4c'
'2835f9fe8097ff3d6098812c70f48044'
'04360a0896a267ee6b32df946db8202f')
'254061cb349cff714230b7cca83b0a4c')
prepare() {
mkdir -p build
@ -31,12 +28,7 @@ prepare() {
# FreeType 2.8.1
patch -Np1 -i ../qtwebengine-harmony.patch
# Fix openGL detection on Wayland
patch -p1 -i ../qtwebengine-wayland.patch
cd src/3rdparty/chromium
# Fix build with ffmpeg 4
patch -p2 -i "$srcdir"/qtwebengine-ffmpeg4.patch
}
build() {

View File

@ -36,33 +36,5 @@ index 9ed1db8b..95491709 100644
QT_END_NAMESPACE
#if defined(USE_OZONE) || defined(OS_WIN)
diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
index 8ffdad58..cecceabc 100644
--- a/src/core/gl_context_qt.h
+++ b/src/core/gl_context_qt.h
@@ -63,6 +63,7 @@ public:
static void* getXDisplay();
static void* getNativeDisplay();
static QFunctionPointer getGlXGetProcAddress();
+ static QFunctionPointer getEglGetProcAddress();
private:
Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs);
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 7e579246..4d38d7c2 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
base::GetFunctionPointerFromNativeLibrary(library,
"eglGetProcAddress"));
if (!get_proc_address) {
+ QFunctionPointer address = GLContextHelper::getEglGetProcAddress();
+ get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address);
+ }
+ if (!get_proc_address) {
LOG(ERROR) << "eglGetProcAddress not found.";
base::UnloadNativeLibrary(library);
return false;
--
cgit v1.1-6-g87c4

View File

@ -1,7 +1,7 @@
pkgname=qt5-webkit
_qtver=5.212.0-alpha2
pkgver=${_qtver/-/}
pkgrel=8
pkgrel=9
arch=(x86_64)
url='http://qt-project.org/'
license=(GPL3 LGPL3 FDL custom)