diff options
Diffstat (limited to 'dev-qt/qtgui')
| -rw-r--r-- | dev-qt/qtgui/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch | 18 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.15.11.ebuild | 4 |
3 files changed, 24 insertions, 1 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index d2e7cd1f609e..5281d98be707 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,8 +1,9 @@ +AUX qtgui-5.15.11-xkbcommon160.patch 1066 BLAKE2B 9c2e9a393bdd2369df6f7de8694ad0772de8f065fa6c7805497bbde7e96faeb9c69b6e0fe9d28be47cb2c75c72bbb095c359a943ea6abb2a2a39f90e5aaeea14 SHA512 31ae387710b6b4eee38b49a72c196549e688abb655922a26455998168b3b71cc47dff6a6014706aa3021443163ec1108f95cc7454cf6e779319d797d98993390 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15.10-gentoo-kde-3.tar.xz 747604 BLAKE2B 1d0f0be400504ef5e6f3c9cb5284ed85bf5bbf8b83f7d631fc06fb1622ef1b9750da9bda25b05e9426f64dabdad242181789785bbcdcf25c05abb931170e142a SHA512 6a65d717a9bfda7707c4b92bb42c9a7c4b587a31683cb911f6972bb0f149c83cdd827c25a6b0af791368f2c1b2471aab98618006d02b82ead10bd6bfe51f08f5 DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f EBUILD qtgui-5.15.10-r2.ebuild 3872 BLAKE2B 19970c0741aff635b84177f30b8e978f068ecf2902cc79c8f0ff8b7bb29a6666a3c8850041b0f6680b72c96a77a1fc5cf44ef71160aa5d9165452905c4147228 SHA512 282e91721fa55b15bcdd6d56bdccd59ae740893dc0601c6dbd368ffc2347ca071e82879aeba48e0fd4720fba6208f532d5001ce16f876e3c5ace875871f7efa6 -EBUILD qtgui-5.15.11.ebuild 3878 BLAKE2B ab7c84517d3c44566cfd9b9d8c3b6dda5f62087bb0da76529d3967f565872c32c9c6b6e67920f63c5fe8196f9687f41f01d0bd04e9b60e21c0a4ee0e7cc61cfa SHA512 80d687792e7b3763b088fadf4f59bd713590de67cf53b0dfaf7c5780bbba185e0bb22c5c32af61e3ea7e6c558235078c27c415d3c4f535c42db38c4e9b54d9d2 +EBUILD qtgui-5.15.11.ebuild 3939 BLAKE2B 8f2c8a3730675763164c4322f370d491d276019166386bf1c160f8e7592d518fbc8566f846a4894409cfa94f9e16623008c225f9f014b2217e593cd62b9fb0d0 SHA512 9bf1f0daac35592388d9a8c9c733b698a8656fd145d0ddb3406b927ab0618d3cb40f62c4ed239518eee36dd23c3124edbff45a756feef5e3910116ca16b761ea MISC metadata.xml 1332 BLAKE2B 9e3b90622029fb3c2345b61a3d5d5c55c9e364f2872cdcbd74d34c2af41a692e8e6e03396799c0ce2ec74d3b0dc3e86e755502217f25a18d6e822389ec8481b7 SHA512 1eb4740fcbdceed313e24e019424d08239539eede918f41964ab092d85ec9f78665a40922f92467eceaf1ac7632c0b12c5368884f7128b8b119550c3c87b5e67 diff --git a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch new file mode 100644 index 000000000000..92e907067fe6 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch @@ -0,0 +1,18 @@ +These were removed in libxkbcommon-1.6.0[1] and were apparently +unnecesary. Usage results in build failure. + +Just a quick fix while waiting for what [2] comes up with. + +[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70 +[2] https://bugreports.qt.io/browse/QTBUG-117950 +--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp ++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +@@ -276,4 +276,4 @@ +- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, +- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, +- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, +- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, ++ Xkb2Qt<0xfe90, Qt::Key_Dead_Lowline>, ++ Xkb2Qt<0xfe91, Qt::Key_Dead_Aboveverticalline>, ++ Xkb2Qt<0xfe92, Qt::Key_Dead_Belowverticalline>, ++ Xkb2Qt<0xfe93, Qt::Key_Dead_Longsolidusoverlay>, diff --git a/dev-qt/qtgui/qtgui-5.15.11.ebuild b/dev-qt/qtgui/qtgui-5.15.11.ebuild index cf55be1bdcd7..e8ef3f8a6ff9 100644 --- a/dev-qt/qtgui/qtgui-5.15.11.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.11.ebuild @@ -127,6 +127,10 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) +PATCHES=( + "${FILESDIR}"/${PN}-5.15.11-xkbcommon160.patch +) + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |