[arch-commits] Commit in qt5/trunk (PKGBUILD use-python2.patch)
Date: Friday, December 12, 2014 @ 12:06:10
Author: andrea
Revision: 227556
QtWebEngine refers to python in too many ways, apply this ugly workaround to
let it build
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/use-python2.patch
---+
PKGBUILD | 24 +
use-python2.patch | 128
2 files changed, 14 insertions(+), 138 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-12 06:49:06 UTC (rev 227555)
+++ PKGBUILD2014-12-12 11:06:10 UTC (rev 227556)
@@ -37,18 +37,16 @@
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient' 'libmng'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'bluez-libs'
'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz'
'libwebp' 'leveldb'
-'geoclue')
+'geoclue' 'pciutils' 'nss')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
md5sums=('21843b00ecde8956217faab391bc007b'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1'
- '23ebafd7ad91897e870e84e281266f46')
+ '322b419b16c75d4de0ee7ad0a246caa1')
prepare() {
cd ${_pkgfqn}
@@ -58,10 +56,12 @@
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g
qtbase/mkspecs/common/gcc-base.conf
# Use python2 for Python 2.x
- patch -p1 -i ${srcdir}/use-python2.patch
- sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
--e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
-$(find . -name '*.py')
+ find . -name '*.py' -exec sed -i \
+'s|#![ ]*/usr/bin/python$|2|;s|#![ ]*/usr/bin/env python$|2|' {} +
+
+ # There are still a lot of relative calls which need a workaround
+ mkdir ${srcdir}/python2-path
+ ln -s /usr/bin/python2 ${srcdir}/python2-path/python
}
build() {
@@ -71,6 +71,8 @@
export
LD_LIBRARY_PATH=${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}
export QT_PLUGIN_PATH=${QTDIR}/qtbase/plugins
+ export PATH=${srcdir}/python2-path:$PATH
+
[[ ${CARCH} = i686 ]] SSE2=-no-sse2
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
@@ -491,11 +493,13 @@
package_qt5-webengine() {
pkgdesc='Provides support for web applications using the Chromium browser
project'
- depends=('qt5-base')
+ depends=('qt5-declarative' 'nss' 'libxtst' 'libxcursor' 'libxrandr'
'alsa-lib' 'libxcomposite')
license=('LGPL')
cd ${_pkgfqn}/qtwebengine
make INSTALL_ROOT=${pkgdir} install
+
+ rm -rf ${pkgdir}/usr/share/doc
}
package_qt5-websockets() {
Deleted: use-python2.patch
===
--- use-python2.patch 2014-12-12 06:49:06 UTC (rev 227555)
+++ use-python2.patch 2014-12-12 11:06:10 UTC (rev 227556)
@@ -1,128 +0,0 @@
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri~
2013-11-29 16:57:47.573721157 +
-+++
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri
2013-11-29 16:58:22.270157823 +
-@@ -819,7 +819,7 @@
- inspectorValidate.output = InspectorProtocolVersion.h
- inspectorValidate.input = INSPECTOR_JSON
- inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
--inspectorValidate.commands = python $$inspectorValidate.script -o
${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-+inspectorValidate.commands = python2 $$inspectorValidate.script -o
${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
- inspectorValidate.depends =
$$PWD/inspector/generate-inspector-protocol-version
- inspectorValidate.add_output_to_sources = false
- GENERATORS += inspectorValidate
-@@ -827,7 +827,7 @@
- inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp
InspectorTypeBuilder.cpp
- inspectorJSON.input = INSPECTOR_JSON
- inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
--inspectorJSON.commands = python $$inspectorJSON.script
$$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH}
--output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
-+inspectorJSON.commands = python2 $$inspectorJSON.script
$$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH}
--output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
- inspectorJSON.depends = $$inspectorJSON.script
- GENERATORS += inspectorJSON
-
-@@ -927,7 +927,7 @@
- entities.output = HTMLEntityTable.cpp
- entities.input = HTML_ENTITIES
- entities.script = $$PWD/html/parser/create-html-entity-table
[arch-commits] Commit in qt5/trunk (PKGBUILD use-python2.patch)
Date: Wednesday, December 10, 2014 @ 14:23:56
Author: andrea
Revision: 227395
Upstream release
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/use-python2.patch
---+
PKGBUILD | 54 ++--
use-python2.patch | 10 -
2 files changed, 53 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-10 12:36:46 UTC (rev 227394)
+++ PKGBUILD2014-12-10 13:23:56 UTC (rev 227395)
@@ -19,12 +19,15 @@
'qt5-svg'
'qt5-tools'
'qt5-translations'
+ 'qt5-wayland'
+ 'qt5-webchannel'
+ 'qt5-webengine'
'qt5-webkit'
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.3.2
-pkgrel=2
+pkgver=5.4.0
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -36,15 +39,15 @@
'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz;
+source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
'use-python2.patch')
-md5sums=('c4e893678e3d8388ab04d059523d1d78'
+md5sums=('21843b00ecde8956217faab391bc007b'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- 'a378deccf363bd6079da459c89aff7b9')
+ '767fc585e6a7ae3fad5272663c3d0e9d')
prepare() {
cd ${_pkgfqn}
@@ -439,7 +442,7 @@
package_qt5-webkit() {
pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
- depends=('qt5-sensors' 'qt5-location' 'gst-plugins-base' 'libxslt'
'libxcomposite')
+ depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base'
'libxslt' 'libxcomposite')
optdepends=('gst-plugins-good: Webm codec support')
license=('GPL3' 'LGPL' 'FDL')
@@ -454,6 +457,45 @@
perl -pi -e s, -L${srcdir}/?\S+,,g
${pkgdir}/usr/lib/pkgconfig/Qt5WebKit.pc
}
+package_qt5-wayland() {
+ pkgdesc='Provides APIs for Wayland'
+ depends=('qt5-base' 'libxcomposite' 'libxkbcommon')
+
+ cd ${_pkgfqn}/qtwayland
+ make INSTALL_ROOT=${pkgdir} install
+
+ # Fix wrong path in prl files
+ find ${pkgdir}/usr/lib -type f -name '*.prl' \
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-webchannel() {
+ pkgdesc='Provides access to QObject or QML objects from HTML clients for
seamless integration of Qt applications with HTML/JavaScript clients'
+ depends=('qt5-base')
+
+ cd ${_pkgfqn}/qtwebchannel
+ make INSTALL_ROOT=${pkgdir} install
+
+ # Fix wrong path in prl files
+ find ${pkgdir}/usr/lib -type f -name '*.prl' \
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-webengine() {
+ pkgdesc='Provides support for web applications using the Chromium browser
project'
+ depends=('qt5-base')
+ license=('LGPL')
+
+ cd ${_pkgfqn}/qtwebengine
+ make INSTALL_ROOT=${pkgdir} install
+}
+
package_qt5-websockets() {
pkgdesc='Provides WebSocket communication compliant with RFC 6455'
depends=('qt5-declarative')
Modified: use-python2.patch
===
--- use-python2.patch 2014-12-10 12:36:46 UTC (rev 227394)
+++ use-python2.patch 2014-12-10 13:23:56 UTC (rev 227395)
@@ -55,12 +55,12 @@
disassembler.CONFIG += no_link
GENERATORS += disassembler
}
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~
2013-11-29 16:59:04.859875494 +
-+++
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
2013-11-29 16:59:40.539638968 +
-@@ -116,7 +116,7 @@
- production_build:blackberry|qnx {
- addReasonForSkippingBuild(Build not supported on BB10/QNX yet.)
+---
qt-everywhere-opensource-src-5.4.0/qtwebkit/Tools/qmake/mkspecs/features/configure.prf.old
2014-12-10 11:27:25.875352161 +
qt-everywhere-opensource-src-5.4.0/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
2014-12-10 11:27:39.008643049 +
+@@ -125,7 +125,7 @@
+ addReasonForSkippingBuild(QtWebKit cannot be built as a static
library on this platform. Check your configuration in qtbase/config.summary.)
}
+ winrt: addReasonForSkippingBuild(QtWebKit is not supported on Windows
[arch-commits] Commit in qt5/trunk (PKGBUILD use-python2.patch)
Date: Wednesday, December 10, 2014 @ 17:54:25
Author: andrea
Revision: 227406
Enable WEBP, GeoClue and Bluez 5 support
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/use-python2.patch
---+
PKGBUILD | 22 --
use-python2.patch | 40
2 files changed, 52 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-10 14:44:46 UTC (rev 227405)
+++ PKGBUILD2014-12-10 16:54:25 UTC (rev 227406)
@@ -32,11 +32,12 @@
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs'
'gstreamer0.10-base-plugins' 'libmng'
+'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-bad'
'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
-'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
-'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz')
+'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient' 'libmng'
+'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'bluez-libs'
+'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz'
'libwebp' 'leveldb'
+'geoclue')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -47,7 +48,7 @@
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '767fc585e6a7ae3fad5272663c3d0e9d')
+ '23ebafd7ad91897e870e84e281266f46')
prepare() {
cd ${_pkgfqn}
@@ -143,7 +144,7 @@
package_qt5-connectivity() {
pkgdesc='Provides access to Bluetooth hardware'
- depends=('qt5-declarative')
+ depends=('qt5-declarative' 'bluez-libs')
cd ${_pkgfqn}/qtconnectivity
make INSTALL_ROOT=${pkgdir} install
@@ -273,7 +274,7 @@
package_qt5-imageformats() {
pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
- depends=('qt5-base' 'jasper' 'libmng')
+ depends=('qt5-base' 'jasper' 'libmng' 'libwebp')
conflicts=('qt')
cd ${_pkgfqn}/qtimageformats
@@ -285,7 +286,7 @@
package_qt5-location() {
pkgdesc='Provides access to position, satellite and area monitoring classes'
- depends=('qt5-declarative')
+ depends=('qt5-declarative' 'geoclue')
cd ${_pkgfqn}/qtlocation
make INSTALL_ROOT=${pkgdir} install
@@ -442,7 +443,8 @@
package_qt5-webkit() {
pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
- depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base'
'libxslt' 'libxcomposite')
+ depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base'
'libxslt'
+ 'libxcomposite' 'libwebp')
optdepends=('gst-plugins-good: Webm codec support')
license=('GPL3' 'LGPL' 'FDL')
@@ -474,7 +476,7 @@
package_qt5-webchannel() {
pkgdesc='Provides access to QObject or QML objects from HTML clients for
seamless integration of Qt applications with HTML/JavaScript clients'
- depends=('qt5-base')
+ depends=('qt5-declarative')
cd ${_pkgfqn}/qtwebchannel
make INSTALL_ROOT=${pkgdir} install
Modified: use-python2.patch
===
--- use-python2.patch 2014-12-10 14:44:46 UTC (rev 227405)
+++ use-python2.patch 2014-12-10 16:54:25 UTC (rev 227406)
@@ -86,3 +86,43 @@
QMAKE_EXTRA_COMPILERS += retgen
# Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
+---
qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf.old
2014-12-10 16:47:11.582370503 +
qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf
2014-12-10 16:47:54.888779281 +
+@@ -15,8 +15,8 @@
+ }
+
+ defineTest(isPythonVersionSupported) {
+- python_major_version = $$system('python -c import sys; print
sys.version_info.major')
+- python_minor_version = $$system('python -c import sys; print
sys.version_info.minor')
++ python_major_version = $$system('python2 -c import sys; print
sys.version_info.major')
++ python_minor_version = $$system('python2 -c import sys; print
sys.version_info.minor')
+ greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6):
return(true)
+ warning(Using Python version
$$python_major_version.$$python_minor_version, but at least Python version
2.7 is required to build Qt WebEngine.)
+ return(false)
+@@ -69,7 +69,7 @@
+ input = $$1
+ for (file, input): \
+
