| 1 |
commit: ad10fce80859497407fa4ab5b42e0f03c3fa1caa |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 22 13:09:18 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 22 19:47:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad10fce8 |
| 7 |
|
| 8 |
dev-qt/qtgui: 5.15.2-r12 version bump at KDE 64a00680 |
| 9 |
|
| 10 |
Switch from ~PV to =QT5_PV* version dependencies. |
| 11 |
|
| 12 |
Fixes several things limited to dev-qt/qtgui, see below. |
| 13 |
|
| 14 |
Upstream commit f42186815187be1a0c5c0f9d6acc657872d3d533: |
| 15 |
"Cater for upstream changes in eglplatform.h" (libglvnd-1.3.4) |
| 16 |
See also: https://bugreports.qt.io/browse/QTBUG-96392 |
| 17 |
|
| 18 |
Upstream commit aa36d950b5d817d1adf660eb54dacf0a1c16adde: |
| 19 |
"QTextOdfWriter: fix exporting pixmaps to ODT" |
| 20 |
See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/50 |
| 21 |
|
| 22 |
Upstream commit 64a0068011e12f178fb7ff65fafe7cfaa4620719: |
| 23 |
"QPlatformWindow: fix isAncestorOf not breaking recursion" |
| 24 |
See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/51 |
| 25 |
|
| 26 |
Bug: https://bugs.gentoo.org/810343 |
| 27 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 28 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 29 |
|
| 30 |
dev-qt/qtgui/Manifest | 2 +- |
| 31 |
...gui-5.15.2-r11.ebuild => qtgui-5.15.2-r12.ebuild} | 20 ++++++++++---------- |
| 32 |
2 files changed, 11 insertions(+), 11 deletions(-) |
| 33 |
|
| 34 |
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest |
| 35 |
index 6ec5cdd58fd..6dd68edabe8 100644 |
| 36 |
--- a/dev-qt/qtgui/Manifest |
| 37 |
+++ b/dev-qt/qtgui/Manifest |
| 38 |
@@ -1,3 +1,3 @@ |
| 39 |
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17 |
| 40 |
+DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2 SHA512 c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12 |
| 41 |
DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 |
| 42 |
DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 |
| 43 |
|
| 44 |
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild |
| 45 |
similarity index 91% |
| 46 |
rename from dev-qt/qtgui/qtgui-5.15.2-r11.ebuild |
| 47 |
rename to dev-qt/qtgui/qtgui-5.15.2-r12.ebuild |
| 48 |
index 73a502c8255..f6de73e9c5a 100644 |
| 49 |
--- a/dev-qt/qtgui/qtgui-5.15.2-r11.ebuild |
| 50 |
+++ b/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild |
| 51 |
@@ -3,7 +3,7 @@ |
| 52 |
|
| 53 |
EAPI=8 |
| 54 |
|
| 55 |
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 |
| 56 |
+KDE_ORG_COMMIT=64a0068011e12f178fb7ff65fafe7cfaa4620719 |
| 57 |
QT5_MODULE="qtbase" |
| 58 |
inherit qt5-build |
| 59 |
|
| 60 |
@@ -27,13 +27,13 @@ REQUIRED_USE=" |
| 61 |
|
| 62 |
RDEPEND=" |
| 63 |
dev-libs/glib:2 |
| 64 |
- ~dev-qt/qtcore-${PV}:5= |
| 65 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
| 66 |
dev-util/gtk-update-icon-cache |
| 67 |
media-libs/fontconfig |
| 68 |
>=media-libs/freetype-2.6.1:2 |
| 69 |
>=media-libs/harfbuzz-1.6.0:= |
| 70 |
sys-libs/zlib:= |
| 71 |
- dbus? ( ~dev-qt/qtdbus-${PV} ) |
| 72 |
+ dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) |
| 73 |
egl? ( media-libs/mesa[egl] ) |
| 74 |
eglfs? ( |
| 75 |
media-libs/mesa[gbm] |
| 76 |
@@ -49,9 +49,9 @@ RDEPEND=" |
| 77 |
) |
| 78 |
png? ( media-libs/libpng:0= ) |
| 79 |
tslib? ( >=x11-libs/tslib-1.21 ) |
| 80 |
- tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 81 |
+ tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) |
| 82 |
udev? ( virtual/libudev:= ) |
| 83 |
- vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 84 |
+ vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) |
| 85 |
vulkan? ( dev-util/vulkan-headers ) |
| 86 |
X? ( |
| 87 |
x11-libs/libICE |
| 88 |
@@ -71,7 +71,7 @@ DEPEND="${RDEPEND} |
| 89 |
" |
| 90 |
PDEPEND=" |
| 91 |
ibus? ( app-i18n/ibus ) |
| 92 |
- wayland? ( ~dev-qt/qtwayland-${PV} ) |
| 93 |
+ wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) |
| 94 |
" |
| 95 |
|
| 96 |
QT5_TARGET_SUBDIRS=( |
| 97 |
@@ -155,15 +155,15 @@ src_prepare() { |
| 98 |
|
| 99 |
src_configure() { |
| 100 |
local myconf=( |
| 101 |
- $(usex dbus -dbus-linked '') |
| 102 |
+ $(usev dbus -dbus-linked) |
| 103 |
$(qt_use egl) |
| 104 |
$(qt_use eglfs) |
| 105 |
- $(usex eglfs '-gbm -kms' '') |
| 106 |
+ $(usev eglfs '-gbm -kms') |
| 107 |
$(qt_use evdev) |
| 108 |
$(qt_use evdev mtdev) |
| 109 |
-fontconfig |
| 110 |
-system-freetype |
| 111 |
- $(usex gif '' -no-gif) |
| 112 |
+ $(usev !gif -no-gif) |
| 113 |
-gui |
| 114 |
-system-harfbuzz |
| 115 |
$(qt_use jpeg libjpeg system) |
| 116 |
@@ -175,7 +175,7 @@ src_configure() { |
| 117 |
$(qt_use udev libudev) |
| 118 |
$(qt_use vulkan) |
| 119 |
$(qt_use X xcb) |
| 120 |
- $(usex X '-xcb-xlib -DUSE_X11' '') |
| 121 |
+ $(usev X '-xcb-xlib') |
| 122 |
) |
| 123 |
if use libinput || use X; then |
| 124 |
myconf+=( -xkbcommon ) |
Archives