diff --git a/dev-qt/qt5/qt5-5.9.1.recipe b/dev-qt/qt5/qt5-5.9.1.recipe index b3f3e8d2f..2943cb223 100644 --- a/dev-qt/qt5/qt5-5.9.1.recipe +++ b/dev-qt/qt5/qt5-5.9.1.recipe @@ -7,15 +7,11 @@ HOMEPAGE="https://qt.io/" COPYRIGHT="2015-2017 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://download.qt.io/official_releases/qt/5.9/5.9.1/single/qt-everywhere-opensource-src-${portVersion/\~/-}.tar.xz" -SOURCE_URI_2="http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-${portVersion/\~/-}.tar.xz" CHECKSUM_SHA256="7b41a37d4fe5e120cdb7114862c0153f86c07abbec8db71500443d2ce0c89795" -CHECKSUM_SHA256_2="28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf" SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}" -SOURCE_DIR_2="qtwebkit-opensource-src-${portVersion/\~/-}" PATCHES="qt5-$portVersion.patchset" -PATCHES_2="qtwebkit-$portVersion.patchset" ADDITIONAL_FILES=" assistant.rdef.in designer.rdef.in @@ -105,13 +101,12 @@ PROVIDES=" lib:libQt5DesignerComponents$secondaryArchSuffix = $portVersion compat >= 5 # qtwebchannel lib:libQt5WebChannel$secondaryArchSuffix = $portVersion compat >= 5 - # qtwebkit - lib:libQt5WebKit$secondaryArchSuffix = $portVersion compat >= 5 - lib:libQt5WebKitWidgets$secondaryArchSuffix = $portVersion compat >= 5 # qtwebsockets lib:libQt5WebSockets$secondaryArchSuffix = $portVersion compat >= 5 # qtxmlpatterns lib:libQt5XmlPatterns$secondaryArchSuffix = $portVersion compat >= 5 + + lib:libQt5EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 5 " REQUIRES=" @@ -222,9 +217,6 @@ PROVIDES_devel=" devel:libQt5Help$secondaryArchSuffix = $portVersion compat >= 5 # qtwebchannel devel:libQt5WebChannel$secondaryArchSuffix = $portVersion compat >= 5 - # qtwebkit - devel:libQt5WebKit$secondaryArchSuffix = $portVersion compat >= 5 - devel:libQt5WebKitWidgets$secondaryArchSuffix = $portVersion compat >= 5 # qtwebsockets devel:libQt5WebSockets$secondaryArchSuffix = $portVersion compat >= 5 # qtxmlpatterns @@ -239,6 +231,7 @@ PROVIDES_devel=" devel:libQt5ServiceSupport$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5ThemeSupport$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5EGLSupport$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 5 cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5 cmd:canbusutil$secondaryArchSuffix = $portVersion compat >= 5 @@ -366,12 +359,6 @@ BUILD() -no-rpath -system-sqlite make $jobArgs - - # build qtwebkit - cd $sourceDir2 - PATH=$PATH:$sourceDir/qtbase/bin - qmake . - make $jobArgs } INSTALL() @@ -382,9 +369,6 @@ INSTALL() #make $jobArgs docs #make install_docs - cd $sourceDir2 - make install - rm $libDir/*.la fixPkgconfig @@ -394,8 +378,8 @@ INSTALL() libQt5Gui \ libQt5Network libQt5NetworkAuth libQt5PrintSupport libQt5OpenGL \ libQt5Sql libQt5Test libQt5Widgets libQt5Xml \ - libQt5XmlPatterns libQt5WebSockets libQt5WebKitWidgets \ - libQt5WebKit libQt5WebChannel libQt5Svg libQt5SerialBus \ + libQt5XmlPatterns libQt5WebSockets \ + libQt5WebChannel libQt5Svg libQt5SerialBus \ libQt5SerialPort libQt5Sensors libQt5ScriptTools libQt5Script \ libQt5QuickWidgets libQt5QuickTest libQt5QuickParticles \ libQt5Quick libQt5QuickControls2 libQt5QuickTemplates2 \ @@ -412,7 +396,7 @@ INSTALL() libQt5FbSupport libQt5FontDatabaseSupport \ libQt5PlatformCompositorSupport libQt5ServiceSupport\ libQt5ThemeSupport libQt53DAnimation libQt53DQuickAnimation \ - libQt5RemoteObjects + libQt5RemoteObjects libQt5EglFSDeviceIntegration libQt5EglSupport cd $libDir for i in lib*.so.5.*;do