summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin11386 -> 11389 bytes
-rw-r--r--dev-qt/qtbase/Manifest9
-rw-r--r--dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch18
-rw-r--r--dev-qt/qtbase/qtbase-6.5.3.ebuild1
-rw-r--r--dev-qt/qtbase/qtbase-6.6.0_rc.ebuild1
-rw-r--r--dev-qt/qtbase/qtbase-6.6.9999.ebuild1
-rw-r--r--dev-qt/qtbase/qtbase-6.9999.ebuild1
-rw-r--r--dev-qt/qtgui/Manifest3
-rw-r--r--dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch18
-rw-r--r--dev-qt/qtgui/qtgui-5.15.11.ebuild4
10 files changed, 51 insertions, 5 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index d7fd3ca668c2..0fa80658d7cf 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 6c270cea54b0..485d445da2bf 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -3,12 +3,13 @@ AUX qtbase-6.5.2-hppa-forkfd-grow-stack.patch 1001 BLAKE2B 21fabd37d44ad496d2e11
AUX qtbase-6.5.2-no-glx.patch 1298 BLAKE2B 83b399a1faa1bb976bc00b7d0b9721b2a2bc64f11f345d3ddb6019481c16f503a6faf1789c56fdbbb7a4d0bde5ffd9c1620dc677189d0e40008cef0ab02e732e SHA512 fcdd0ad2f0f6dadfea8ca00fbb93c18426eb4e12a8374f9f6d0c9fb2f4aa3bb9494e1c5eb0408066dbc4f9b5075c56f8b99a6336b9d66ac5558e99f38357f9ca
AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba
+AUX qtbase-6.5.3-xkbcommon160.patch 1038 BLAKE2B c6e499343728b78d33f52cefae44c1ef7fc67df0b5e9184920d8a4268c0fd73456ad9fedccf2380c2e22a9347f1da7c1279d3a22125e6f2b389b0cabe73f85c4 SHA512 09f795ad8342e2f7dd13f63ab98b9945e3e1b80e2917b1ef21845cc488bf823598693d53257e7b15ca3b3ee95dce2bfc60dced2e1b8f765337e4db86be73ac8e
DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
DIST qtbase-everywhere-src-6.5.3.tar.xz 47142456 BLAKE2B 5b4c774b7199563dc7f2aebf9b2b531d851ee49bc038212f4970eeb43a17c364710432708f82a518eee6692ab123d78b642c234d9548d5b553f689a43aa05ee6 SHA512 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9
DIST qtbase-everywhere-src-6.6.0-rc.tar.xz 48346588 BLAKE2B 947e4a6b5c2e54ec1b9557691fc49d0f9784c6fc7c5823295866ddf3f6bb37f82b15d2d46e46f5b990d820148f9279e31d120b80523005b13a1febddcb4e7da7 SHA512 3e4b9ae3f1a18f0763bd956e3a5713e63509a477dfe67428e8081a010c121747a5b93980b12daf7f83a65e0ccb5776bedd1244dd9d8df421e6324c1494889a05
EBUILD qtbase-6.5.2-r2.ebuild 9502 BLAKE2B 435ecf5b830e8f85bba02d5ff50421f04607fca37666495af2f17c441ca969211d1fbf93c265b8614ac7c25a9252d3dbcda9289abbd8a918dbb6b4e667db1677 SHA512 59e10a036d50e07a6fc40e01de85f72998125dcad1c5f2e628eba97dea76e50c96bfe2612fc7b787e3601757b5c90d51a60c71bdbcc29073b0d31479af4e6931
-EBUILD qtbase-6.5.3.ebuild 9424 BLAKE2B 84ccfc8826917c3ef1bdb6f74451e7bd21bc7badedc3880bfae0a2f3db0df24d88ea44a2c67feb91aa50b213d63f1280f19c6c033b2e84ccce3b10f85b397a5d SHA512 f7e0838957efb218b6901bd0a6958fc0c86bea103671721467abf168bb99a5dfa41995e7ef8e5746d283fbd5571ebae50ded38d71e1fd2d618cf74e3d95ec80f
-EBUILD qtbase-6.6.0_rc.ebuild 9444 BLAKE2B c2f76f0b88d1d20569628330f0fb1f6e7d27381786c718556784a52e6c9d72ddaabebf2ac65a7852f78e51a401748c4402e94a70eb0ff4c054d5ac0290598d12 SHA512 655161ba49eca5c3db67d9f074251145242bd5e420ea4d489cf7a04eddbc372de10616ffce80fcbb707ccfe4295779cffa94fb1ed13d9ae49760eda24374d6af
-EBUILD qtbase-6.6.9999.ebuild 9444 BLAKE2B c2f76f0b88d1d20569628330f0fb1f6e7d27381786c718556784a52e6c9d72ddaabebf2ac65a7852f78e51a401748c4402e94a70eb0ff4c054d5ac0290598d12 SHA512 655161ba49eca5c3db67d9f074251145242bd5e420ea4d489cf7a04eddbc372de10616ffce80fcbb707ccfe4295779cffa94fb1ed13d9ae49760eda24374d6af
-EBUILD qtbase-6.9999.ebuild 9518 BLAKE2B 6b76f3b57ff00a17a0eac2722371179ea14ad49f623354ed83746de858dd485a14515da8a0798ac4abdbd04eb2cfd8b1f8cd506e7cec094120f7ab33f70e6821 SHA512 06916da2f2645ca7985ddec734a2969aff06c5e47e30d401744fc86f20fd9a3412ebc6c5f4c5054a8c0946f6b784293d6839b5c19f7aef5d0fae889545c0db96
+EBUILD qtbase-6.5.3.ebuild 9470 BLAKE2B dcbd79d4c69be63d3cf66116549e50462c5a7baf01f3d564abdac0277769d8182d0b0d7e96b23c9c2ea937c81ca229a9b71f38d2de03ee1d1dbab5f750d52524 SHA512 716b2372e573727959d62373afbb7cd036c411d35967ff1713974031683209465f76cbaff3c2e7e7f80f1dc6277e781a0d88075b1303933a1d7c69abd9eedfb2
+EBUILD qtbase-6.6.0_rc.ebuild 9490 BLAKE2B 04d72d97ce56523c5ec007364bb59f9cc2a74f288f711d46b48b0e6c434ccecc858d13f7f4e1c5a0e3ed357c2e7d56b7588fa8507f5d3e960694aba24603b7c9 SHA512 8c246e4a88a434bfc842e4bed5d21b32b0a9aa4bd05e862189e6004d72975565c25866f76a18cfd0cc67e8082bb4b240f41ef291055339941ce0ae4407e75e1c
+EBUILD qtbase-6.6.9999.ebuild 9490 BLAKE2B 04d72d97ce56523c5ec007364bb59f9cc2a74f288f711d46b48b0e6c434ccecc858d13f7f4e1c5a0e3ed357c2e7d56b7588fa8507f5d3e960694aba24603b7c9 SHA512 8c246e4a88a434bfc842e4bed5d21b32b0a9aa4bd05e862189e6004d72975565c25866f76a18cfd0cc67e8082bb4b240f41ef291055339941ce0ae4407e75e1c
+EBUILD qtbase-6.9999.ebuild 9564 BLAKE2B acba2a0879bd29aa48dc8eecdf22e9e0f8679a2f3f6ef79bd9e0da4633557fce688a6fc272afab67e213014419fab47fef773cc869a2405ee7483e28570b2b65 SHA512 e40d0b6a13165a23dce880b9cd1768f66efa24acbd42dd125db794a6db84a22a1c1c8e3e12f29dfe9b75b8350e34c616cd23ddc7df4d1546b5f34dc67b13581b
MISC metadata.xml 1724 BLAKE2B 958a60a43b45b9d79102633d818a57e697dc8180d1ffdea15ae064b659d19d099e6edf0c0583614cea1451375fec5163b8140efa530e9295a8a33e2165da1f01 SHA512 a11523095d1d6bb8443c8198315098c2c3b2e3e17cabcfd7260e2322c8542825605cc8e71eb8144c6dfe469abb2ed834d04350e80ccd9d6ee544a15099bde8b8
diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch b/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch
new file mode 100644
index 000000000000..bc0e0793d7e9
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.3-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/gui/platform/unix/qxkbcommon.cpp
++++ b/src/gui/platform/unix/qxkbcommon.cpp
+@@ -242,4 +242,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/qtbase/qtbase-6.5.3.ebuild b/dev-qt/qtbase/qtbase-6.5.3.ebuild
index ff54e3219118..ce35f875214a 100644
--- a/dev-qt/qtbase/qtbase-6.5.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3.ebuild
@@ -136,6 +136,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+ "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild b/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild
index 209286c5d22d..25600cdad0be 100644
--- a/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild
@@ -136,6 +136,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+ "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 209286c5d22d..25600cdad0be 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -136,6 +136,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+ "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index bda0eaf0fd5c..0f189b78263b 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -137,6 +137,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+ "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
)
src_prepare() {
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 11:19:16 +0000