diff options
Diffstat (limited to 'dev-qt/qtdeclarative')
| -rw-r--r-- | dev-qt/qtdeclarative/Manifest | 5 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch | 84 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.7.3-r4.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild) | 1 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.8.0-r4.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild) | 1 |
4 files changed, 89 insertions, 2 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index e4633332420d..2db8ff170dc4 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,6 +1,7 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 AUX qtdeclarative-6.7.3-QTBUG-125053.patch 9583 BLAKE2B d7bdfe4d0a002e5d17f57604dbece3294596a76d03bc3c12a05622d2c95a16bde4bb128d19c63e4856270a875c5b6b866c9cfed9f30a346b441a2b81e7cdf2d1 SHA512 3811879d972ff5a0dbfca98c2c2931f50dd9906dc0ecf75f13e59eae71d9d27dfc9279ba9952a00be81cab83e8f8e42e798d9b43d7d3d6974a1676f4e8e401ea AUX qtdeclarative-6.7.3-QTBUG-129165.patch 5469 BLAKE2B fa4ce581df827b6725b6ab3135fb95fba492814d19d72b7b3be75b621a91f98d534152c5d80b7e1f21e9d877979a1b0e3a09d9eafa034e702d31996bc9624670 SHA512 605ecb6f7e3412b9c59b4e7579df87be1d19846fe1977682cb548732fe57993321015dabe5c5a87ebb15ae3cd394059a5d25d8b24f607093f5cf6343fbb7a4d7 +AUX qtdeclarative-6.7.3-QTBUG-129622.patch 2811 BLAKE2B 998cc23491e21cde656d6b8f92a1924652a26343c09eaed9a4ffe23e1782b95960a41d40b3a78a2bb41b4687bc491b46969db8f610f050c87eef09a670544d90 SHA512 5a4ded399bd58d23a4c6dcc6cb82b4ef2cd15d099dbfc742a916f40899166c43893eb8d19494b7fc58d11dbe17532bb3d647b6638f63e7ca354f650d67c1ca95 AUX qtdeclarative-6.8.0-QTBUG-129797.patch 1236 BLAKE2B edfa939f1438031c1a0b168dc493806d372f072d3b104975da56711c2ee2df402aba076ca7071576ed98a8bdb0668af2f7258c6d2a9f4ae68192473b1630fb39 SHA512 9cc280dccc08aa0bacd0d5ce34dbd1ab6cebf3bcc3cbe4854b03c1e12971619993845d9689b146cb89557c2dbe7b0a44870e6bb0cb1e1d6b4a89924a19b8be7d DIST qtdeclarative-5.15.14-gentoo-kde-1.tar.xz 26628 BLAKE2B 2b8302b96e5a8cae374da43dfaa5c5c7bf66ddfaa4fed055850fe7b39b995b1416268b94fb98fbc7074b6a0da47e8f9232751dba34b6021e095d7f9339fbfdd9 SHA512 3d4f3cc023e9da32105520bbe74847bb438ec3af85cf6203321400d451902071115ed3cc0c42e8cf995d0304f86cda11096223ad99b09a7dd95b3d83291a7b4a DIST qtdeclarative-everywhere-opensource-src-5.15.14.tar.xz 21595408 BLAKE2B c88388bd04636bc55cad17d97a9f3ee2d3bda6b585cad59d70106bd4e14bf37570bba5edc21627bc08852034adcb483b4c23d7f21ba523dc9e7b6c1f0386a994 SHA512 06c48938c5ab96c4a9e010fdf4a8fbf2b84b7669a486298044363048de3b7da01aa5d9284d1b08b563331887e326befb25566f9972f5143ca3cde47016394bbd @@ -9,8 +10,8 @@ DIST qtdeclarative-everywhere-src-6.7.3.tar.xz 35663596 BLAKE2B b9dc18b4a459c283 DIST qtdeclarative-everywhere-src-6.8.0.tar.xz 37029068 BLAKE2B 272c673eb06ad28be3f7a02d29323ba0ab1943e1dabeb8a8b7d8f4857473a488f22bce1ee60c1e56996cd6805cb30f77b80253a6504f86252c0d4188984ff4b2 SHA512 4f1e26511265e7085bfe097435e64b4daa0bb4a8287f56753a64437a5eb408c0679afa03e255d1949e382b59496eff600cb0638a9b8cc95278d67ad5cfb9d52b EBUILD qtdeclarative-5.15.14.ebuild 1537 BLAKE2B 9515ce8d7c01fa8119ecc030871048dece2da2051a67cc1bf61907db5fb1ceeee7ca52503068a9059c3822df398d90e2fec630529a2f88a1ca707ac1c9ef9250 SHA512 d684a28aeda630154eb7c1023dbf231baf5cde528788cb3fbaab35e24a349dd585519aff99d44c405fc6f5f92e9f52d49f30cbbb11c908cf5f42e8d7f5826543 EBUILD qtdeclarative-6.7.2.ebuild 1175 BLAKE2B 4f4d132a22d7987afcb7164ce83e35358b664cc70013f269af95e72b353cfc0103d3953fa308532dfbd00ce0f703c33e341e8a829c1a6bb62a09c07ec8cb7910 SHA512 48af79fdeff33c7d2da696364e1dc1a6694d9a6428a8aae11c5bd2ad2046f7a82bb780824da9a1aef1741322680534cd0d261a50acf235ae3b4fb0f8346d7dc7 -EBUILD qtdeclarative-6.7.3-r3.ebuild 1870 BLAKE2B 9c2431938a8b62d502f8103fc1ce7d5aaedd57dae5f8614c2d38a96335cd15ffdcea5fb1233ce6eae43c3ecb1d4ee83b513bf3761dff56f9713a13ac9418a247 SHA512 0e92a70bb98c721669a18a44f5409fb4a688fd3e32231f62367cb921a17f255c1c99acd0d8b90377e3043304a735ce2e87bee0504c73046f8472726ede835369 -EBUILD qtdeclarative-6.8.0-r3.ebuild 1870 BLAKE2B 7d9608eaf729dcc236a547c63d2b25b80ffaaf6214cbb975974aaa1c52531718167329f8ecd1b6ea2eae039d92579823bb76af2ca633e70a4bad2dc0729b5644 SHA512 f0bff7c884cfe0e599cf6c70a3959d85784bb1f0d57fdf0fd0a9f5fa53824fe4ff0ede0cec571cf2934e9f2a549c58a4b65234e723fce51c1a7c39917b16d7a9 +EBUILD qtdeclarative-6.7.3-r4.ebuild 1916 BLAKE2B 4c2578cd1a0130248bc2eb70b3027e7f33e8d5d037470aee466505ba539c7ca8b4862dd82a65a10a962abdb3ffe7e697b7df972c949e880602f89a8046f05966 SHA512 bb7045cd1086937d7ca70533b719994831769654bf4c2b614f69175104a3c6d5291c167384401d2e7d8fa29f7199954ba96692d65b7cc1dcd314d14ac67a9805 +EBUILD qtdeclarative-6.8.0-r4.ebuild 1916 BLAKE2B b27e73928187083f73de0fee1ff595ac8ac88b50de9b08bb7e5e121f206feeaf7910cb70be7c1b724ecd223954bc620893076bc7db4a5577e1bf9b86bc03e933 SHA512 8f3f4cf52b364d0e48ce52376bb79534eead1c4ac3c32a9f0872319a36c9922c50882bbbca4970071c5128f6c438aca89eadc30bf40f9d45bf4c655fbd96082e EBUILD qtdeclarative-6.8.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35 EBUILD qtdeclarative-6.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35 MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch new file mode 100644 index 000000000000..3e2bc70b5c2c --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch @@ -0,0 +1,84 @@ +https://bugreports.qt.io/browse/QTBUG-129622 +https://bugs.kde.org/show_bug.cgi?id=493854 +https://codereview.qt-project.org/c/qt/qtdeclarative/+/598853 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -2481,5 +2481,7 @@ + QQuickItemPrivate::get(item->item)->setCulled(true); + } +- if (!isClearing) ++ // If deleteLater was called, the item isn't long for this world and so we shouldn't store references to it. ++ // This can happen when a Repeater is used to populate items in SwipeView's ListView contentItem. ++ if (!isClearing && !QObjectPrivate::get(item->item)->deleteLaterCalled) + unrequestedItems.insert(item->item, model->indexOf(item->item, q)); + } else if (flags & QQmlInstanceModel::Destroyed) { +--- a/tests/auto/quickcontrols/controls/data/tst_swipeview.qml ++++ b/tests/auto/quickcontrols/controls/data/tst_swipeview.qml +@@ -5,4 +5,5 @@ + import QtTest + import QtQuick.Controls ++import QtQuick.Layouts + + TestCase { +@@ -761,3 +762,61 @@ + compare(item2.x, swipeListView.width) + } ++ ++ Component { ++ id: zeroSizeSwipeViewWithRepeatersComponent ++ ++ Item { ++ objectName: "rootItem" ++ anchors.fill: parent ++ ++ property alias swipeView: swipeView ++ property int d ++ ++ Timer { ++ interval: 2 ++ running: true ++ repeat: false ++ onTriggered: d = 2 ++ } ++ ++ SwipeView { ++ id: swipeView ++ contentItem.objectName: "swipeViewListView" ++ ++ Repeater { ++ objectName: "swipeViewContentItemRepeater" ++ model: [ ++ { ++ title: d ++ } ++ ] ++ ++ delegate: GridLayout { ++ objectName: "gridLayoutDelegate" ++ ++ Repeater { ++ id: repeater ++ objectName: "delegateRepeater" ++ model: d ++ delegate: Item { ++ objectName: "delegate" + index ++ ++ required property int index ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ // QTBUG-129622 ++ function test_zeroSizeSwipeViewWithRepeaters() { ++ let root = createTemporaryObject(zeroSizeSwipeViewWithRepeatersComponent, testCase) ++ verify(root) ++ ++ let swipeView = root.swipeView ++ tryCompare(root, "d", 2) ++ // Shouldn't crash when the model is changed. ++ } + } diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r4.ebuild index cc732b58ef89..a72aaa25a4e9 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r4.ebuild @@ -37,6 +37,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch "${FILESDIR}"/${PN}-6.7.3-QTBUG-129165.patch + "${FILESDIR}"/${PN}-6.7.3-QTBUG-129622.patch ) src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r4.ebuild index 77bfae60bd88..84d5899b33b6 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r4.ebuild @@ -36,6 +36,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch + "${FILESDIR}"/${PN}-6.7.3-QTBUG-129622.patch "${FILESDIR}"/${PN}-6.8.0-QTBUG-129797.patch ) |