diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-10-24 11:47:53 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-10-24 12:25:42 +0200 |
| commit | 2831b01de82a3cde65b5b96f2f73065cf6d691e5 (patch) | |
| tree | 41fdf509b078f6aa8ce2b9efdf977d6f3c1acebb /dev-qt | |
| parent | dev-qt/qtcore: Bump to QT5_KDEPATCHSET_REV=2 (diff) | |
| download | gentoo-2831b01de82a3cde65b5b96f2f73065cf6d691e5.tar.gz gentoo-2831b01de82a3cde65b5b96f2f73065cf6d691e5.tar.bz2 gentoo-2831b01de82a3cde65b5b96f2f73065cf6d691e5.zip | |
dev-qt/qtgui: (Non-)bump to QT5_KDEPATCHSET_REV=2
...just switching to upstream's patch.
Liang Qi (1):
xkb: fix build with libxkbcommon 1.6.0 and later
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtgui/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch | 22 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.15.11.ebuild | 6 |
3 files changed, 2 insertions, 28 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 12336c23f79a..53214af79b01 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,5 +1,5 @@ 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-5.15.11-gentoo-kde-2.tar.xz 327120 BLAKE2B 38cf4106d620b28ab690de52dce7bbcf2da9de1009a0b126a68e19949013458ba788edd92a050410f9e33522be77e09eeeb95d4d696c3e482156dce5e120ee70 SHA512 235fb3baf660c551415300b5cc8a0d6091c7edd0a6f2c28bfb4e14bc63ada50203c0108cd8bd84b931860ee196cf83f68ec82a34509515c439ab989d80167d26 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 diff --git a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch deleted file mode 100644 index 0b5b3f964d57..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch +++ /dev/null @@ -1,22 +0,0 @@ -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. - -Update: will be fixed by [3], see also [4] - -[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70 -[2] https://bugreports.qt.io/browse/QTBUG-117950 -[3] https://invent.kde.org/qt/qt/qtbase/-/merge_requests/290 -[4] https://bugs.gentoo.org/915510 ---- 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 e8ef3f8a6ff9..65519037df3e 100644 --- a/dev-qt/qtgui/qtgui-5.15.11.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.11.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 + QT5_KDEPATCHSET_REV=2 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi @@ -127,10 +127,6 @@ 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 |