diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | 0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch | 30 | ||||
| -rw-r--r-- | 0001-Fix-crash-in-QQuickPixmapReader-friends.patch | 112 | ||||
| -rw-r--r-- | 0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch | 33 | ||||
| -rw-r--r-- | PKGBUILD | 164 | ||||
| -rw-r--r-- | PKGBUILD.libs | 5 | ||||
| -rw-r--r-- | python_override_env | 1 |
7 files changed, 295 insertions, 63 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Jan 29 20:08:41 UTC 2017 +# Thu Apr 27 08:18:02 UTC 2017 pkgbase = qt-sdk-raspberry-pi pkgdesc = Qt SDK for the Raspberry Pi 1/2/3 - pkgver = 5.8.0 - pkgrel = 9 + pkgver = 5.9.0 + pkgrel = 3 url = http://chaos-reins.com/qpi/ install = qpi.install arch = x86_64 @@ -12,13 +12,14 @@ pkgbase = qt-sdk-raspberry-pi makedepends = git makedepends = pkgconfig makedepends = gcc - depends = qpi-toolchain + makedepends = gperf + makedepends = python optdepends = qtcreator: Integrated Raspberry Pi IDE development options = !strip source = git://github.com/sirspudd/mkspecs.git - source = https://download.qt.io/official_releases/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.7z + source = https://download.qt.io/development_releases/qt/5.9/5.9.0-beta2/single/qt-everywhere-opensource-src-5.9.0-beta2.tar.xz sha256sums = SKIP - sha256sums = 0efc79805cfeacc1bd2d10d8d6033e95b6c42cb5d68b1d5a1069b141006a2358 + sha256sums = b74c30cd80474880b4a0c2f0ed6efdbda16ebe72cdc26f2a85bb025a42d5d838 pkgname = qt-sdk-raspberry-pi diff --git a/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch b/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch new file mode 100644 index 000000000000..9cdfe7c8434d --- /dev/null +++ b/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch @@ -0,0 +1,30 @@ +From 458ce42f8177cc51f882fc408d8252d30ece660c Mon Sep 17 00:00:00 2001 +From: Donald Carr <sirspudd@gmail.com> +Date: Thu, 17 Nov 2016 15:04:43 -0800 +Subject: [PATCH] Fix brcm-egl build by correcting commit() usage + +Adjusted existing call to commit() in keeping with parallel changes in 5b807802 + +Change-Id: I31c17336efa9a79a5f6c1719702215db7239a97d +--- + src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp +index 4d56d66..9842f61 100644 +--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ++++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp +@@ -252,9 +252,7 @@ void QWaylandBrcmEglWindow::swapBuffers() + return; + + m_buffers[m_current]->bind(); +- attach(m_buffers[m_current], 0, 0); +- damage(QRect(QPoint(), geometry().size())); +- commit(); ++ commit(m_buffers[m_current], QRegion(0, 0, geometry().size().width(), geometry().size().height())); + + m_current = (m_current + 1) % m_count; + m_buffers[m_current]->waitForRelease(); +-- +2.10.2 + diff --git a/0001-Fix-crash-in-QQuickPixmapReader-friends.patch b/0001-Fix-crash-in-QQuickPixmapReader-friends.patch new file mode 100644 index 000000000000..90f1786ca7fe --- /dev/null +++ b/0001-Fix-crash-in-QQuickPixmapReader-friends.patch @@ -0,0 +1,112 @@ +From dd39b4a61543da1a6ad66d0288702b0ea053388b Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <albert.astals@canonical.com> +Date: Wed, 5 Apr 2017 11:57:45 +0200 +Subject: [PATCH] Fix crash in QQuickPixmapReader & friends + +In 9c50216c7bbbdb2bb51d4485286bf09e12fb5b62 I made the mistake +of not copying providerOptions inside QQuickPixmapReply as +is done for requestSize and url since i thought that i could +just use the data pointer to access it, but that's not possible since +data can get deleted in other thread so we need to copy +the value + +Change-Id: Ie1d466b210108e1af1f0c8d3c618d4516448b73d +--- + src/quick/util/qquickpixmapcache.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp +index be27cba98..86a17ffb9 100644 +--- a/src/quick/util/qquickpixmapcache.cpp ++++ b/src/quick/util/qquickpixmapcache.cpp +@@ -141,6 +141,7 @@ public: + QUrl url; + + bool loading; ++ QQuickImageProviderOptions providerOptions; + int redirectCount; + + class Event : public QEvent { +@@ -204,7 +205,7 @@ protected: + private: + friend class QQuickPixmapReaderThreadObject; + void processJobs(); +- void processJob(QQuickPixmapReply *, const QUrl &, const QString &, const QQuickImageProviderOptions &, QQuickImageProvider::ImageType, QQuickImageProvider *); ++ void processJob(QQuickPixmapReply *, const QUrl &, const QString &, QQuickImageProvider::ImageType, QQuickImageProvider *); + #if QT_CONFIG(qml_network) + void networkRequestDone(QNetworkReply *); + #endif +@@ -664,7 +665,7 @@ void QQuickPixmapReader::processJobs() + PIXMAP_PROFILE(pixmapStateChanged<QQuickProfiler::PixmapLoadingStarted>(url)); + + locker.unlock(); +- processJob(job, url, localFile, job->data->providerOptions, imageType, provider); ++ processJob(job, url, localFile, imageType, provider); + locker.relock(); + } + } +@@ -676,7 +677,6 @@ void QQuickPixmapReader::processJobs() + } + + void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &url, const QString &localFile, +- const QQuickImageProviderOptions &providerOptions, + QQuickImageProvider::ImageType imageType, QQuickImageProvider *provider) + { + // fetch +@@ -707,7 +707,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u + { + QImage image; + if (providerV2) { +- image = providerV2->requestImage(imageId(url), &readSize, runningJob->requestSize, providerOptions); ++ image = providerV2->requestImage(imageId(url), &readSize, runningJob->requestSize, runningJob->providerOptions); + } else { + image = provider->requestImage(imageId(url), &readSize, runningJob->requestSize); + } +@@ -728,7 +728,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u + { + QPixmap pixmap; + if (providerV2) { +- pixmap = providerV2->requestPixmap(imageId(url), &readSize, runningJob->requestSize, providerOptions); ++ pixmap = providerV2->requestPixmap(imageId(url), &readSize, runningJob->requestSize, runningJob->providerOptions); + } else { + pixmap = provider->requestPixmap(imageId(url), &readSize, runningJob->requestSize); + } +@@ -749,7 +749,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u + { + QQuickTextureFactory *t; + if (providerV2) { +- t = providerV2->requestTexture(imageId(url), &readSize, runningJob->requestSize, providerOptions); ++ t = providerV2->requestTexture(imageId(url), &readSize, runningJob->requestSize, runningJob->providerOptions); + } else { + t = provider->requestTexture(imageId(url), &readSize, runningJob->requestSize); + } +@@ -772,7 +772,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u + { + QQuickImageResponse *response; + if (providerV2) { +- response = providerV2->requestImageResponse(imageId(url), runningJob->requestSize, providerOptions); ++ response = providerV2->requestImageResponse(imageId(url), runningJob->requestSize, runningJob->providerOptions); + } else { + QQuickAsyncImageProvider *asyncProvider = static_cast<QQuickAsyncImageProvider*>(provider); + response = asyncProvider->requestImageResponse(imageId(url), runningJob->requestSize); +@@ -794,7 +794,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u + QFile f(localFile); + QSize readSize; + if (f.open(QIODevice::ReadOnly)) { +- if (!readImage(url, &f, &image, &errorStr, &readSize, runningJob->requestSize, providerOptions)) ++ if (!readImage(url, &f, &image, &errorStr, &readSize, runningJob->requestSize, runningJob->providerOptions)) + errorCode = QQuickPixmapReply::Loading; + } else { + errorStr = QQuickPixmap::tr("Cannot open: %1").arg(url.toString()); +@@ -1075,7 +1075,7 @@ void QQuickPixmap::purgeCache() + } + + QQuickPixmapReply::QQuickPixmapReply(QQuickPixmapData *d) +-: data(d), engineForReader(0), requestSize(d->requestSize), url(d->url), loading(false), redirectCount(0) ++: data(d), engineForReader(0), requestSize(d->requestSize), url(d->url), loading(false), providerOptions(d->providerOptions), redirectCount(0) + { + if (finishedIndex == -1) { + finishedIndex = QMetaMethod::fromSignal(&QQuickPixmapReply::finished).methodIndex(); +-- +2.12.1 + diff --git a/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch b/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch new file mode 100644 index 000000000000..4ffa2a9c6135 --- /dev/null +++ b/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch @@ -0,0 +1,33 @@ +From c33f6dffee64bdb77321d9d21dd6b520271593b0 Mon Sep 17 00:00:00 2001 +From: Donald Carr <sirspudd@gmail.com> +Date: Mon, 30 Jan 2017 23:49:28 -0800 +Subject: [PATCH] Revert "Fully qualify libEGL.so.1, libEGLESv2.so.2 libraries" + +This reverts commit d07fba149ddc6df4cbc99d31b1edb17331fcfe53. +--- + src/core/surface_factory_qt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp +index 97a30473..11d8f3b2 100644 +--- a/src/core/surface_factory_qt.cpp ++++ b/src/core/surface_factory_qt.cpp +@@ -74,13 +74,13 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) { + bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) + { + base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL); +- libEGLPath = libEGLPath.Append("libEGL.so.1"); ++ libEGLPath = libEGLPath.Append("libEGL.so"); + base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath); + if (!eglLibrary) + return false; + + base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2); +- libGLES2Path = libGLES2Path.Append("libGLESv2.so.2"); ++ libGLES2Path = libGLES2Path.Append("libGLESv2.so"); + base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path); + if (!gles2Library) + return false; +-- +2.11.0 + @@ -19,6 +19,8 @@ # Arch: build dependencies for the target device documented in PKGBUILD.libs # Fedora: systemd-devel mesa-*-devel wayland*-devel fontconfig-devel libinput-devel freetype-devel qt5-qtdeclarative-devel +pkgname="qt-sdk" + # Sanity check _building=true @@ -39,6 +41,18 @@ if [[ -z ${startdir} ]]; then _building=false; fi +if [[ -f minimal ]]; then + _skip_qtscript=true; + _skip_web_engine=true; + _skip_qt_widgets=true; + _debug=false; + pkgname="${pkgname}-minimal" +fi + +if [[ -f target_host ]]; then + _target_host=true; +fi + # Sanity check options if $_target_host; then _piver="" @@ -58,14 +72,14 @@ fi # vars _local_qt5_repo="/opt/dev/src/qtproject/qt5" -_pkgvermajmin="5.8" +_pkgvermajmin="5.9" _pkgverpatch=".0" -# -{alpha/beta/rc} -_dev_suffix="" -pkgrel=9 +# {alpha/beta/beta2/rc} +_dev_suffix="beta2" +pkgrel=3 pkgver="${_pkgvermajmin}${_pkgverpatch}" $_build_from_head && pkgver=6.6.6 -_pkgver=${pkgver}${_dev_suffix} +_pkgver=${pkgver}-${_dev_suffix} _release_type="development_releases" _mkspec="linux-rpi${_piver}-g++" _additional_configure_flags="" @@ -93,27 +107,27 @@ if $_target_host; then _use_mesa=true else depends=("qpi${_piver}-toolchain") - install=qpi.install - - rm $install - touch $install -fi - -if [[ -f testing ]]; then - _skip_web_engine=true; - _debug=false; fi if [[ -z "${_dev_suffix}" ]]; then _release_type="official_releases"; fi $_build_from_head && _patching=false && _shadow_build=true $_skip_web_engine && _additional_configure_flags="$_additional_configure_flags -skip qtwebengine" +$_skip_qt_script && _additional_configure_flags="$_additional_configure_flags -skip qtscript" +$_skip_qt_widgets && _additional_configure_flags="$_additional_configure_flags -no-widgets" $_static_build && _additional_configure_flags="$_additional_configure_flags -static" $_float && _additional_configure_flags="$_additional_configure_flags -qreal float" +if $_skip_web_engine; then + _additional_configure_flags="$_additional_configure_flags -no-icu" +fi + # PKGBUILD vars -pkgname="qt-sdk" +install=qpi.install + +rm $install +touch $install if [[ -n ${_piver} ]] || ! $_building; then pkgname="${pkgname}-raspberry-pi${_piver}" @@ -127,10 +141,15 @@ fi _libspkgname="${pkgname}-target-libs" _libsdebugpkgname="${pkgname}-target-libs-debug" _packaginguser=$(whoami) -_baseprefix=/opt -_installprefix=${_baseprefix}/${pkgname} _qt_package_name_prefix="qt-everywhere-opensource-src" _source_package_name=${_qt_package_name_prefix}-${_pkgver} +_baseprefix=/opt +_installprefix=${_baseprefix}/${pkgname} + +if $_target_host; then + _baseprefix=/usr + _installprefix=${_baseprefix} +fi pkgdesc="Qt SDK for the Raspberry Pi 1/2/3" arch=("x86_64") @@ -140,35 +159,46 @@ optdepends=('qtcreator: Integrated Raspberry Pi IDE development') makedepends=("git" "pkgconfig" "gcc" "gperf" "python") #_provider=http://qt.mirror.constant.com/ _provider=https://download.qt.io +_tmpfs_dir=/vortex + +_arch_specific_configure_options="\ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt \ + -archdatadir /usr/lib/qt \ + -datadir /usr/share/qt \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -no-rpath" # shouldn't be needed _core_configure_options="\ - -prefix ${_installprefix} \ -optimized-tools \ + -optimized-qmake \ -confirm-license \ -opensource \ -v \ -silent \ -release \ -fontconfig \ + -system-sqlite \ -system-freetype \ + -system-harfbuzz \ + -dbus-linked \ + -openssl-linked \ -pch \ -opengl es2 \ -egl \ -journald \ -make libs \ - -no-icu \ - -no-compile-examples \ - \ - -reduce-relocations \ - -reduce-exports \ -ltcg \ \ - -skip qtscript" + -reduce-relocations \ + -reduce-exports" if ! $_build_from_head; then - source=("git://github.com/sirspudd/mkspecs.git" "${_provider}/${_release_type}/qt/${_pkgvermajmin}/${_pkgver}/single/${_source_package_name}.7z") - sha256sums=("SKIP" "0efc79805cfeacc1bd2d10d8d6033e95b6c42cb5d68b1d5a1069b141006a2358") + source=("git://github.com/sirspudd/mkspecs.git" "${_provider}/${_release_type}/qt/${_pkgvermajmin}/${_pkgver}/single/${_source_package_name}.tar.xz") + sha256sums=("SKIP" "b74c30cd80474880b4a0c2f0ed6efdbda16ebe72cdc26f2a85bb025a42d5d838") fi options=('!strip') @@ -196,36 +226,52 @@ if ! $_target_host; then trap finish EXIT fi +adjust_bin_dir() { + if [[ -n ${_srcdir} ]]; then + _bindir="${_srcdir}" + else + # Probably repackaging: gonna have to make some assumptions + _bindir="${startdir}/src/${_source_package_name}" + fi + if $_shadow_build; then + _bindir="${_bindir}-build" + if [[ -d $_tmpfs_dir ]]; then + _bindir="${_tmpfs_dir}/${_bindir}" + fi + fi +} + +adjust_src_dir() { + if $_build_from_head; then + if [[ -z $_local_qt5_repo ]]; then echo "Need to set a repo dir to build from head"; exit 1; fi + _srcdir=$_local_qt5_repo + fi +} + build() { # Qt tries to do the right thing and stores these, breaking cross compilation unset LDFLAGS unset CFLAGS unset CXXFLAGS - source ${startdir}/python_override_env + export PATH=${startdir}:${PATH} + + _srcdir="${srcdir}/${_source_package_name}" + adjust_src_dir + adjust_bin_dir - local _srcdir="${srcdir}/${_source_package_name}" - local _bindir="${_srcdir}" local _basedir="${_srcdir}/qtbase" local _waylanddir="${_srcdir}/qtwayland" local _declarativedir="${_srcdir}/qtdeclarative" local _webenginedir="${_srcdir}/qtwebengine" local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}" - if $_shadow_build; then - _bindir="${_srcdir}-build" - rm -Rf ${_bindir} - mkdir -p ${_bindir} - fi - - if $_build_from_head; then - if [[ -z $_local_qt5_repo ]]; then echo "Need to set a repo dir to build from head"; exit 1; fi - _srcdir=$_local_qt5_repo - fi - cd ${_srcdir} -if ! $_target_host; then +if $_target_host; then + echo "INCLUDEPATH += /usr/include/openssl-1.0" >> ${_basedir}/src/network/network.pro + export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' +else # Get our mkspec rm -Rf $_mkspec_dir cp -r "${srcdir}/mkspecs/${_mkspec}" $_mkspec_dir @@ -241,16 +287,26 @@ if $_patching; then sed -i "s/error/warning/" ${_reducerelocations} || exit 1 cd ${_basedir} - patch -p1 < ${startdir}/0001-Check-lib64-as-well-as-lib.patch + #patch -p1 < ${startdir}/0001-Check-lib64-as-well-as-lib.patch + + cd ${_declarativedir} + #patch -p1 < ${startdir}/0001-Fix-crash-in-QQuickPixmapReader-friends.patch + + cd ${_waylanddir} + #patch -p1 < ${startdir}/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch + + cd ${_webenginedir} + # reverse patch which breaks dynamic loading of EGL/GLESvs with rpi proprietary drivers + patch -p1 < ${startdir}/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch # Work around our embarresing propensity to stomp on your own tailored build configuration - sed -i "s/O[23]/Os/" ${_basedir}/mkspecs/common/gcc-base.conf || exit 1 + # sed -i "s/O[23]/Os/" ${_basedir}/mkspecs/common/gcc-base.conf || exit 1 fi + rm -Rf ${_bindir} + mkdir -p ${_bindir} cd ${_bindir} - # skipping on principle: qtscript xcb - # Too bleeding big # -developer-build \ # -separate-debug-info \ @@ -264,11 +320,15 @@ fi if $_target_host; then local _configure_line="${_srcdir}/configure \ + -platform linux-clang \ + -make tools \ + ${_arch_specific_configure_options} \ ${_core_configure_options} \ ${_additional_configure_flags}" else local _configure_line="${_srcdir}/configure \ ${_core_configure_options} \ + -prefix ${_installprefix} \ -hostprefix ${_installprefix} \ -qtlibinfix "Pi${_piver}" \ -sysroot ${_sysroot} \ @@ -293,16 +353,9 @@ create_install_script() { } package() { - local _srcdir="${srcdir}/${_source_package_name}" - local _bindir="${_srcdir}" - -if $_shadow_build; then - _bindir="${_srcdir}-build" -fi + adjust_bin_dir -if ! $_target_host; then - create_install_script -fi + #create_install_script # cleanup rm -Rf ${pkgdir} @@ -327,6 +380,7 @@ fi local _profiledfn=qpi.sh local _installed_dir="${pkgdir}/${_sysroot}/${_baseprefix}" + if $_target_host; then _installed_dir="${pkgdir}/${_baseprefix}" fi @@ -373,7 +427,9 @@ fi runuser -l ${_packaginguser} -c 'makepkg -d -f' || exit 1 mv ${_libsdir}/${_libspkgname}-${pkgver}-${pkgrel}-any.pkg.tar.xz ${startdir} +if $_debug; then cd ${_libsdebugdir} runuser -l ${_packaginguser} -c 'makepkg -d -f' || exit 1 mv ${_libsdebugdir}/${_libsdebugpkgname}-${pkgver}-${pkgrel}-any.pkg.tar.xz ${startdir} +fi } diff --git a/PKGBUILD.libs b/PKGBUILD.libs index ed1e77bed023..dd923ca06d3a 100644 --- a/PKGBUILD.libs +++ b/PKGBUILD.libs @@ -1,7 +1,6 @@ # Maintainer: Donald Carr <sirspudd at gmail dot com> pkgname=libspkgname -provides=("qt5-declarative" "libspkgname") pkgver=libspkgver pkgrel=libspkgrel pkgdesc="Qt ${pkgver} libs cross compiled for the Raspberry Pi libspiver" @@ -13,7 +12,9 @@ source=() sha256sums=() options=('!strip') # qtwebengine flac snappy libsrtp jsoncpp libvpx speex opus libxml2 libwebp icu -depends=("ttf-croscore" "ttf-dejavu" "fontconfig" "wayland" "libxkbcommon" "gstreamer" "flac" "snappy" "libsrtp" "jsoncpp" "libvpx" "speex" "opus" "libxml2" "libwebp" "icu" "pulseaudio" "mtdev" "libinput") +depends=("ttf-croscore" "ttf-dejavu" "fontconfig" "wayland" "libxkbcommon" "gstreamer" "flac" "snappy" "libsrtp" "jsoncpp" "libvpx" "speex" "opus" "libxml2" "libwebp" "icu" "pulseaudio" "mtdev" "libinput" "pcre2") +provides=('qt5-3d' 'qt5-base' 'qt5-canvas3d' 'qt5-charts' 'qt5-connectivity' 'qt5-datavis3d' 'qt5-declarative' 'qt5-doc' 'qt5-examples' 'qt5-gamepad' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-location' 'qt5-multimedia' 'qt5-networkauth' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'qt5-script' 'qt5-scxml' 'qt5-sensors' 'qt5-serialbus' 'qt5-serialport' 'qt5-speech' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-virtualkeyboard' 'qt5-wayland' 'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-webkit-ng' 'qt5-websockets' 'qt5-webview' 'qt5-x11extras' 'qt5-xmlpatterns') +conflicts=('qt5-3d' 'qt5-base' 'qt5-canvas3d' 'qt5-charts' 'qt5-connectivity' 'qt5-datavis3d' 'qt5-declarative' 'qt5-doc' 'qt5-examples' 'qt5-gamepad' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-location' 'qt5-multimedia' 'qt5-networkauth' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'qt5-script' 'qt5-scxml' 'qt5-sensors' 'qt5-serialbus' 'qt5-serialport' 'qt5-speech' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-virtualkeyboard' 'qt5-wayland' 'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-webkit-ng' 'qt5-websockets' 'qt5-webview' 'qt5-x11extras' 'qt5-xmlpatterns') package() { mv ${startdir}/topkg/* ${pkgdir} diff --git a/python_override_env b/python_override_env deleted file mode 100644 index 42644cd019a2..000000000000 --- a/python_override_env +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PWD:$PATH |