diff options
Diffstat (limited to 'dev-qt/qtbase')
| -rw-r--r-- | dev-qt/qtbase/Manifest | 5 | ||||
| -rw-r--r-- | dev-qt/qtbase/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.6.9999.ebuild | 330 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.9999.ebuild | 7 |
4 files changed, 340 insertions, 5 deletions
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 170b68d08772..c0999b8e86da 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -3,5 +3,6 @@ AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d1 DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20 EBUILD qtbase-6.5.2-r2.ebuild 8995 BLAKE2B 72188bb57e58704be56ad4d63ce64e72bdaf8d276fa05c0182cf913ea8af2fb662af149b2aa44b36e5f06371de67f4ec7b8f41ec962ce729d082fc9859b356a4 SHA512 a32558a616199c2f11a36c21e32188b741799a9050082b5b8cd31ad46b2a214e9e1d209d5308319fbe8c0efe1181ac3ea2942f8d9d1f2d8b6b0ae3ef4180588a EBUILD qtbase-6.5.9999.ebuild 8886 BLAKE2B 6b6d4225d7ac94e391887763344c170c2cea2e4dd5ca7772162535de2215607d2961aabdfcd1e61f480191cf9a986d47daacab29e4e8207f85dda4966a987e6e SHA512 b0d137e1fd3618051c21bd979cfda5f16d371123af5f3291966b01fd6024ae17b094f563f31e7d5b5441f2cd1ccccb78e857bfc2967dd4137b2a2611e5b84389 -EBUILD qtbase-6.9999.ebuild 8886 BLAKE2B 6b6d4225d7ac94e391887763344c170c2cea2e4dd5ca7772162535de2215607d2961aabdfcd1e61f480191cf9a986d47daacab29e4e8207f85dda4966a987e6e SHA512 b0d137e1fd3618051c21bd979cfda5f16d371123af5f3291966b01fd6024ae17b094f563f31e7d5b5441f2cd1ccccb78e857bfc2967dd4137b2a2611e5b84389 -MISC metadata.xml 1606 BLAKE2B f6e00b051825268bd8976eea76bd297ab52f8821810ec71388ea7ff4e52e7b0fb1ae22313fe29d3fc123eba70efe9dff9f0934d00b07d3a4b055e9f9344b2feb SHA512 4321e0c195abc2d9459fab1706eeb24563382ff47f37a51a318888370565702c9394cc88e45b20c5f5ebc43114693cfe9c783db1389b8c5fae765ce839677555 +EBUILD qtbase-6.6.9999.ebuild 8863 BLAKE2B 80ce78e3189738f36f329c45d7421ded8ba4c08c60e49e0b731f7fd164acc602c368bd2e39a01b249943df321813f65021cbf3499387d0f0591febb6cdf62c67 SHA512 f11ed58682db0efb9311dfc09d2f0860377cec457ca099fc0a695521d823046768de85f581c17bcaccbd834086278141ed46350670145b7b86f521ff514c1983 +EBUILD qtbase-6.9999.ebuild 8977 BLAKE2B 503fc8f8a3d028f6ba2d352fa9dbe23a767581d098848c1bbe20bacd18abf6075c5a33b661af0ba85da5a3790ea25d34183f2206f41db689ff718d5d173289e4 SHA512 2a9ce988ea78ea5d014991181e71f05393111ebabbfcab2f9c55b8ba140e1f9bd1d3e85dae52dd4027f15aeea7083a51ed6c0ed93e6b0f36214a6aa7165017f1 +MISC metadata.xml 1724 BLAKE2B 958a60a43b45b9d79102633d818a57e697dc8180d1ffdea15ae064b659d19d099e6edf0c0583614cea1451375fec5163b8140efa530e9295a8a33e2165da1f01 SHA512 a11523095d1d6bb8443c8198315098c2c3b2e3e17cabcfd7260e2322c8542825605cc8e71eb8144c6dfe469abb2ed834d04350e80ccd9d6ee544a15099bde8b8 diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml index 1ed99ac060a1..852224aa2c56 100644 --- a/dev-qt/qtbase/metadata.xml +++ b/dev-qt/qtbase/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Qt Project</name> </maintainer> <use> + <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> <flag name="brotli">Enable support for Brotli decompression</flag> <flag name="concurrent">Build Qt6Concurrent module</flag> <flag name="dbus">Build Qt6DBus module</flag> @@ -17,10 +18,10 @@ <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag> <flag name="network">Build Qt6Network module</flag> + <flag name="renderdoc">Enable support for capturing graphic's API calls using <pkg>media-gfx/renderdoc</pkg></flag> <flag name="sql">Build Qt6Sql module</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="widgets">Build Qt6Widgets module</flag> - <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild new file mode 100644 index 000000000000..980755e275ba --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild @@ -0,0 +1,330 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qt6-build toolchain-funcs + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl tslib vulkan +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="nls wayland" #810802,864509 +) +IUSE="${QT6_IUSE[*]}" +REQUIRED_USE=" + $( + printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} + printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} + printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} + printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} + ) + accessibility? ( X dbus ) + eglfs? ( opengl ) + gui? ( || ( X eglfs wayland ) ) + libinput? ( udev ) + sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) + test? ( icu sql? ( sqlite ) ) +" + +# groups: +# - global (configure.cmake) +# - qtcore (src/corelib/configure.cmake) +# - qtgui (src/gui/configure.cmake) +# - qtnetwork (src/network/configure.cmake) +# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] +# - qtsql (src/plugins/sqldrivers/configure.cmake) +RDEPEND=" + sys-libs/zlib:= + ssl? ( dev-libs/openssl:= ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) + + app-crypt/libb2 + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2:=[pcre16,unicode(+)] + icu? ( dev-libs/icu:= ) + + dbus? ( sys-apps/dbus ) + gui? ( + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/libdrm + x11-libs/libxkbcommon[X?] + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + accessibility? ( app-accessibility/at-spi2-core:2 ) + eglfs? ( media-libs/mesa[gbm(+)] ) + evdev? ( sys-libs/mtdev ) + libinput? ( dev-libs/libinput:= ) + opengl? ( media-libs/libglvnd[X?] ) + tslib? ( x11-libs/tslib ) + widgets? ( + cups? ( net-print/cups ) + gtk? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + ) + ) + ) + network? ( + brotli? ( app-arch/brotli:= ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + ) + sql? ( + mysql? ( dev-db/mysql-connector-c:= ) + oci8? ( dev-db/oracle-instantclient:=[sdk] ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( dev-db/sqlite:3 ) + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + gui? ( + vulkan? ( dev-util/vulkan-headers ) + ) + network? ( + sctp? ( net-misc/lksctp-tools ) + ) + test? ( + elibc_musl? ( sys-libs/timezone-data ) + ) +" +BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 +PDEPEND=" + nls? ( ~dev-qt/qttranslations-${PV}:6 ) + wayland? ( ~dev-qt/qtwayland-${PV}:6 ) +" + +src_prepare() { + qt6-build_src_prepare + + if use test; then + # test itself has -Werror=strict-aliasing issues, drop for simplicity + sed -e '/add_subdirectory(qsharedpointer)/d' \ + -i tests/auto/corelib/tools/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_PCH=OFF + + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps + $(qt_feature xml) + ) + + use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X system_xcb_xinput) + $(qt_feature X xkbcommon_x11) + $(cmake_use_find_package X X11) # needed for truly no automagic + $(qt_feature accessibility accessibility_atspi_bridge) + $(qt_feature eglfs) + $(qt_feature evdev) + $(qt_feature evdev mtdev) + $(qt_feature gles2-only opengles2) + $(qt_feature libinput) + $(qt_feature opengl) + $(usev !opengl -DINPUT_opengl=no) #913691 + $(qt_feature tslib) + $(qt_feature vulkan) + $(qt_feature widgets) + -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c + ) && use widgets && mycmakeargs+=( + $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets + $(qt_feature gtk gtk3) + ) + + use network && mycmakeargs+=( + $(qt_feature brotli) + $(qt_feature gssapi) + $(qt_feature libproxy) + $(qt_feature sctp) + $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON) + ) + + use sql && mycmakeargs+=( + -DQT_FEATURE_sql_db2=OFF # unpackaged + -DQT_FEATURE_sql_ibase=OFF # unpackaged + -DQT_FEATURE_sql_mimer=OFF # unpackaged + $(qt_feature mysql sql_mysql) + $(qt_feature oci8 sql_oci) + $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) + $(qt_feature odbc sql_odbc) + $(qt_feature postgres sql_psql) + $(qt_feature sqlite sql_sqlite) + $(qt_feature sqlite system_sqlite) + ) + + if use amd64 || use x86; then + # see bug #913400 for explanations + local cpufeats=( + # list of checked cpu features in configure.cmake + avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} + f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes + ) + # handle odd ones out not matching -m* and macros (keep same order) + local cpuflags=( "${cpufeats[@]}" aes sha ) + local cpufeats+=( aesni shani ) + + local -a intrins + IFS=' ' read -ra intrins < <( + : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" + $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 + #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) + #include <x86intrin.h> + #endif + $(printf '__%s__ ' "${cpuflags[@]^^}") + EOF + assert + ) + + # do nothing and leave to qtbase if no macros expanded (test failed?) + if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then + local -i i + for ((i=0; i<${#cpufeats[@]}; i++)); do + [[ ${intrins[i]} == __* ]] && + mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) + done + mycmakeargs+=( -DTEST_x86intrin=ON ) + fi + fi + + qt6-build_src_configure +} + +src_test() { + local -x TZ=UTC + local -x LC_TIME=C + + local CMAKE_SKIP_TESTS=( + # broken with out-of-source + if qtbase is not already installed + tst_moc + tst_qmake + # needs x11/opengl, we *could* run these but tend to be flaky + # when opengl rendering is involved (even if software-only) + tst_qopengl{,config,widget,window} + tst_qgraphicsview + tst_qx11info + # fails with network sandbox + tst_qdnslookup + # typical to lack SCTP support on non-generic kernels + tst_qsctpsocket + # these can be flaky depending on the environment/toolchain + tst_qlogging # backtrace log test can easily vary + tst_qrawfont # can be affected by available fonts + tst_qstorageinfo # checks mounted filesystems + # flaky due to using different test framework and fails with USE=-gui + tst_selftests + # known failing when using clang+glibc+stdc++, needs looking into + tst_qthread + # partially failing on x86 chroots and seemingly(?) harmless (dev-qt + # revdeps tests pass), skip globally to avoid keywording flakiness + tst_json + tst_qcolorspace + tst_qdoublevalidator + tst_qglobal + tst_qglyphrun + tst_qvectornd + tst_rcc + # similarly, but on armv7 (bug #914028) + tst_qlineedit + tst_qpainter + # partially broken on llvm-musl, needs looking into but skip to have + # a baseline for regressions (like above, rest of dev-qt is fine) + $(usev elibc_musl ' + tst_qfiledialog2 + tst_qicoimageformat + tst_qimagereader + tst_qimage + ') + # note: for linux, upstream only really runs+maintains tests for amd64 + # https://doc.qt.io/qt-6/supported-platforms.html + ) + + qt6-build_src_test +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete_bins=( # need a better way to handle this + clientserver copier crashingServer desktopsettingsaware_helper + echo fileWriterProcess modal_helper nospace 'one space' + paster qcommandlineparser_test_helper qfileopeneventexternal + socketprocess syslocaleapp tst_qhashseed_helper 'two space s' + write-read-write + ) + local delete=( # sigh + "${D}${QT6_BINDIR}"/test* + "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index bf8d33b74e87..b5545709934f 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -18,7 +18,7 @@ declare -A QT6_IUSE=( [gui]=" +X accessibility eglfs evdev gles2-only +libinput - opengl tslib vulkan +widgets + opengl renderdoc tslib vulkan +widgets " [network]="brotli gssapi libproxy sctp" [sql]="mysql oci8 odbc postgres +sqlite" @@ -49,6 +49,7 @@ REQUIRED_USE=" # - qtnetwork (src/network/configure.cmake) # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] # - qtsql (src/plugins/sqldrivers/configure.cmake) +# dlopen: renderdoc RDEPEND=" sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) @@ -86,6 +87,7 @@ RDEPEND=" evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) + renderdoc? ( media-gfx/renderdoc ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) @@ -190,6 +192,7 @@ src_configure() { $(qt_feature libinput) $(qt_feature opengl) $(usev !opengl -DINPUT_opengl=no) #913691 + $(qt_feature renderdoc graphicsframecapture) $(qt_feature tslib) $(qt_feature vulkan) $(qt_feature widgets) @@ -210,6 +213,7 @@ src_configure() { use sql && mycmakeargs+=( -DQT_FEATURE_sql_db2=OFF # unpackaged -DQT_FEATURE_sql_ibase=OFF # unpackaged + -DQT_FEATURE_sql_mimer=OFF # unpackaged $(qt_feature mysql sql_mysql) $(qt_feature oci8 sql_oci) $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) @@ -217,7 +221,6 @@ src_configure() { $(qt_feature postgres sql_psql) $(qt_feature sqlite sql_sqlite) $(qt_feature sqlite system_sqlite) - -DQT_FEATURE_sql_tds=OFF # currently a no-op in CMakeLists.txt ) if use amd64 || use x86; then |