summaryrefslogtreecommitdiff
path: root/dev-qt/qtdeclarative
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-22 14:08:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-22 14:08:05 +0000
commit93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
treeb9791a06ab3284e27b568412c59316c66240c682 /dev-qt/qtdeclarative
parent2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
gentoo resync : 22.12.2021
Diffstat (limited to 'dev-qt/qtdeclarative')
-rw-r--r--dev-qt/qtdeclarative/Manifest6
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild59
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild)2
3 files changed, 3 insertions, 64 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cd659eb6d08e..6e80cc0c893e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,8 +1,6 @@
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-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
-DIST qtdeclarative-5.15.2-55324650.tar.gz 24345065 BLAKE2B 0b5b3d25a93d742be7b4818692727293a710f105f48ff881d735f85871e8afb0d85461cd63b87294047d18b993b516dd8d0bac7faa83bca1faf6be3974cc3190 SHA512 bba93b2e1b35acd5bf961b527f0ade7aee5387e2ab9803f076e937f75bc12b8ed70560f02d2b13fcc94ea5294b7259323a60a15b14e59d6b8f39840dadb98d07
-EBUILD qtdeclarative-5.15.2-r12.ebuild 1424 BLAKE2B 7c22e422e9f11505017285947604fc663e05639b64f839cee4916a3687741233ed8601a922158b0919f2b9ab2836413fb58a2c7ff52a856f9cc963e26cba18f6 SHA512 e5d64299648370cd10502e6da09582cd259d7b82688bd4658eba9033a4dd50c34c984895591a56cfbf527865599459ddc9dd8cc87ed557433db3747434241916
-EBUILD qtdeclarative-5.15.2-r13.ebuild 1430 BLAKE2B 2036501727059cde0b8aa3970a19017a33ac55083427e5b31c14fa6486afc0dbf752a9b9e3680aede26bf9c67acf3dcad769ec762c9ee7491885d7c31eef71c1 SHA512 b03bf67aa336cecbbbf2f06d264237cdcb7e1a80d4d17e0f94691f44e09d318f6c0af859eb6d01dbbbf006f2d67aa08d4add7bccac0e52fceb00eaf04397a3e0
+DIST qtdeclarative-5.15.2-7024ac83.tar.gz 24346858 BLAKE2B 75a6a36fcf39bdf38292af1fe10b0f5bf3e72b39c8403fdbfed9c0c0a739919d93592157cf8d8f33523e8db52662f1f7d63209d173730b4c06045e9c1f0a4563 SHA512 8be70e68abd035a43ecfab7a1e23969428abf9425558875b8ee5e24a45a563afbef30d0852b495ab918b22118fa88877bb6d390cf90a928b02c96ee1e77f2331
+EBUILD qtdeclarative-5.15.2-r14.ebuild 1424 BLAKE2B 949605f78fa848d528c4a26d07a1340adaffc46eb0de78bc5fd9286add9de1f5cd07958cbc984935f2c5635e1fcc4db20dc2fc45fd8edc87f2e2a89173284102 SHA512 1bd65cad412b4d001f53decd670cc9e2437ea1980a5f7ac118e9950c24cd5eea825ab88679a59ad2cbd8c71e2543f93ae5d087967166b0994e276f74fda491d7
MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild
deleted file mode 100644
index 41b8c9b7609c..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r13.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=55324650f9e759a43dce927f823c9858574106c3
-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.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild
index 7987361ecfdd..788b279ea93b 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KDE_ORG_COMMIT=1c33a9d045897ce755a818ebff7ddecae97885d3
+KDE_ORG_COMMIT=7024ac8358f9e576dff013ce2452c1daa0d34506
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 qt5-build