diff options
Diffstat (limited to 'dev-qt/qtdeclarative')
5 files changed, 2 insertions, 95 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 74898764f024..802589576f11 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,9 +1,5 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 -AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f -AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d -DIST qtdeclarative-5.15.2-29ee9a0e.tar.gz 24346706 BLAKE2B 5bd518a61aaa24672164fad41599ca6cc4ed7e8ab3eac56d8a38d9b0d892f92ddc3e4f7a6a66c16043d1eb29578602a91824413283fdcf971bbfaf95e0a59af0 SHA512 7964cf301f8cceb01cc4eaa7b3a5bc1e882633f61abcd250fee6dc27110baa4e32622d0b24e2cdc3874b0518c79f6f42fa1ac434535270af3b35081e663d8cd4 DIST qtdeclarative-5.15.3-gentoo-kde-2.tar.xz 17340 BLAKE2B 5f5efae23cf6c1c3abf8d0d0594ac66ae3bf116e744626f7218d0a66e5f5598861a25e8b2d8aaec7c3dd444fa4e91de313b67b53ec624965f08472587fee460d SHA512 76d5bd8aa9f2b2e766ad4dd63a3c03b2e52da90b91cf11c777f3efd6fb3110100b358f05562639b60031bb49622fd1f4b135b6903a53493664bcbf1a0b6d69d7 DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897aa6959f34bc6e5a3be04d9f56d13315e6681daadb935f0e2422f551865c8c6d49b0c15c5358439155d3215c1c139fe60acf0b4a7e766e8e1ff4ce85a0449e SHA512 c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597 -EBUILD qtdeclarative-5.15.2-r15.ebuild 1424 BLAKE2B 57a37412c09412e489c5ff9953e9c20044eeec2f8b1f9749206d194d7af903467d897ad8decbddc8f5d0f3716eb8f9b790e06dc5718df1bb747804e8879402df SHA512 3c32ec37e76dc3f4a198966e50d050f805594201dd4f05c761f8c3ca85c04ca9bbfe4177feb22fd84139d20b3521266ebb772738b86ddcb3b61cc6327f02ba55 -EBUILD qtdeclarative-5.15.3-r1.ebuild 1490 BLAKE2B ea4c02de18b06e2ba54a3535a6c85fea441783db13782fae2acf9cbd340da7210e255371ba1db01609027adf10b36be429db68c10770723110ba35e1549ad1b9 SHA512 bc8158daf3e94c1633446aca60e953caf6d2b5bff9cade2ad2973ec66c60de35b4d78ac6fd1d9f1837d2c73b98ded4f9e39ede7fe6892dcc3ce6d9593b1c0efa +EBUILD qtdeclarative-5.15.3-r1.ebuild 1488 BLAKE2B 52a5802c5f3c9726eeb4d05e128cd11ea3db267e0e9da243987558a8fc383f3d2f79c19fea9e27806363fe6b6ac92fa2a1a5e0bdd4909af50a4af6ce20a72517 SHA512 7cedad42cfa25b749d4f2a6058f8ef1923055939fa86f85d72232d61c4f23e1e7a07ab65be4c87f31ff1dbba98d372afae410507f5543497e1e2425415492eda MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch deleted file mode 100644 index a619f3db833c..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/qml/qml.pro b/src/qml/qml.pro -index 7d5a92a..01f3b79 100644 ---- a/src/qml/qml.pro -+++ b/src/qml/qml.pro -@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - - # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. - gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks -+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic - - DEFINES += QT_NO_FOREACH - diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch deleted file mode 100644 index 7799ef71b7e4..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h -index 4b08194..224ddb1 100644 ---- a/src/qml/jsruntime/qv4global_p.h -+++ b/src/qml/jsruntime/qv4global_p.h -@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } - # undef V4_ENABLE_JIT - #endif - #endif - -+// Gentoo note: disable the JIT due to USE="-jit" -+#ifdef V4_ENABLE_JIT -+#undef V4_ENABLE_JIT -+#endif -+ - // Do certain things depending on whether the JIT is enabled or disabled - - #ifdef V4_ENABLE_JIT - #define ENABLE_YARR_JIT 1 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild deleted file mode 100644 index 3cb34cce0fa0..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2009-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=29ee9a0e9f02ec74153a2cf09dc63722bc273544 -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - =dev-qt/qtcore-${QT5_PV}* - =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=] - =dev-qt/qtnetwork-${QT5_PV}* - =dev-qt/qttest-${QT5_PV}* - media-libs/libglvnd - localstorage? ( =dev-qt/qtsql-${QT5_PV}* ) - widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] ) -" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 - "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689 -) - -src_prepare() { - use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" ) - - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - -- - -qml-debug - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild index eef88f274ee4..f632c6fb5e08 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild @@ -10,7 +10,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="gles2-only +jit localstorage vulkan +widgets" |