diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-22 15:09:18 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-22 21:47:17 +0200 |
| commit | ad10fce80859497407fa4ab5b42e0f03c3fa1caa (patch) | |
| tree | 9d135bdfc9071d57f23f31a66ee95274311f435e | |
| parent | dev-qt/qtcore: Switch to KDE 64a00680 snapshot (diff) | |
| download | gentoo-ad10fce80859497407fa4ab5b42e0f03c3fa1caa.tar.gz gentoo-ad10fce80859497407fa4ab5b42e0f03c3fa1caa.tar.bz2 gentoo-ad10fce80859497407fa4ab5b42e0f03c3fa1caa.zip | |
dev-qt/qtgui: 5.15.2-r12 version bump at KDE 64a00680
Switch from ~PV to =QT5_PV* version dependencies.
Fixes several things limited to dev-qt/qtgui, see below.
Upstream commit f42186815187be1a0c5c0f9d6acc657872d3d533:
"Cater for upstream changes in eglplatform.h" (libglvnd-1.3.4)
See also: https://bugreports.qt.io/browse/QTBUG-96392
Upstream commit aa36d950b5d817d1adf660eb54dacf0a1c16adde:
"QTextOdfWriter: fix exporting pixmaps to ODT"
See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/50
Upstream commit 64a0068011e12f178fb7ff65fafe7cfaa4620719:
"QPlatformWindow: fix isAncestorOf not breaking recursion"
See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/51
Bug: https://bugs.gentoo.org/810343
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | dev-qt/qtgui/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.15.2-r12.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.2-r11.ebuild) | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 6ec5cdd58fde..6dd68edabe85 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17 +DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2 SHA512 c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild index 73a502c8255a..f6de73e9c5ad 100644 --- a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild @@ -3,7 +3,7 @@ EAPI=8 -KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 +KDE_ORG_COMMIT=64a0068011e12f178fb7ff65fafe7cfaa4620719 QT5_MODULE="qtbase" inherit qt5-build @@ -27,13 +27,13 @@ REQUIRED_USE=" RDEPEND=" dev-libs/glib:2 - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= - dbus? ( ~dev-qt/qtdbus-${PV} ) + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] @@ -49,9 +49,9 @@ RDEPEND=" ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) + tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) udev? ( virtual/libudev:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) + vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE @@ -71,7 +71,7 @@ DEPEND="${RDEPEND} " PDEPEND=" ibus? ( app-i18n/ibus ) - wayland? ( ~dev-qt/qtwayland-${PV} ) + wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) " QT5_TARGET_SUBDIRS=( @@ -155,15 +155,15 @@ src_prepare() { src_configure() { local myconf=( - $(usex dbus -dbus-linked '') + $(usev dbus -dbus-linked) $(qt_use egl) $(qt_use eglfs) - $(usex eglfs '-gbm -kms' '') + $(usev eglfs '-gbm -kms') $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(usex gif '' -no-gif) + $(usev !gif -no-gif) -gui -system-harfbuzz $(qt_use jpeg libjpeg system) @@ -175,7 +175,7 @@ src_configure() { $(qt_use udev libudev) $(qt_use vulkan) $(qt_use X xcb) - $(usex X '-xcb-xlib -DUSE_X11' '') + $(usev X '-xcb-xlib') ) if use libinput || use X; then myconf+=( -xkbcommon ) |