diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
| commit | eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch) | |
| tree | 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /x11-misc/flow-pomodoro | |
| parent | a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff) | |
gentoo resync : 18.05.2019
Diffstat (limited to 'x11-misc/flow-pomodoro')
| -rw-r--r-- | x11-misc/flow-pomodoro/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch | 33 | ||||
| -rw-r--r-- | x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild (renamed from x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild) | 22 |
3 files changed, 48 insertions, 10 deletions
diff --git a/x11-misc/flow-pomodoro/Manifest b/x11-misc/flow-pomodoro/Manifest index 525d10dbada3..233f3fde096b 100644 --- a/x11-misc/flow-pomodoro/Manifest +++ b/x11-misc/flow-pomodoro/Manifest @@ -1,3 +1,4 @@ +AUX flow-pomodoro-1.2.0-qt-5.12.patch 1256 BLAKE2B b1316ed42f71418a2ce94421f8abb1f4ad560b6c39a686891e8ebc950c333e4bc9057a526fa7f408e2a75399e51daaa880cf22f266236b1def2b1d4a6a39b405 SHA512 ea42b0a7e66e3a1f6fd28f738fd0a1d78a41e506fa6e280e0f96162dd8890e669fa893c2e692f2ac259bcd9e6c9f8f6af68596895c48104ec733c2d7531c0b23 DIST flow-pomodoro-1.2.0.tar.gz 661888 BLAKE2B 776322a4c7bac37a7c5db7e3776838c8e7365745df87fcda557611055890d586b4fd1baa285d33bbf2bb1c77923c8d4751787dfe88c32dcd7d36827e8f9ff80f SHA512 1f347a679fe85e4751166c6aa8af3fda06c57844c0be7116266b2203d061abd1631cb994c0942f3fea9209064d9a49a230248ac101156132aa66a519438acccc -EBUILD flow-pomodoro-1.2.0.ebuild 605 BLAKE2B ee3c6fc21f159287afbcfcbbe8630886e5f306ca404e06f433f0922c7b2c800e5282e4038f7306fff8c92858db06b1483a096be35ea8a40af8d7cb5ef435c1de SHA512 89f98dc8e52be494f8122687fc82c8a11b63db79f8cd6f85b77e6f19bfe7282bb72f89d9d42198b7e85ee4a8103c5b8901c2343ffaec5342ddeefb6f1f8b78a1 +EBUILD flow-pomodoro-1.2.0-r1.ebuild 609 BLAKE2B f7b94f1b39e31f6239eb09440dd6a224bce9555ea57f52d0c9059f2be6b9fbbb957a475752480d5f7b29bb219c595ad8939c3ef0275316f9db293f72a1bc223b SHA512 707f974e6380e8a5e17359f2a91641342f0d09ceb5ceeeb9771927e4f93ca576348931fc4960e403bfaae0543cee62c74aa6fc7e46f3503de51902d3d6166aa5 MISC metadata.xml 255 BLAKE2B 5c67c73b2cd0f3e2c0018103d3b5102c4cabdc35284f694385460e3b6ee7e2a1b9697b1e43e09ef601a14990fae3fd011314f5260a50398c9d878adf2adfab4f SHA512 e132f603e6f94db054583ec2884465f2bc459af138fb1263e49f454166ea4bb750c2c4591e0ed8c385382dbfc5f246316c3b2995aebe094131103cac53046b3b diff --git a/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch new file mode 100644 index 000000000000..05ff231d9ea7 --- /dev/null +++ b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch @@ -0,0 +1,33 @@ +From 53dfa7dd18290225a62b1cfd10b5566ab90a3fe8 Mon Sep 17 00:00:00 2001 +From: Sergio Martins <iamsergio@gmail.com> +Date: Fri, 17 Aug 2018 16:22:04 +0100 +Subject: [PATCH] Fix popups with Qt 5.12 (QTBUG-70031) + +--- + src/qml/ChoicePopup.qml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/qml/ChoicePopup.qml b/src/qml/ChoicePopup.qml +index b66359d..6418b54 100644 +--- a/src/qml/ChoicePopup.qml ++++ b/src/qml/ChoicePopup.qml +@@ -92,7 +92,7 @@ Item { + radius: 2 * _controller.dpiFactor + + Column { +- id: column ++ id: column1 + anchors.fill: parent + + Rectangle { +@@ -136,8 +136,8 @@ Item { + model: root.model + Choice { + objectName: "taskMenuChoice" +- anchors.left: column.left +- anchors.right: column.right ++ anchors.left: column1.left ++ anchors.right: column1.right + topLineVisible: index > 0 + height: root.delegateHeight + fontAwesomeIconCode: iconRole diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild index daa67bf4bb7f..4285248dec78 100644 --- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild +++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils @@ -14,11 +14,15 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -DEPEND=">=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdbus-5.6:5 - >=dev-qt/qtdeclarative-5.6:5 - >=dev-qt/qtgui-5.6:5 - >=dev-qt/qtquickcontrols-5.6:5 - >=dev-qt/qtnetwork-5.6:5 - >=dev-qt/qtwidgets-5.6:5" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 +" RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-qt-5.12.patch" ) |