summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-08-26 12:00:09 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-08-26 12:00:09 +0100
commitf300354de9fe5d997850456a9e1f400193e6544f (patch)
tree402fd6a7727db790bf57f683894052e8791d389e /dev-qt
parent5c42677148c717eb9f4673237db807f74740b4e9 (diff)
gentoo auto-resync : 26:08:2024 - 12:00:09
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin11731 -> 11726 bytes
-rw-r--r--dev-qt/qtbase/Manifest9
-rw-r--r--dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch11
-rw-r--r--dev-qt/qtbase/qtbase-6.7.2-r4.ebuild (renamed from dev-qt/qtbase/qtbase-6.7.2-r3.ebuild)12
-rw-r--r--dev-qt/qtbase/qtbase-6.7.9999.ebuild11
-rw-r--r--dev-qt/qtbase/qtbase-6.8.9999.ebuild11
-rw-r--r--dev-qt/qtbase/qtbase-6.9999.ebuild11
7 files changed, 53 insertions, 12 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 0ae534ff2d33..f787af606eba 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 434fa8461bf7..dd2fd6aa6437 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,10 +5,11 @@ AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f75
AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291
AUX qtbase-6.7.2-float16-sse2.patch 1773 BLAKE2B c5b8bb7065db6186d81fb9267235327eba698c096d3e8051a2671d4655ada21ff063b297b00b8da098bb07b6a4abc9fb42fb7652e9de8aa759a349f8f1e58afc SHA512 af4b3c014ce86de25c02d7846ff0e354762513313d353971e6259da1dea20d6bc5ae7fb475469d29c3251d4e9e6446afda8b21086df50ba1108083d112bbfe73
AUX qtbase-6.7.2-gcc15-odr.patch 1162 BLAKE2B 640688d21fb70ce67378e0f8ac5ddac12b657a9802c0f2e524e6c210cf055955cda41300dd792949541e085d5e8a7ef19dcceaa36f6f73da651f89e88dab2ff4 SHA512 3dd8f26d02fb11075f97b3284e8c0ed1bcff5feafc6535026078dc5b38ed106ae144c18db1fff502b1cebb06761f55d995a8e31c8a6b701f08d21fdbb170bba1
+AUX qtbase-6.7.2-qcontiguouscache.patch 518 BLAKE2B f73e6e208894ae2887099d281a5359251c027284d0a02969c501a041c29c2b89a41094da3d0fea4e05148d5ed7f8f1ab25ff3ada07fa5b349c33efef90b55cdd SHA512 5be69a05a10905ce46031ad531001446d1a45d40a405c07a4bc17fe033475dd25846ea11c3fd3e7021a8e767eb4ad747509dc4e2196e14c672d60591ccd3a9f4
AUX qtbase-6.7.2-qwindowprivate-crash.patch 1337 BLAKE2B 1d8e354dc0db89744073bf555263129904592fb7c05b315713a21eae94b52a4b847dae906700cc5551fa21f828373ed044903dd10e8b86670b9296aa2009a3a3 SHA512 30e54110b9351aa2f7614a416b1fdf0d192a42386bdc5e75bd91fa2ecb98c48066b4e3858f97e00abbcbf2ddd5e90eab1594e285434d083215eaa34463dfa65b
DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b
-EBUILD qtbase-6.7.2-r3.ebuild 9934 BLAKE2B 98cd5a869867774c0a8f8b66fd5cf2d82ddb0618a310df16cfef41ccb86c7b2105a30edc15d0ac0b959f0f6f308b696fa52929163beb2d16459eb5c5771366ef SHA512 d8a3d9a276bcc0e8dc74f197dbc4a962a192d222de222f4b719fd1b89aa96d220786d20043d268ce5ee2aa96237415230192febf3af15306dee1fb3d93c61b61
-EBUILD qtbase-6.7.9999.ebuild 9792 BLAKE2B d72b01ed47ae38fe000328592b241a6a5ac08a48290d0c5daa541201a6fa5b830f9f4c59b7e65744cf580f0c31ed0d6889b4b7b1ba8d5024dfb69fdcf9c28c20 SHA512 90325744d31ed5ba8fe0152306e1407f828f00e06c6667fb2a917bcb905a1e391420e56e3074e9638e136f439e3aa2535de256c0484f1d70037830c789bbe43c
-EBUILD qtbase-6.8.9999.ebuild 10231 BLAKE2B 6582a481a27100606457b10a4040c39c6720fe8962ae4b85163adcc05f1052729560c71aab81be01c67754c55abaacc76ef0699c2e195ce29461a53728577979 SHA512 0e19345616ea933eee1650d5f5447ef6d852dd084082cd3e89b748d18e6cc1f8f38548c90eb08475b20468d52c96f743fa67a52f37fcd125483b134e9825f0a5
-EBUILD qtbase-6.9999.ebuild 10231 BLAKE2B 6582a481a27100606457b10a4040c39c6720fe8962ae4b85163adcc05f1052729560c71aab81be01c67754c55abaacc76ef0699c2e195ce29461a53728577979 SHA512 0e19345616ea933eee1650d5f5447ef6d852dd084082cd3e89b748d18e6cc1f8f38548c90eb08475b20468d52c96f743fa67a52f37fcd125483b134e9825f0a5
+EBUILD qtbase-6.7.2-r4.ebuild 10267 BLAKE2B 86090d41433852a3cca5e3e1c893d9c94d44b2e0783194779c9f501f8f32d5001fb2fb8786eac4991b3ae4ad3db97320fb245669d65e8213178432ae02570ff1 SHA512 28a2ea55c6a3e5a99d7baff53d787983af9b288b515fbf9f29d71b4ef885a6b363d35e2c970f919653ebb98472603a0d59ba54353096698e37ef1a4358cd5f5e
+EBUILD qtbase-6.7.9999.ebuild 10075 BLAKE2B c74285130fe7b7bec3b91582b3a2ebf2bb1a222cb3d01b526101f3f3768165880b49d16ca314bfd0b4cf99ae2b4f45007b815ea83f86bff150fa5ed750eb91cb SHA512 ec4f6746e77f8937b3c56153238d6af2c4b30b307ed531641a41e125858ceb45e72c8cc9349d25564d174a85436dc728e05ae66f36d56d465f226ed2468b7d81
+EBUILD qtbase-6.8.9999.ebuild 10514 BLAKE2B 17a9b06cf7541851b5af213f5871fc8edc874b41eb857b0d44c9f2c8e5eb2593c837f31454b86a7fcc4e6f2875c99a656f6e56ced109d4d8698e86510c426a69 SHA512 a28991a43dacd3429b0f552a959bd6853c523e76a96cc8371bc2cb92b814c0cd0673852c8a2f6569d04db77712da9e01592e85cb62e981ebe1ea8c43238d83db
+EBUILD qtbase-6.9999.ebuild 10514 BLAKE2B 17a9b06cf7541851b5af213f5871fc8edc874b41eb857b0d44c9f2c8e5eb2593c837f31454b86a7fcc4e6f2875c99a656f6e56ced109d4d8698e86510c426a69 SHA512 a28991a43dacd3429b0f552a959bd6853c523e76a96cc8371bc2cb92b814c0cd0673852c8a2f6569d04db77712da9e01592e85cb62e981ebe1ea8c43238d83db
MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
new file mode 100644
index 000000000000..d010222e09da
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
@@ -0,0 +1,11 @@
+diff '--color=auto' -ruN qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h my/src/corelib/tools/qcontiguouscache.h
+--- qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h 2024-05-07 01:06:44.000000000 +0200
++++ my/src/corelib/tools/qcontiguouscache.h 2024-08-25 18:20:13.958793266 +0200
+@@ -8,6 +8,7 @@
+ #include <QtCore/qassert.h>
+ #include <QtCore/qtclasshelpermacros.h>
+ #include <QtCore/qtcoreexports.h>
++#include <QtCore/qglobal.h>
+ #include <QtCore/qtypeinfo.h>
+
+ #include <climits>
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
index ff2eb438c253..e7e909a26a94 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -149,6 +149,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch
"${FILESDIR}"/${PN}-6.7.2-float16-sse2.patch
"${FILESDIR}"/${PN}-6.7.2-qwindowprivate-crash.patch
+ "${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch
)
src_prepare() {
@@ -169,6 +170,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index e4a66f7137f8..580f9e80474a 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -166,6 +166,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 9af015d9b088..1381d70d7a19 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -166,6 +166,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 9af015d9b088..1381d70d7a19 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
DESCRIPTION="Cross-platform application development framework"
@@ -99,7 +99,7 @@ COMMON_DEPEND="
cups? ( net-print/cups )
gtk? (
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
x11-libs/pango
)
)
@@ -166,6 +166,13 @@ src_prepare() {
}
src_configure() {
+ # The only component that uses gdk backends is the qgtk3 platformtheme plugin
+ if use gtk; then
+ # defang automagic dependencies
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ fi
+
local mycmakeargs=(
-DBUILD_WITH_PCH=OFF
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 07:45:44 +0000