diff --git a/app-emulation/fs-uae-launcher/fs_uae_launcher-2.8.3.recipe b/app-emulation/fs-uae-launcher/fs_uae_launcher-3.0.5.recipe similarity index 94% rename from app-emulation/fs-uae-launcher/fs_uae_launcher-2.8.3.recipe rename to app-emulation/fs-uae-launcher/fs_uae_launcher-3.0.5.recipe index e7ba22ab6..8f599f02b 100644 --- a/app-emulation/fs-uae-launcher/fs_uae_launcher-2.8.3.recipe +++ b/app-emulation/fs-uae-launcher/fs_uae_launcher-3.0.5.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2011-2017 Frode Solheim" LICENSE="GNU GPL v2" REVISION="4" SOURCE_URI="https://fs-uae.net/stable/$portVersion/fs-uae-launcher-$portVersion.tar.gz" -CHECKSUM_SHA256="8ce764031013516daab76e996eff9e9fdead6c0f00b4e497fc927f7719d8a233" +CHECKSUM_SHA256="27797a04b9fc0be2805ae992c2950ff6228383fa153eccefbdebfc6789ca76b6" SOURCE_DIR="fs-uae-launcher-$portVersion" PATCHES="fs_uae_launcher-$portVersion.patchset" ADDITIONAL_FILES="fs-uae-launcher.rdef.in" @@ -26,6 +26,7 @@ REQUIRES=" fs_uae$secondaryArchSuffix pip_python38$secondaryArchSuffix pyqt5_python38$secondaryArchSuffix + requests_python38$secondaryArchSuffix " BUILD_REQUIRES=" diff --git a/app-emulation/fs-uae-launcher/patches/fs_uae_launcher-2.8.3.patchset b/app-emulation/fs-uae-launcher/patches/fs_uae_launcher-3.0.5.patchset similarity index 100% rename from app-emulation/fs-uae-launcher/patches/fs_uae_launcher-2.8.3.patchset rename to app-emulation/fs-uae-launcher/patches/fs_uae_launcher-3.0.5.patchset diff --git a/app-emulation/fs-uae/fs_uae-2.8.3.recipe b/app-emulation/fs-uae/fs_uae-3.0.5.recipe similarity index 96% rename from app-emulation/fs-uae/fs_uae-2.8.3.recipe rename to app-emulation/fs-uae/fs_uae-3.0.5.recipe index 32a98d407..82ec07c7f 100644 --- a/app-emulation/fs-uae/fs_uae-2.8.3.recipe +++ b/app-emulation/fs-uae/fs_uae-3.0.5.recipe @@ -37,7 +37,7 @@ COPYRIGHT="2011-2017 Frode Solheim" LICENSE="GNU GPL v2" REVISION="2" SOURCE_URI="https://fs-uae.net/stable/${portVersion}/fs-uae-${portVersion}.tar.gz" -CHECKSUM_SHA256="e2d5414d07c8bd5b740716471183bc5516bec0ae2989449c3026374dc4b86292" +CHECKSUM_SHA256="f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3" SOURCE_DIR="fs-uae-$portVersion" PATCHES="fs_uae-$portVersion.patchset" @@ -93,6 +93,8 @@ BUILD_PREREQUIRES=" BUILD() { export CPPFLAGS="-D_BSD_SOURCE" + export CXXFLAGS="-fPIC" + export CFLAGS="-fPIC" export LDFLAGS="-lnetwork" runConfigure ./configure --disable-bsdsocket --disable-netplay --with-glew make $jobArgs diff --git a/app-emulation/fs-uae/patches/fs_uae-2.8.3.patchset b/app-emulation/fs-uae/patches/fs_uae-3.0.5.patchset similarity index 100% rename from app-emulation/fs-uae/patches/fs_uae-2.8.3.patchset rename to app-emulation/fs-uae/patches/fs_uae-3.0.5.patchset diff --git a/dev-python/pyqt/pyqt5-5.15.2.recipe b/dev-python/pyqt/pyqt5-5.15.2.recipe index ce983af95..b8ecfd7be 100644 --- a/dev-python/pyqt/pyqt5-5.15.2.recipe +++ b/dev-python/pyqt/pyqt5-5.15.2.recipe @@ -5,7 +5,7 @@ simplicity of Python." HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" COPYRIGHT="2015-2019 Riverbank Computing Limited" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$portVersion.tar.gz" CHECKSUM_SHA256="372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc" SOURCE_DIR="PyQt5-$portVersion" @@ -40,7 +40,7 @@ REQUIRES=" lib:libQt5MultimediaWidgets$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix lib:libQt5Nfc$secondaryArchSuffix -# lib:libQt5OpenGL$secondaryArchSuffix + lib:libQt5OpenGL$secondaryArchSuffix lib:libQt5PrintSupport$secondaryArchSuffix lib:libQt5Positioning$secondaryArchSuffix lib:libQt5Qml$secondaryArchSuffix @@ -58,7 +58,7 @@ REQUIRES=" lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix lib:libQt5XmlPatterns$secondaryArchSuffix -# lib:libGL${secondaryArchSuffix} + lib:libGL${secondaryArchSuffix} " REPLACES=" pyqt$secondaryArchSuffix @@ -102,7 +102,7 @@ BUILD_REQUIRES=" devel:libQt5MultimediaWidgets$secondaryArchSuffix >= $qtVersion devel:libQt5Network$secondaryArchSuffix >= $qtVersion devel:libQt5Nfc$secondaryArchSuffix >= $qtVersion -# devel:libQt5OpenGL$secondaryArchSuffix >= $qtVersion + devel:libQt5OpenGL$secondaryArchSuffix >= $qtVersion devel:libQt5PrintSupport$secondaryArchSuffix >= $qtVersion devel:libQt5Positioning$secondaryArchSuffix >= $qtVersion devel:libQt5Qml$secondaryArchSuffix >= $qtVersion @@ -120,7 +120,7 @@ BUILD_REQUIRES=" devel:libQt5Widgets$secondaryArchSuffix >= $qtVersion devel:libQt5Xml$secondaryArchSuffix >= $qtVersion devel:libQt5XmlPatterns$secondaryArchSuffix >= $qtVersion -# devel:libGL${secondaryArchSuffix} + devel:libGL${secondaryArchSuffix} " BUILD_PREREQUIRES=" cmd:python$PYTHON3_VERSION @@ -157,11 +157,8 @@ BUILD() --no-qml-plugin \ --no-make \ --target-dir=$installLocation \ - --api-dir=$dataDir/sip/PyQt5 \ - --disable=QtOpenGL \ - --disable=_QOpenGLFunctions_2_0 \ - --disable=_QOpenGLFunctions_2_1 \ - --disable=_QOpenGLFunctions_4_1_Core + --api-dir=$dataDir/sip/PyQt5 + cd build make $jobArgs } @@ -182,7 +179,7 @@ INSTALL() mkdir -p $installLocation cd build make install INSTALL_ROOT="$prefix" - + $python -m compileall -d / $prefix/lib/python$pythonVersion $python -O -m compileall -d / $prefix/lib/python$pythonVersion