[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 6a98778e2d51b1919159acc5468e7aafec095a66
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 8 20:05:40 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 11 20:19:43 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a98778e
dev-qt/qtgui: Wire up IUSE=accessibility, add missing dependency
Bug: https://bugs.gentoo.org/916267
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.11..ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-qt/qtgui/qtgui-5.15.11..ebuild
b/dev-qt/qtgui/qtgui-5.15.11..ebuild
index cf55be1b..26bbb3d2 100644
--- a/dev-qt/qtgui/qtgui-5.15.11..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.11..ebuild
@@ -33,6 +33,7 @@ RDEPEND="
media-libs/freetype:2
media-libs/harfbuzz:=
sys-libs/zlib:=
+ accessibility? ( app-accessibility/at-spi2-core:2 )
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
eglfs? (
media-libs/mesa[gbm(+)]
@@ -150,6 +151,7 @@ src_prepare() {
src_configure() {
local myconf=(
+ $(qt_use accessibility feature-accessibility-atspi-bridge)
$(usev dbus -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 64756889b8d567a1cfc0b142704b028c89b9b48b
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Sep 23 15:54:12 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Sep 23 15:54:26 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=64756889
dev-qt/qtgui: sync wayland REQUIRED_USE changes with ::gentoo
None of the others are needed for wayland, required use often
gave the misconception that eglfs is needed for wayland.
Signed-off-by: Ionen Wolkens gentoo.org>
dev-qt/qtgui/qtgui-5.15.10..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.10..ebuild
b/dev-qt/qtgui/qtgui-5.15.10..ebuild
index 1788d8cd..cf55be1b 100644
--- a/dev-qt/qtgui/qtgui-5.15.10..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.10..ebuild
@@ -17,7 +17,7 @@ SLOT=5/${QT5_PV} # bug 707658
IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
- || ( eglfs linuxfb vnc X )
+ || ( eglfs linuxfb vnc wayland X )
accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 8d38f796bba0a012422710ff01240e03299b92de
Author: Jimi Huotari gentoo org>
AuthorDate: Tue Feb 28 20:50:31 2023 +
Commit: Jimi Huotari gentoo org>
CommitDate: Tue Feb 28 20:50:31 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8d38f796
dev-qt/qtgui: add missing dependency on 'x11-base/xorg-proto'
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtgui/qtgui-5.15.8..ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtgui/qtgui-5.15.8..ebuild
b/dev-qt/qtgui/qtgui-5.15.8..ebuild
index 1c4cedd1..1788d8cd 100644
--- a/dev-qt/qtgui/qtgui-5.15.8..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.8..ebuild
@@ -68,6 +68,7 @@ DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
linuxfb? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
+ X? ( x11-base/xorg-proto )
"
PDEPEND="
ibus? ( app-i18n/ibus )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtconcurrent/, dev-qt/qtcore/, dev-qt/qtwidgets/, ...
commit: 5a67782c38a4373620068698481fd1be89aa9e8c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 8 14:20:59 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 8 14:24:03 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a67782c dev-qt/*: Re-manifest with qtbase-5.15-gentoo-patchset-3 Bug: https://bugs.gentoo.org/889780 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtconcurrent/Manifest | 2 +- dev-qt/qtcore/Manifest | 2 +- dev-qt/qtdbus/Manifest | 2 +- dev-qt/qtgui/Manifest | 2 +- dev-qt/qtnetwork/Manifest | 2 +- dev-qt/qtopengl/Manifest | 2 +- dev-qt/qtprintsupport/Manifest | 2 +- dev-qt/qtsql/Manifest | 2 +- dev-qt/qttest/Manifest | 2 +- dev-qt/qtwidgets/Manifest | 2 +- dev-qt/qtxml/Manifest | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index f1efe30f..e255e3f9 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1 +1 @@ -DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 +DIST qtbase-5.15-gentoo-patchset-3.tar.xz 4872 BLAKE2B 27561fbd031bc8f678fdc3033ec038d00e5039c5aef5b090d62a77f894e2728f08812748b22738fcf02b1e7b03d706ee75ef1d5774efaa01b2274e402cff6c12 SHA512 92a6dddfe2327d2230b40ff9aee74ca878185ab7e42b0e907a38d3cf73f38aec25a355f1e6bec85b409635c5247c74ae3d377ff42cbe151df30800dd128e9e47 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index f1efe30f..e255e3f9 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1 +1 @@ -DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 +DIST qtbase-5.15-gentoo-patchset-3.tar.xz 4872 BLAKE2B 27561fbd031bc8f678fdc3033ec038d00e5039c5aef5b090d62a77f894e2728f08812748b22738fcf02b1e7b03d706ee75ef1d5774efaa01b2274e402cff6c12 SHA512 92a6dddfe2327d2230b40ff9aee74ca878185ab7e42b0e907a38d3cf73f38aec25a355f1e6bec85b409635c5247c74ae3d377ff42cbe151df30800dd128e9e47 diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index f1efe30f..e255e3f9 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1 +1 @@ -DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 +DIST qtbase-5.15-gentoo-patchset-3.tar.xz 4872 BLAKE2B 27561fbd031bc8f678fdc3033ec038d00e5039c5aef5b090d62a77f894e2728f08812748b22738fcf02b1e7b03d706ee75ef1d5774efaa01b2274e402cff6c12 SHA512 92a6dddfe2327d2230b40ff9aee74ca878185ab7e42b0e907a38d3cf73f38aec25a355f1e6bec85b409635c5247c74ae3d377ff42cbe151df30800dd128e9e47 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index f1efe30f..e255e3f9 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1 +1 @@ -DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 +DIST qtbase-5.15-gentoo-patchset-3.tar.xz 4872 BLAKE2B 27561fbd031bc8f678fdc3033ec038d00e5039c5aef5b090d62a77f894e2728f08812748b22738fcf02b1e7b03d706ee75ef1d5774efaa01b2274e402cff6c12 SHA512 92a6dddfe2327d2230b40ff9aee74ca878185ab7e42b0e907a38d3cf73f38aec25a355f1e6bec85b409635c5247c74ae3d377ff42cbe151df30800dd128e9e47 diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index f1efe30f..e255e3f9 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1 @@ -DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 +DIST qtbase-5.15-gentoo-patchset-3.tar.xz 4872 BLAKE2B 27561fbd031bc8f678fdc3033ec038d00e5039c5aef5b090d62a77f894e2728f08812748b22738fcf02b1e7b03d706ee75ef1d5774efaa01b2274e402cff6c12 SHA512 92a6dddfe2327d2230b40ff9aee74ca878185ab7e42b0e907a38d3cf73f38aec25a355f1e6bec85b409635c5247c74ae3d377ff42c
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: e178c17337f93222e83b10a1e093923617e03f91 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 8 10:20:34 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 8 10:20:34 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e178c173 dev-qt/qtgui: Drop obsolete x11-libs/libxcb[xkb] USEdep Closes: https://bugs.gentoo.org/875959 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtgui/qtgui-5.15.6..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtgui/qtgui-5.15.6..ebuild b/dev-qt/qtgui/qtgui-5.15.6..ebuild index e8389d10..bd5a8d4e 100644 --- a/dev-qt/qtgui/qtgui-5.15.6..ebuild +++ b/dev-qt/qtgui/qtgui-5.15.6..ebuild @@ -56,7 +56,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - x11-libs/libxcb:=[xkb] + x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 450f47fd2c952715aa9851d10ca6e5f939acb5da
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 7 07:50:28 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 7 07:52:02 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=450f47fd
dev-qt/qtgui: Drop IUSE gif
Does not save any dependencies.
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.5..ebuild | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.5..ebuild
b/dev-qt/qtgui/qtgui-5.15.5..ebuild
index 4c0815f5..abbe3a1f 100644
--- a/dev-qt/qtgui/qtgui-5.15.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.5..ebuild
@@ -13,8 +13,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
fi
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
- +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
+IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
+ linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs linuxfb vnc X )
accessibility? ( dbus X )
@@ -96,7 +96,6 @@ QT5_GENTOO_CONFIG=(
:fontconfig:
:system-freetype:FREETYPE
!:no-freetype:
- !gif:no-gif:
gles2-only::OPENGL_ES
gles2-only:opengles2:OPENGL_ES_2
!:no-gui:
@@ -157,7 +156,6 @@ src_configure() {
$(qt_use evdev mtdev)
-fontconfig
-system-freetype
- $(usev !gif -no-gif)
-gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: faef801bdff798327f5580020c3d955a88289f9b
Author: WANG Xuerui gentoo org>
AuthorDate: Wed May 25 11:17:59 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 18 14:22:10 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=faef801b
dev-qt/qtgui: keyword 5.15.5. for ~loong
See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley gmail.com>
Signed-off-by: WANG Xuerui gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.5..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.5..ebuild
b/dev-qt/qtgui/qtgui-5.15.5..ebuild
index 9efb7138..4c0815f5 100644
--- a/dev-qt/qtgui/qtgui-5.15.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.5..ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5
framework"
SLOT=5/${QT5_PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
fi
IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
commit: 599928def81f1bdf6a832e72950244e14f84cc8a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 14 11:52:55 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 14 18:21:17 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=599928de
dev-qt/qtgui: Cleanup and make use of gentoo-patchset
Ends the which-hunt.
Bug: https://bugs.gentoo.org/828100
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/Manifest | 1 +
dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 -
.../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 --
dev-qt/qtgui/qtgui-5.15.4..ebuild | 5 ---
4 files changed, 1 insertion(+), 84 deletions(-)
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
new file mode 100644
index ..1e41118d
--- /dev/null
+++ b/dev-qt/qtgui/Manifest
@@ -0,0 +1 @@
+DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
SHA512
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
deleted file mode 100644
index 41814c06..
--- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Fri, 1 Mar 2019 21:37:52 -0500
-Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2
-
-Resolves a build failure when QMAKE_CXXFLAGS contains -march=native
-and the compiler is running on a CPU which does not support AVX2.
-
-Bug: https://bugs.gentoo.org/672946
- mkspecs/common/gcc-base.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index c2669e4833..44aa96af38 100644
a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp
- QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
-
- # -march=haswell is supported as of GCC 4.9 and Clang 3.6
--QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2
-+QMAKE_CFLAGS_ARCH_HASWELL = -mavx2
-
- # Wrapper tools that understand .o/.a files with GIMPLE instead of machine
code
- QMAKE_AR_LTCG = gcc-ar cqs
---
-2.21.0.rc1
-
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc3..
--- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an
additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used
(at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard
and qtwayland.
-During upgrade from =Qt-5.14, as a consequence of slot upgrade
rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have
been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the
_populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be
added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For
debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only
debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of
CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a
Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make
IsDebugAndRelease
-optional and default to FALSE.
-
a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23
13:37:32.0 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09
15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
-
- file(GLOB pluginTargets
\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
-
--macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin
Configuration PLUGIN_LOCATION
-- IsDebugAndRelease)
-+macro(_popula
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 40d8d547e48ac7369c7a6859089a04edae1c3a28 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 20 19:38:09 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 20 19:38:09 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=40d8d547 dev-qt/qtgui: Switch to media-libs/libjpeg-turbo:= Away from deprecated virtual/jpeg. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtgui/qtgui-5.15.4..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtgui/qtgui-5.15.4..ebuild b/dev-qt/qtgui/qtgui-5.15.4..ebuild index b0c00b72..e595b832 100644 --- a/dev-qt/qtgui/qtgui-5.15.4..ebuild +++ b/dev-qt/qtgui/qtgui-5.15.4..ebuild @@ -38,7 +38,7 @@ RDEPEND=" x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) - jpeg? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 2c1f509e3a5a7761b9399409c81fd7f2b20266a6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Dec 24 16:25:06 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Dec 24 16:42:10 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2c1f509e
dev-qt/qtgui: Set USE-default for mesa[gbm]
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index dc26c5cd..1f300f95 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -34,7 +34,7 @@ RDEPEND="
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
eglfs? (
- media-libs/mesa[gbm]
+ media-libs/mesa[gbm(+)]
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: eb80f984b8509d49b6f18ea1b97038bd442a4b8c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 16 23:20:18 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 16 23:24:08 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb80f984
dev-qt/qtgui: Enforce media-libs/libglvnd[X] USE-dep for !gles2-only
Thanks-to: Davide Pesavento gentoo.org>
Bug: https://bugs.gentoo.org/816492
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index dc877b56..dc26c5cd 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -31,7 +31,6 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
media-libs/harfbuzz:=
- media-libs/libglvnd[X?]
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
eglfs? (
@@ -40,6 +39,8 @@ RDEPEND="
)
evdev? ( sys-libs/mtdev )
jpeg? ( virtual/jpeg )
+ gles2-only? ( media-libs/libglvnd )
+ !gles2-only? ( media-libs/libglvnd[X] )
libinput? (
dev-libs/libinput:=
x11-libs/libxkbcommon
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 4660c52a8d5db6edf2f60310e4f2cfefc9673739
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Oct 16 23:12:09 2021 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Oct 16 23:12:09 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4660c52a
dev-qt/qtgui: simplify some depend atoms
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index c4cdc58e..dc877b56 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -29,8 +29,8 @@ RDEPEND="
=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:=
+ media-libs/freetype:2
+ media-libs/harfbuzz:=
media-libs/libglvnd[X?]
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
@@ -39,12 +39,12 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( virtual/jpeg )
libinput? (
dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
+ x11-libs/libxkbcommon
)
- png? ( media-libs/libpng:0= )
+ png? ( media-libs/libpng:= )
tslib? ( >=x11-libs/tslib-1.21 )
tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
udev? ( virtual/libudev:= )
@@ -54,8 +54,8 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.5.0[X]
+ x11-libs/libxcb:=[xkb]
+ x11-libs/libxkbcommon[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 5eac00302ae93bc3c7a2c0326885f8e4af2660b1
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Oct 16 22:25:33 2021 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Oct 16 22:25:33 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5eac0030
dev-qt/qtgui: treat linuxfb and vnc like the other platform plugins
Also add missing sys-kernel/linux-headers dependency
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index 337e8395..c4cdc58e 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -16,7 +16,7 @@ fi
IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
- || ( eglfs X )
+ || ( eglfs linuxfb vnc X )
accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
@@ -64,6 +64,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
+ linuxfb? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
PDEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 02cb6e27f322666f6b466a5c8f070a2e1afae0fa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 16 15:35:28 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 16 15:35:28 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=02cb6e27
dev-qt/qtgui: Add missing USE-dep on media-libs/libglvnd[X?]
Reported-by: William Throwe cornell.edu>
Bug: https://bugs.gentoo.org/816492
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index fbc7f440..337e8395 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -31,7 +31,7 @@ RDEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
- media-libs/libglvnd
+ media-libs/libglvnd[X?]
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
eglfs? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 3e860dcf65c6ede5e4b818911ca0fd6b02bba972
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 22 13:09:18 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 30 11:05:27 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e860dcf
dev-qt/qtgui: Upstream fixed build with libglvnd-1.3.4
Upstream commit f42186815187be1a0c5c0f9d6acc657872d3d533:
"Cater for upstream changes in eglplatform.h" (libglvnd-1.3.4)
See also: https://bugreports.qt.io/browse/QTBUG-96392
(sync with Gentoo ebuild repository)
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index 36dc15ed..f81b5c47 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -172,7 +172,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use vulkan)
$(qt_use X xcb)
- $(usev X '-xcb-xlib -DUSE_X11')
+ $(usev X '-xcb-xlib')
)
if use libinput || use X; then
myconf+=( -xkbcommon )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 0fed5577501ac4e3c73debe2ebdc50672dee00fb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 15 17:58:52 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Sep 17 17:23:23 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0fed5577
dev-qt/qtgui: Gentoo's GL impl. switched to media-libs/libglvnd
media-libs/libglvnd provides both libGL.so and opengl.pc as well as
libEGL.so and egl.pc, libGLESv2.so and glesv2.pc.
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index 0c0cb718..36dc15ed 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -31,16 +31,14 @@ RDEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
+ media-libs/libglvnd
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
- egl? ( media-libs/mesa[egl] )
eglfs? (
media-libs/mesa[gbm]
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2-only? ( media-libs/mesa[gles2] )
- !gles2-only? ( virtual/opengl )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: a8beb98007cfd5f192b85416bee4b75633bda63a
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Sep 15 17:55:07 2021 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Sep 15 17:55:07 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a8beb980
dev-qt/qtgui: usex -> usev
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtgui/qtgui-5.15.2..ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index 0473a9e1..0c0cb718 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -154,15 +154,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)
@@ -174,7 +174,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use vulkan)
$(qt_use X xcb)
- $(usex X '-xcb-xlib -DUSE_X11' '')
+ $(usev X '-xcb-xlib -DUSE_X11')
)
if use libinput || use X; then
myconf+=( -xkbcommon )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: f1f6af038dd9e283b9915c18b3b0f1f379ace46f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 26 10:50:11 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 27 11:40:41 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f1f6af03
dev-qt/qtgui: Force -DUSE_X11 with IUSE="X"
Reported-by: Austin Kilgore gmail.com>
Thanks-to: Tiernan Hubble thubble.ca>
Bug: https://bugs.gentoo.org/810343
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index 47a8155c..5a288457 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -174,7 +174,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use vulkan)
$(qt_use X xcb)
- $(usex X '-xcb-xlib' '')
+ $(usex X '-xcb-xlib -DUSE_X11' '')
)
if use libinput || use X; then
myconf+=( -xkbcommon )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 8898e86615e7d5d31575c056058a5780a4fd0cba
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 23 00:35:29 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Aug 23 01:14:58 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8898e866
dev-qt/qtgui: Add IUSE=linuxfb
Bug: https://bugs.gentoo.org/589560
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/metadata.xml | 1 +
dev-qt/qtgui/qtgui-5.15..ebuild | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index cfa040fb..4efe433f 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -11,6 +11,7 @@
Enable support for input devices via
evdev
Build the IBus input method plugin
Enable support for input devices via
dev-libs/libinput
+ Enable Linux framebuffer support for
embedded devices
Enable support for touchscreen devices via
x11-libs/tslib
Build plugin to receive touch events over the
TUIO protocol
Enable support for Vulkan
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index 1f90fc01..47a8155c 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -13,9 +13,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
-# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
- +libinput +png tslib tuio +udev vnc vulkan wayland +X"
+ +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
accessibility? ( dbus X )
@@ -168,6 +167,7 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
+ $(qt_use linuxfb)
-opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 7f196bdb5ad3caa2f0a9c19b4e1d53c56141c8c0
Author: Ross Charles Campbell gmail com>
AuthorDate: Fri Aug 21 22:24:02 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 9 18:40:23 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f196bdb
dev-qt/qtgui: depend on virtual/opengl only when gles2-only is off
The PR removes the virtual/opengl dependency when the gles2-only flag is enabled
to avoid pulling in unnecessary X11 dependencies on pure wayland environment.
Bug: https://bugs.gentoo.org/731650
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ross Charles Campbell gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17203
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.15..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index 23bc34eb..e6fed665 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -34,7 +34,6 @@ RDEPEND="
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
sys-libs/zlib:=
- virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
eglfs? (
@@ -43,6 +42,7 @@ RDEPEND="
)
evdev? ( sys-libs/mtdev )
gles2-only? ( media-libs/mesa[gles2] )
+ !gles2-only? ( virtual/opengl )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: b858c8b31ddc1cc5c7894487ec63cc818e460e05
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 9 17:36:29 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 9 17:36:29 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b858c8b3
dev-qt/qtgui: Fix subslot definition
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.14..ebuild| 2 +-
dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.15..ebuild| 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index fdad446a..43c18a58 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${PV} # bug 707658
+SLOT=5/$(ver_cut 1-3) # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild
b/dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild
index 8b98a4f7..bb5f975b 100644
--- a/dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${PV} # bug 707658
+SLOT=5/$(ver_cut 1-3) # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index 8b98a4f7..bb5f975b 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${PV} # bug 707658
+SLOT=5/$(ver_cut 1-3) # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index d6adc4b3..9869b3ec 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${PV} # bug 707658
+SLOT=5/$(ver_cut 1-3) # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 355d7fbccd6bf39726fd130b7ba530f4ffe9ecec
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Sat Nov 23 09:26:18 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 2 18:09:22 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=355d7fbc
dev-qt/qtgui: rename USE=gles2 to USE=gles2-only
Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/metadata.xml | 1 -
dev-qt/qtgui/qtgui-5.14..ebuild | 12 ++--
dev-qt/qtgui/qtgui-5.15..ebuild | 12 ++--
dev-qt/qtgui/qtgui-5..ebuild| 12 ++--
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index a7e86f45..cfa040fb 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -9,7 +9,6 @@
Enable EGL integration
Build the EGL Full Screen/Single Surface
platform plugin
Enable support for input devices via
evdev
- Use GLES 2.0 or later instead of full
OpenGL
Build the IBus input method plugin
Enable support for input devices via
dev-libs/libinput
Enable support for touchscreen devices via
x11-libs/tslib
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index 474c2a42..fdad446a 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- X? ( gles2? ( egl ) )
+ X? ( gles2-only? ( egl ) )
"
RDEPEND="
@@ -42,7 +42,7 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2? ( media-libs/mesa[gles2] )
+ gles2-only? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
@@ -99,8 +99,8 @@ QT5_GENTOO_CONFIG=(
:system-freetype:FREETYPE
!:no-freetype:
!gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
+ gles2-only::OPENGL_ES
+ gles2-only:opengles2:OPENGL_ES_2
!:no-gui:
:system-harfbuzz:
!:no-harfbuzz:
@@ -169,7 +169,7 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- -opengl $(usex gles2 es2 desktop)
+ -opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index cf523927..8b98a4f7 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- X? ( gles2? ( egl ) )
+ X? ( gles2-only? ( egl ) )
"
RDEPEND="
@@ -42,7 +42,7 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2? ( media-libs/mesa[gles2] )
+ gles2-only? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
@@ -99,8 +99,8 @@ QT5_GENTOO_CONFIG=(
:system-freetype:FREETYPE
!:no-freetype:
!gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
+ gles2-only::OPENGL_ES
+ gles2-only:opengles2:OPENGL_ES_2
!:no-gui:
:system-harfbuzz:
!:no-harfbuzz:
@@ -169,7 +169,7 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- -opengl $(usex gles2 es2 desktop)
+ -opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index d8d3e0e7..d6adc4b3 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput +
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: c71732263c2d058de8ae78ce83b57f2db27208fd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 17 22:23:44 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 18 11:04:14 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c7173226
dev-qt/qtgui: drop obsolete blockers, properly fixed by cmake patch
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.14..ebuild | 11 ++-
dev-qt/qtgui/qtgui-5.15..ebuild | 11 ++-
dev-qt/qtgui/qtgui-5..ebuild| 7 +--
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index e9b747e5..474c2a42 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
X? ( gles2? ( egl ) )
"
-COMMON_DEPEND="
+RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
dev-util/gtk-update-icon-cache
@@ -66,17 +66,10 @@ COMMON_DEPEND="
x11-libs/xcb-util-wm
)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
- !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: d6e9b991107ae70de433ff9adab8db652575674a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 26 21:30:46 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 28 10:03:44 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d6e9b991
dev-qt/qtgui: Add USE vulkan
Bug: https://bugs.gentoo.org/703594
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/metadata.xml | 1 +
dev-qt/qtgui/qtgui-5.14..ebuild | 7 +--
dev-qt/qtgui/qtgui-5.15..ebuild | 7 +--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 5fd07056..a7e86f45 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -14,6 +14,7 @@
Enable support for input devices via
dev-libs/libinput
Enable support for touchscreen devices via
x11-libs/tslib
Build plugin to receive touch events over the
TUIO protocol
+ Enable support for Vulkan
Provide dev-qt/qtwayland to
ensure Qt applications can be run as Wayland clients
Build the XCB platform plugin and enable X11
integration
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index e077dd59..e9b747e5 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -15,8 +15,8 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +X"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+ +libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
accessibility? ( dbus X )
@@ -53,6 +53,7 @@ COMMON_DEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
+ vulkan? ( dev-util/vulkan-headers )
X? (
x11-libs/libICE
x11-libs/libSM
@@ -120,6 +121,7 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
+ vulkan:vulkan:
X:xcb:
X:xcb-glx:
X:xcb-plugin:
@@ -178,6 +180,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
+ $(qt_use vulkan)
$(qt_use X xcb system)
$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index e1bbc622..27b95fde 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -15,8 +15,8 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +X"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+ +libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
accessibility? ( dbus X )
@@ -53,6 +53,7 @@ COMMON_DEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
+ vulkan? ( dev-util/vulkan-headers )
X? (
x11-libs/libICE
x11-libs/libSM
@@ -120,6 +121,7 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
+ vulkan:vulkan:
X:xcb:
X:xcb-glx:
X:xcb-plugin:
@@ -178,6 +180,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
+ $(qt_use vulkan)
$(qt_use X xcb)
$(usex X '-xcb-xlib' '')
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/, dev-qt/qtgui/
commit: bb3e4735560877bc5e06bb6f5cc36ce3869c7249
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 9 16:23:29 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 9 19:22:20 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bb3e4735
dev-qt/qtgui: Fix cmake macro compat. for upgrade from https://bugs.gentoo.org/703306
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
(cherry picked from commit 9f10d5690b0a924021f54c7b09b4ce152fd37e0b)
.../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 ++
dev-qt/qtgui/qtgui-5.14..ebuild| 5 ++-
dev-qt/qtgui/qtgui-5.15..ebuild| 5 ++-
3 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index ..30b5abc3
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an
additional argument
+IsDebugAndRelease without providing backward compatibility. This macro is used
(at least) for
+QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard
and qtwayland.
+During upgrade from =Qt-5.14, as a consequence of slot upgrade
rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have
been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the
_populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be
added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For
debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only
debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of
CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a
Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make
IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23
13:37:32.0 +0100
b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09
15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+
+ file(GLOB pluginTargets
\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+
+-macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin
Configuration PLUGIN_LOCATION
+- IsDebugAndRelease)
++macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin
Configuration PLUGIN_LOCATION)
++set(IsDebugAndRelease FALSE)
++set (list_var ${ARGN})
++list(LENGTH list_var num_extra_arg)
++if (${num_extra_arg} GREATER 0)
++list(GET list_var 0 IsDebugAndRelease)
++endif()
++
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY
IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index f613f170..e077dd59 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -133,7 +133,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
-PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946
+PATCHES=(
+ "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+ "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug
703306
+)
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index 169389df..e1bbc622 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -133,7 +133,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
-PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946
+PATCHES=(
+ "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+ "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug
703306
+)
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 61d8792a917b8e80e580c64f888202f1d15eca14
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 2 17:14:06 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 2 18:37:34 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=61d8792a
dev-qt/qtgui: More fine-grained subslot
Closes: https://bugs.gentoo.org/707658
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.14..ebuild | 1 +
dev-qt/qtgui/qtgui-5.15..ebuild | 1 +
dev-qt/qtgui/qtgui-5..ebuild| 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index ab7524bb..f613f170 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -7,6 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/${PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index b8a5f439..169389df 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -7,6 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/${PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 04d52960..3fb1bce4 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -7,6 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/${PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 64de515556a003fc5826a7d7a99f36fc854b2864
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Jan 22 11:29:49 2020 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Jan 22 11:29:49 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=64de5155
dev-qt/qtgui: fix 5.15 configure with and without USE="X"
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtgui/qtgui-5.15..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index 3074f4ce..b8a5f439 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -174,7 +174,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use X)
+ $(qt_use X xcb)
$(usex X '-xcb-xlib' '')
)
if use libinput || use X; then
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 040f587dc703adc1e0eba504e83430a032ba3c62
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 14 23:06:06 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 14 23:06:06 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=040f587d
dev-qt/qtgui: Rename USE xcb to X
Closes: https://bugs.gentoo.org/705440
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/metadata.xml | 2 +-
dev-qt/qtgui/qtgui-5.12..ebuild | 37 +++--
dev-qt/qtgui/qtgui-5.14..ebuild | 37 +++--
dev-qt/qtgui/qtgui-5.15..ebuild | 37 +++--
dev-qt/qtgui/qtgui-5..ebuild| 37 +++--
5 files changed, 77 insertions(+), 73 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 74256c16..5fd07056 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -15,7 +15,7 @@
Enable support for touchscreen devices via
x11-libs/tslib
Build plugin to receive touch events over the
TUIO protocol
Provide dev-qt/qtwayland to
ensure Qt applications can be run as Wayland clients
- Build the XCB platform plugin and enable X11
integration
+ Build the XCB platform plugin and enable X11
integration
https://bugreports.qt.io/
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index bd23ada7..7e8a5ceb 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit qt5-build
@@ -14,14 +15,14 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X"
REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
+ || ( eglfs X )
+ accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- xcb? ( gles2? ( egl ) )
+ X? ( gles2? ( egl ) )
"
RDEPEND="
@@ -51,7 +52,7 @@ RDEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
- xcb? (
+ X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -111,13 +112,13 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xcb-xinput:
+ X:xcb:
+ X:xcb-glx:
+ X:xcb-plugin:
+ X:xcb-render:
+ X:xcb-sm:
+ X:xcb-xlib:
+ X:xcb-xinput:
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -130,8 +131,8 @@ src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+ # egl_x11 is activated when both egl and X are enabled
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
@@ -166,10 +167,10 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+ $(qt_use X xcb system)
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)
- if use libinput || use xcb; then
+ if use libinput || use X; then
myconf+=( -xkbcommon )
fi
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index 97db51f0..ab7524bb 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit qt5-build
@@ -14,14 +15,14 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X"
REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
+ ||
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/, dev-qt/qtgui/
commit: 71a6ccc1bcc9b66bbb891365ab17edcd49f7b1c9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 25 15:51:30 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 25 17:30:33 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=71a6ccc1
dev-qt/qtgui: Sync with Gentoo ebuild repository
- Fix build with CXXFLAGS="-march=native"
- Block known old users of _populate_Gui_plugin_properties
With sufficiently parallelised emerge, if dev-qt/qtgui reverse dependencies
are scheduled before modules installing Qt5Gui plugins have been rebuilt,
these revdeps will fail cmake after an incompatible change in macro args.
- Raise minimum dependency for USE=tslib
Bug: https://bugs.gentoo.org/672946
Bug: https://bugs.gentoo.org/703306
Bug: https://bugs.gentoo.org/703336
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 +
dev-qt/qtgui/qtgui-5.12..ebuild | 2 ++
dev-qt/qtgui/qtgui-5.14..ebuild | 15 ---
dev-qt/qtgui/qtgui-5.15..ebuild | 15 ---
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
5 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
new file mode 100644
index ..41814c06
--- /dev/null
+++ b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
@@ -0,0 +1,29 @@
+From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Fri, 1 Mar 2019 21:37:52 -0500
+Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2
+
+Resolves a build failure when QMAKE_CXXFLAGS contains -march=native
+and the compiler is running on a CPU which does not support AVX2.
+
+Bug: https://bugs.gentoo.org/672946
+---
+ mkspecs/common/gcc-base.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index c2669e4833..44aa96af38 100644
+--- a/mkspecs/common/gcc-base.conf
b/mkspecs/common/gcc-base.conf
+@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp
+ QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
+
+ # -march=haswell is supported as of GCC 4.9 and Clang 3.6
+-QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2
++QMAKE_CFLAGS_ARCH_HASWELL = -mavx2
+
+ # Wrapper tools that understand .o/.a files with GIMPLE instead of machine
code
+ QMAKE_AR_LTCG = gcc-ar cqs
+--
+2.21.0.rc1
+
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index 480c023a..bd23ada7 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -124,6 +124,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
+PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild
b/dev-qt/qtgui/qtgui-5.14..ebuild
index 480c023a..97db51f0 100644
--- a/dev-qt/qtgui/qtgui-5.14..ebuild
+++ b/dev-qt/qtgui/qtgui-5.14..ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
xcb? ( gles2? ( egl ) )
"
-RDEPEND="
+COMMON_DEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
dev-util/gtk-update-icon-cache
@@ -47,7 +47,7 @@ RDEPEND="
>=x11-libs/libxkbcommon-0.5.0
)
png? ( media-libs/libpng:0= )
- tslib? ( x11-libs/tslib )
+ tslib? ( >=x11-libs/tslib-1.21 )
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
@@ -63,10 +63,17 @@ RDEPEND="
x11-libs/xcb-util-wm
)
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
evdev? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
+# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
+RDEPEND="${COMMON_DEPEND}
+ !
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/
commit: eba7139a022154ede12ffafb8deb47a0fe8291d7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 18 15:29:55 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 18 15:29:55 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=eba7139a
dev-qt/qtgui: Drop unused patch
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch | 34 --
1 file changed, 34 deletions(-)
diff --git a/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
b/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
deleted file mode 100644
index 6f63a637..
--- a/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari
-Date: Wed, 6 Nov 2019 00:54:57 +0200
-Subject: [PATCH] Fix build with -xcb and -no-libinput
-
-Since a34e81ab [1], 'xkbcommon_support' is under
-'src/platformsupport/input', and will not be defined when building
-with -no-libinput, and as such, 'xkbcommon_support-private' added in
-'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
-
-1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
-
-Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
-Gentoo-bug: https://bugs.gentoo.org/699110
-Suggested-by: Petr Zima
- src/platformsupport/platformsupport.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/platformsupport.pro
b/src/platformsupport/platformsupport.pro
-index 6d4f1b93bd1..877665ff06b 100644
a/src/platformsupport/platformsupport.pro
-+++ b/src/platformsupport/platformsupport.pro
-@@ -11,7 +11,7 @@ SUBDIRS = \
- qtConfig(freetype)|darwin|win32: \
- SUBDIRS += fontdatabases
-
--qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
-+qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon)
{
- SUBDIRS += input
- input.depends += devicediscovery
- }
---
-2.16.3
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
commit: 1c7312e8264050c2c4e4c4feb7522339e66f3743
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Nov 12 17:13:48 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Nov 12 19:20:26 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1c7312e8
dev-qt/qtgui: Fix build with -xcb and -no-libinput
Bug: https://bugs.gentoo.org/699110
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch | 34 ++
dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild | 2 ++
2 files changed, 36 insertions(+)
diff --git a/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
b/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
new file mode 100644
index ..6f63a637
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
@@ -0,0 +1,34 @@
+From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari
+Date: Wed, 6 Nov 2019 00:54:57 +0200
+Subject: [PATCH] Fix build with -xcb and -no-libinput
+
+Since a34e81ab [1], 'xkbcommon_support' is under
+'src/platformsupport/input', and will not be defined when building
+with -no-libinput, and as such, 'xkbcommon_support-private' added in
+'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
+
+1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
+
+Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
+Gentoo-bug: https://bugs.gentoo.org/699110
+Suggested-by: Petr Zima
+---
+ src/platformsupport/platformsupport.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/platformsupport/platformsupport.pro
b/src/platformsupport/platformsupport.pro
+index 6d4f1b93bd1..877665ff06b 100644
+--- a/src/platformsupport/platformsupport.pro
b/src/platformsupport/platformsupport.pro
+@@ -11,7 +11,7 @@ SUBDIRS = \
+ qtConfig(freetype)|darwin|win32: \
+ SUBDIRS += fontdatabases
+
+-qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
++qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon)
{
+ SUBDIRS += input
+ input.depends += devicediscovery
+ }
+--
+2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
b/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
index 480c023a..df4df879 100644
--- a/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
@@ -124,6 +124,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
+PATCHES=( "${FILESDIR}/${P}-no-xcb-no-xkbcommon.patch" )
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 90cdb9eb83111b8190b0501ababfcca834c9d44d
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Sep 18 16:43:19 2019 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Sep 18 16:43:19 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=90cdb9eb
dev-qt/qtgui: adjust xcb configure options for 5.15
0. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtgui/qtgui-5.15..ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild
b/dev-qt/qtgui/qtgui-5.15..ebuild
index aa6a1274..043c53c6 100644
--- a/dev-qt/qtgui/qtgui-5.15..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15..ebuild
@@ -164,8 +164,8 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+ $(qt_use xcb)
+ $(usex xcb '-xcb-xlib' '')
)
if use libinput || use xcb; then
myconf+=( -xkbcommon )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 8a3fd32a97e417da1af359471509dfa10877402b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 21 15:45:15 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 8 11:45:31 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a3fd32a
dev-qt/qtgui: Add USE wayland
Closes: https://bugs.gentoo.org/689680
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/metadata.xml | 1 +
dev-qt/qtgui/qtgui-5.12..ebuild | 3 ++-
dev-qt/qtgui/qtgui-5.13..ebuild | 3 ++-
dev-qt/qtgui/qtgui-5..ebuild| 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index bb8d780f..74256c16 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -14,6 +14,7 @@
Enable support for input devices via
dev-libs/libinput
Enable support for touchscreen devices via
x11-libs/tslib
Build plugin to receive touch events over the
TUIO protocol
+ Provide dev-qt/qtwayland to
ensure Qt applications can be run as Wayland clients
Build the XCB platform plugin and enable X11
integration
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index 56a37349..aa6a1274 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}
"
PDEPEND="
ibus? ( app-i18n/ibus )
+ wayland? ( ~dev-qt/qtwayland-${PV} )
"
QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtgui/qtgui-5.13..ebuild
b/dev-qt/qtgui/qtgui-5.13..ebuild
index 56a37349..aa6a1274 100644
--- a/dev-qt/qtgui/qtgui-5.13..ebuild
+++ b/dev-qt/qtgui/qtgui-5.13..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}
"
PDEPEND="
ibus? ( app-i18n/ibus )
+ wayland? ( ~dev-qt/qtwayland-${PV} )
"
QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 56a37349..aa6a1274 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}
"
PDEPEND="
ibus? ( app-i18n/ibus )
+ wayland? ( ~dev-qt/qtwayland-${PV} )
"
QT5_TARGET_SUBDIRS=(
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtdatavis3d/, dev-qt/designer/, dev-qt/qtwebsockets/, ...
commit: fa9889fcef272df42a8dca5cbc0ade1706b600f8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 18 10:34:16 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 18 10:34:16 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa9889fc dev-qt: Add Qt 5.12.4 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-qt/assistant/Manifest | 1 + dev-qt/assistant/assistant-5.12.4.ebuild | 55 +++ dev-qt/designer/Manifest | 1 + dev-qt/designer/designer-5.12.4.ebuild | 57 +++ dev-qt/linguist-tools/Manifest | 1 + dev-qt/linguist-tools/linguist-tools-5.12.4.ebuild | 35 + dev-qt/linguist/Manifest | 1 + dev-qt/linguist/linguist-5.12.4.ebuild | 48 ++ dev-qt/pixeltool/Manifest | 1 + dev-qt/pixeltool/pixeltool-5.12.4.ebuild | 25 +++ dev-qt/qdbus/Manifest | 1 + dev-qt/qdbus/qdbus-5.12.4.ebuild | 25 +++ dev-qt/qdbusviewer/Manifest| 1 + dev-qt/qdbusviewer/qdbusviewer-5.12.4.ebuild | 45 ++ dev-qt/qdoc/Manifest | 1 + dev-qt/qdoc/qdoc-5.12.4.ebuild | 40 + dev-qt/qt3d/Manifest | 1 + dev-qt/qt3d/qt3d-5.12.4.ebuild | 32 dev-qt/qtbluetooth/Manifest| 1 + dev-qt/qtbluetooth/qtbluetooth-5.12.4.ebuild | 33 dev-qt/qtcharts/Manifest | 1 + dev-qt/qtcharts/qtcharts-5.12.4.ebuild | 29 dev-qt/qtconcurrent/Manifest | 1 + dev-qt/qtconcurrent/qtconcurrent-5.12.4.ebuild | 23 +++ dev-qt/qtcore/Manifest | 1 + dev-qt/qtcore/qtcore-5.12.4.ebuild | 84 ++ dev-qt/qtdatavis3d/Manifest| 1 + dev-qt/qtdatavis3d/qtdatavis3d-5.12.4.ebuild | 31 dev-qt/qtdbus/Manifest | 1 + dev-qt/qtdbus/qtdbus-5.12.4.ebuild | 43 + dev-qt/qtdeclarative/Manifest | 1 + dev-qt/qtdeclarative/qtdeclarative-5.12.4.ebuild | 53 +++ dev-qt/qtdiag/Manifest | 1 + dev-qt/qtdiag/qtdiag-5.12.4.ebuild | 36 + dev-qt/qtgamepad/Manifest | 1 + dev-qt/qtgamepad/qtgamepad-5.12.4.ebuild | 35 + dev-qt/qtgraphicaleffects/Manifest | 1 + .../qtgraphicaleffects-5.12.4.ebuild | 21 +++ dev-qt/qtgui/Manifest | 1 + dev-qt/qtgui/qtgui-5.12.4.ebuild | 173 + dev-qt/qthelp/Manifest | 1 + dev-qt/qthelp/qthelp-5.12.4.ebuild | 29 dev-qt/qtimageformats/Manifest | 1 + dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild | 29 dev-qt/qtlocation/Manifest | 1 + dev-qt/qtlocation/qtlocation-5.12.4.ebuild | 44 ++ dev-qt/qtmultimedia/Manifest | 1 + dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild | 68 dev-qt/qtnetwork/Manifest | 1 + dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild | 60 +++ dev-qt/qtnetworkauth/Manifest | 1 + dev-qt/qtnetworkauth/qtnetworkauth-5.12.4.ebuild | 20 +++ dev-qt/qtopengl/Manifest | 1 + dev-qt/qtopengl/qtopengl-5.12.4.ebuild | 34 dev-qt/qtpaths/Manifest| 1 + dev-qt/qtpaths/qtpaths-5.12.4.ebuild | 23 +++ dev-qt/qtplugininfo/Manifest | 1 + dev-qt/qtplugininfo/qtplugininfo-5.12.4.ebuild | 23 +++ dev-qt/qtpositioning/Manifest | 1 + dev-qt/qtpositioning/qtpositioning-5.12.4.ebuild | 40 + dev-qt/qtprintsupport/Manifest | 1 + dev-qt/qtprintsupport/qtprintsupport-5.12.4.ebuild | 42 + dev-qt/qtquickcontrols/Manifest| 1 + .../qtquickcontrols/qtquickcontrols-5.12.4.ebuild | 32 dev-qt/qtquickcontrols2/Manifest | 1 + .../qtquickcontrols2-5.12.4.ebuild | 30 dev-qt/qtscript/Manifest | 1 + dev-qt/qtscript/qtscript-5.12.4.ebuild | 36 + dev-qt/qtscxml/Manifest| 1 + dev-qt/qtscxml/qtscxml-5.12.4.ebuild | 19 +++ dev-qt/qtsensors/Manifest | 1 + dev-qt/qtsensors/qtsensors-5.12.4.ebuild | 28 dev-qt/qtserialbus/Manifest| 1 + dev-qt/qtserialbus/qtserialbus-5.12.4.eb
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 174602961b5f4c28bda4c1a5bf2c2fd18cbda8a8
Author: Michael Palimaka gentoo org>
AuthorDate: Sat May 18 02:38:16 2019 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat May 18 02:38:23 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=17460296
dev-qt/qtgui: add dependency on dev-util/gtk-update-icon-cache
Bug: https://bugs.gentoo.org/640020
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka gentoo.org>
dev-qt/qtgui/qtgui-5.12..ebuild | 1 +
dev-qt/qtgui/qtgui-5.13..ebuild | 1 +
dev-qt/qtgui/qtgui-5..ebuild| 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index 326ef884..e8a8655c 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="
RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
+ dev-util/gtk-update-icon-cache
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
diff --git a/dev-qt/qtgui/qtgui-5.13..ebuild
b/dev-qt/qtgui/qtgui-5.13..ebuild
index 326ef884..e8a8655c 100644
--- a/dev-qt/qtgui/qtgui-5.13..ebuild
+++ b/dev-qt/qtgui/qtgui-5.13..ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="
RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
+ dev-util/gtk-update-icon-cache
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 326ef884..e8a8655c 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="
RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
+ dev-util/gtk-update-icon-cache
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: fa12b7b7bb8b139ce5ad484d554a7fa7902d4918 Author: Davide Pesavento gentoo org> AuthorDate: Sun Mar 3 20:01:37 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Mar 3 20:01:37 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa12b7b7 dev-qt/qtgui: restore QT_FREETYPE define Bug: https://bugs.gentoo.org/678022 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-qt/qtgui/qtgui-5.12..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5.13..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5..ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild b/dev-qt/qtgui/qtgui-5.12..ebuild index d0432526..326ef884 100644 --- a/dev-qt/qtgui/qtgui-5.12..ebuild +++ b/dev-qt/qtgui/qtgui-5.12..ebuild @@ -43,7 +43,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= - x11-libs/libxkbcommon + >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) @@ -91,7 +91,7 @@ QT5_GENTOO_CONFIG=( evdev:evdev: evdev:mtdev: :fontconfig: - :system-freetype: + :system-freetype:FREETYPE !:no-freetype: !gif:no-gif: gles2::OPENGL_ES diff --git a/dev-qt/qtgui/qtgui-5.13..ebuild b/dev-qt/qtgui/qtgui-5.13..ebuild index d0432526..326ef884 100644 --- a/dev-qt/qtgui/qtgui-5.13..ebuild +++ b/dev-qt/qtgui/qtgui-5.13..ebuild @@ -43,7 +43,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= - x11-libs/libxkbcommon + >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) @@ -91,7 +91,7 @@ QT5_GENTOO_CONFIG=( evdev:evdev: evdev:mtdev: :fontconfig: - :system-freetype: + :system-freetype:FREETYPE !:no-freetype: !gif:no-gif: gles2::OPENGL_ES diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index d0432526..326ef884 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -43,7 +43,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= - x11-libs/libxkbcommon + >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) @@ -91,7 +91,7 @@ QT5_GENTOO_CONFIG=( evdev:evdev: evdev:mtdev: :fontconfig: - :system-freetype: + :system-freetype:FREETYPE !:no-freetype: !gif:no-gif: gles2::OPENGL_ES
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 3e218409c94776b00640b17192b1a787007c1053
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Jan 7 00:57:32 2019 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Jan 7 00:58:52 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e218409
dev-qt/qtgui: add := subslot dep on sys-libs/zlib
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtgui/qtgui-5.12.0.ebuild| 4 ++--
dev-qt/qtgui/qtgui-5.12..ebuild | 4 ++--
dev-qt/qtgui/qtgui-5..ebuild| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.12.0.ebuild b/dev-qt/qtgui/qtgui-5.12.0.ebuild
index c0adf667..b1ec9e40 100644
--- a/dev-qt/qtgui/qtgui-5.12.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
- >=sys-libs/zlib-1.2.5
+ sys-libs/zlib:=
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index e8a19fd9..4a416148 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
- >=sys-libs/zlib-1.2.5
+ sys-libs/zlib:=
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index e8a19fd9..4a416148 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
- >=sys-libs/zlib-1.2.5
+ sys-libs/zlib:=
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtnetwork/, dev-qt/qtcore/
commit: f0192a8ad25133375026974e056861058015abbd
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Jan 7 00:16:20 2019 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Jan 7 00:58:52 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f0192a8a
dev-qt/qt{core,gui,network}: drop several obsolete flags from qconfig.h
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtcore/qtcore-5.12.0.ebuild | 6 ++
dev-qt/qtcore/qtcore-5.12..ebuild | 6 ++
dev-qt/qtcore/qtcore-5..ebuild | 6 ++
dev-qt/qtgui/qtgui-5.12.0.ebuild| 17 -
dev-qt/qtgui/qtgui-5.12..ebuild | 17 -
dev-qt/qtgui/qtgui-5..ebuild| 17 -
dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild| 2 +-
dev-qt/qtnetwork/qtnetwork-5.12..ebuild | 2 +-
dev-qt/qtnetwork/qtnetwork-5..ebuild| 2 +-
9 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild
b/dev-qt/qtcore/qtcore-5.12.0.ebuild
index 290fc94e..f6a45867 100644
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild
@@ -56,10 +56,8 @@ src_install() {
qt5-build_src_install
local flags=(
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.12..ebuild
b/dev-qt/qtcore/qtcore-5.12..ebuild
index 290fc94e..f6a45867 100644
--- a/dev-qt/qtcore/qtcore-5.12..ebuild
+++ b/dev-qt/qtcore/qtcore-5.12..ebuild
@@ -56,10 +56,8 @@ src_install() {
qt5-build_src_install
local flags=(
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5..ebuild
b/dev-qt/qtcore/qtcore-5..ebuild
index 290fc94e..f6a45867 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -56,10 +56,8 @@ src_install() {
qt5-build_src_install
local flags=(
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtgui/qtgui-5.12.0.ebuild b/dev-qt/qtgui/qtgui-5.12.0.ebuild
index b1ec9e40..03ab3544 100644
--- a/dev-qt/qtgui/qtgui-5.12.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.0.ebuild
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=(
QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
- egl
- eglfs
+ egl:egl:
+ eglfs:eglfs:
eglfs:eglfs_egldevice:
eglfs:eglfs_gbm:
- evdev
+ evdev:evdev:
evdev:mtdev:
- :fontconfig
- :system-freetype:FREETYPE
+ :fontconfig:
+ :system-freetype:
!:no-freetype:
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
!:no-gui:
- :system-harfbuzz:HARFBUZZ
+ :system-harfbuzz:
!:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- tslib
+ tslib:tslib:
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xcb-xinput:
- xcb::XKB
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index 4a416148..b2f05a81 100644
--- a/dev-q
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: f9544410874f4ce26fcd140e1da08c7c1be2073a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 3 19:25:56 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 5 22:16:55 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f9544410
dev-qt/qtgui: bundled xkbcommon is gone, option renamed to xkbcommon
See also: https://bugreports.qt.io/browse/QTBUG-65503
Closes: https://bugs.gentoo.org/672340
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtgui/qtgui-5.12..ebuild | 11 ++-
dev-qt/qtgui/qtgui-5..ebuild| 11 ++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index 6f6d4286..e8a19fd9 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.4.1[X]
+ >=x11-libs/libxkbcommon-0.5.0[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
@@ -102,7 +102,7 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
libinput
- libinput:xkbcommon-evdev:
+ libinput:xkbcommon:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -156,14 +156,15 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon-x11 system)
$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
+ if use libinput || use xcb; then
+ myconf+=( -xkbcommon )
+ fi
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 6f6d4286..e8a19fd9 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.4.1[X]
+ >=x11-libs/libxkbcommon-0.5.0[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
@@ -102,7 +102,7 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
libinput
- libinput:xkbcommon-evdev:
+ libinput:xkbcommon:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -156,14 +156,15 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon-x11 system)
$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
+ if use libinput || use xcb; then
+ myconf+=( -xkbcommon )
+ fi
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 8f09798b3c427b6c40fc8747aa47e407381713ee
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Aug 15 13:10:29 2018 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Aug 15 13:14:43 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f09798b
dev-qt/qtgui: update 5.12 configure and dependencies
With the 'xinput2' feature replaced by 'xcb-xinput', bump
the minimum required 'x11-libs/libxcb' version, and remove
'x11-libs/libXi'.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-qt/qtgui/qtgui-5.12..ebuild | 7 +++
dev-qt/qtgui/qtgui-5..ebuild| 7 +++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.12..ebuild
b/dev-qt/qtgui/qtgui-5.12..ebuild
index c8309dc2..6f6d4286 100644
--- a/dev-qt/qtgui/qtgui-5.12..ebuild
+++ b/dev-qt/qtgui/qtgui-5.12..ebuild
@@ -54,8 +54,7 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXi-1.7.5
- >=x11-libs/libxcb-1.10:=[xkb]
+ >=x11-libs/libxcb-1.12:=[xkb]
>=x11-libs/libxkbcommon-0.4.1[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
@@ -116,7 +115,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-render:
xcb:xcb-sm:
xcb:xcb-xlib:
- xcb:xinput2:
+ xcb:xcb-xinput:
xcb::XKB
)
@@ -164,7 +163,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+ $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index c8309dc2..6f6d4286 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -54,8 +54,7 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXi-1.7.5
- >=x11-libs/libxcb-1.10:=[xkb]
+ >=x11-libs/libxcb-1.12:=[xkb]
>=x11-libs/libxkbcommon-0.4.1[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
@@ -116,7 +115,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-render:
xcb:xcb-sm:
xcb:xcb-xlib:
- xcb:xinput2:
+ xcb:xcb-xinput:
xcb::XKB
)
@@ -164,7 +163,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+ $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: ff0d3865e5f74858721db8aeb43a405d3bc7185b
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Jul 25 23:08:15 2018 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Jul 25 23:15:23 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ff0d3865
dev-qt/qtgui: sync with main Gentoo repo tree
Package-Manager: Portage-2.3.43, Repoman-2.3.10
dev-qt/qtgui/qtgui-5.11..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.11..ebuild
b/dev-qt/qtgui/qtgui-5.11..ebuild
index 034e4220..c8309dc2 100644
--- a/dev-qt/qtgui/qtgui-5.11..ebuild
+++ b/dev-qt/qtgui/qtgui-5.11..ebuild
@@ -131,7 +131,7 @@ src_prepare() {
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
- qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+ qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
qt_use_disable_mod ibus dbus \
src/plugins/platforminputcontexts/platforminputcontexts.pro
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 034e4220..c8309dc2 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -131,7 +131,7 @@ src_prepare() {
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
- qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+ qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
qt_use_disable_mod ibus dbus \
src/plugins/platforminputcontexts/platforminputcontexts.pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtpositioning/, dev-qt/qtwidgets/, dev-qt/qtwebsockets/, ...
commit: bc84cfd11c78aac61e2bee2a67e9dbdc957a0fbe Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 18 20:30:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 20 14:30:49 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc84cfd1 dev-qt: Drop Qt 5.11.0 Package-Manager: Portage-2.3.40, Repoman-2.3.9 RepoMan-Options: --force dev-qt/assistant/Manifest | 1 - dev-qt/assistant/assistant-5.11.0.ebuild | 55 - dev-qt/designer/Manifest | 1 - dev-qt/designer/designer-5.11.0.ebuild | 57 -- dev-qt/linguist-tools/Manifest | 1 - dev-qt/linguist-tools/linguist-tools-5.11.0.ebuild | 35 dev-qt/linguist/Manifest | 1 - dev-qt/linguist/linguist-5.11.0.ebuild | 48 - dev-qt/pixeltool/Manifest | 1 - dev-qt/pixeltool/pixeltool-5.11.0.ebuild | 25 --- dev-qt/qdbus/Manifest | 1 - dev-qt/qdbus/qdbus-5.11.0.ebuild | 25 --- dev-qt/qdbusviewer/Manifest| 1 - dev-qt/qdbusviewer/qdbusviewer-5.11.0.ebuild | 45 - dev-qt/qdoc/Manifest | 1 - dev-qt/qdoc/qdoc-5.11.0.ebuild | 37 dev-qt/qt3d/Manifest | 1 - dev-qt/qt3d/qt3d-5.11.0.ebuild | 32 --- dev-qt/qtbluetooth/Manifest| 1 - dev-qt/qtbluetooth/qtbluetooth-5.11.0.ebuild | 33 --- dev-qt/qtcharts/Manifest | 1 - dev-qt/qtcharts/qtcharts-5.11.0.ebuild | 29 --- dev-qt/qtconcurrent/Manifest | 1 - dev-qt/qtconcurrent/qtconcurrent-5.11.0.ebuild | 23 --- dev-qt/qtcore/Manifest | 1 - .../qtcore-5.11.0-restore-qt5_use_modules.patch| 224 - dev-qt/qtcore/qtcore-5.11.0.ebuild | 77 --- dev-qt/qtdatavis3d/Manifest| 1 - dev-qt/qtdatavis3d/qtdatavis3d-5.11.0.ebuild | 31 --- dev-qt/qtdbus/Manifest | 1 - dev-qt/qtdbus/qtdbus-5.11.0.ebuild | 43 dev-qt/qtdeclarative/Manifest | 1 - dev-qt/qtdeclarative/qtdeclarative-5.11.0.ebuild | 64 -- dev-qt/qtdiag/Manifest | 1 - dev-qt/qtdiag/qtdiag-5.11.0.ebuild | 36 dev-qt/qtgraphicaleffects/Manifest | 1 - .../qtgraphicaleffects-5.11.0.ebuild | 21 -- dev-qt/qtgui/Manifest | 1 - dev-qt/qtgui/qtgui-5.11.0.ebuild | 170 dev-qt/qthelp/Manifest | 1 - dev-qt/qthelp/qthelp-5.11.0.ebuild | 30 --- dev-qt/qtimageformats/Manifest | 1 - dev-qt/qtimageformats/qtimageformats-5.11.0.ebuild | 29 --- dev-qt/qtlocation/Manifest | 1 - dev-qt/qtlocation/qtlocation-5.11.0.ebuild | 44 dev-qt/qtmultimedia/Manifest | 1 - dev-qt/qtmultimedia/qtmultimedia-5.11.0.ebuild | 68 --- dev-qt/qtnetwork/Manifest | 1 - dev-qt/qtnetwork/qtnetwork-5.11.0.ebuild | 57 -- dev-qt/qtnetworkauth/Manifest | 1 - dev-qt/qtnetworkauth/qtnetworkauth-5.11.0.ebuild | 20 -- dev-qt/qtopengl/Manifest | 1 - dev-qt/qtopengl/qtopengl-5.11.0.ebuild | 34 dev-qt/qtpaths/Manifest| 1 - dev-qt/qtpaths/qtpaths-5.11.0.ebuild | 23 --- dev-qt/qtplugininfo/Manifest | 1 - dev-qt/qtplugininfo/qtplugininfo-5.11.0.ebuild | 23 --- dev-qt/qtpositioning/Manifest | 1 - dev-qt/qtpositioning/qtpositioning-5.11.0.ebuild | 40 dev-qt/qtprintsupport/Manifest | 1 - dev-qt/qtprintsupport/qtprintsupport-5.11.0.ebuild | 42 dev-qt/qtquickcontrols/Manifest| 1 - .../qtquickcontrols/qtquickcontrols-5.11.0.ebuild | 32 --- dev-qt/qtquickcontrols2/Manifest | 1 - .../qtquickcontrols2-5.11.0.ebuild | 30 --- dev-qt/qtscript/Manifest | 1 - dev-qt/qtscript/qtscript-5.11.0.ebuild | 36 dev-qt/qtscxml/Manifest| 1 - dev-qt/qtscxml/qtscxml-5.11.0.ebuild | 19 -- dev-qt/qtsensors/Manifest | 1 - dev-qt/qtsensors/qtsensors-5.11.0.ebuild | 28 --- dev-qt/qtserialbus/Manifest| 1 - dev-qt/qtserialbus/qtserialbus-5.11.0.ebuild | 20 -- dev-qt/qtserialport/Manifest | 1 - dev-qt/qtserialport/qtse
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 284286ed83cee8f4bc82f4f39c5a9f6e0a040a48
Author: Jimi Huotari gentoo org>
AuthorDate: Thu Mar 15 23:16:19 2018 +
Commit: Jimi Huotari gentoo org>
CommitDate: Thu Mar 15 23:17:29 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=284286ed
dev-qt/qtgui: remove a no longer needed patch from 5.11
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtgui/qtgui-5.11.0_beta2.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.11.0_beta2.ebuild
b/dev-qt/qtgui/qtgui-5.11.0_beta2.ebuild
index 1d2abec0..9c89728d 100644
--- a/dev-qt/qtgui/qtgui-5.11.0_beta2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.0_beta2.ebuild
@@ -71,8 +71,6 @@ PDEPEND="
ibus? ( app-i18n/ibus )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-opengl.patch" ) # QTBUG-66420
-
QT5_TARGET_SUBDIRS=(
src/tools/qvkgen
src/gui
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: cf7da26957813ac212494aa4c3ffdf49ee152f19
Author: Andreas Sturmlechner gmail com>
AuthorDate: Thu Feb 22 10:09:32 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 22 22:13:40 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cf7da269
dev-qt/qtgui: Drop 5.10.1 (r0)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtgui/qtgui-5.10.1.ebuild | 170 ---
1 file changed, 170 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.10.1.ebuild b/dev-qt/qtgui/qtgui-5.10.1.ebuild
deleted file mode 100644
index 56187076..
--- a/dev-qt/qtgui/qtgui-5.10.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc +xcb"
-REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
- eglfs? ( egl )
- ibus? ( dbus )
- libinput? ( udev )
- xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
- dev-libs/glib:2
- ~dev-qt/qtcore-${PV}
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
- >=sys-libs/zlib-1.2.5
- virtual/opengl
- dbus? ( ~dev-qt/qtdbus-${PV} )
- egl? ( media-libs/mesa[egl] )
- eglfs? (
- media-libs/mesa[gbm]
- x11-libs/libdrm
- )
- evdev? ( sys-libs/mtdev )
- gles2? ( media-libs/mesa[gles2] )
- jpeg? ( virtual/jpeg:0 )
- libinput? (
- dev-libs/libinput:=
- x11-libs/libxkbcommon
- )
- png? ( media-libs/libpng:0= )
- tslib? ( x11-libs/tslib )
- tuio? ( ~dev-qt/qtnetwork-${PV} )
- udev? ( virtual/libudev:= )
- vnc? ( ~dev-qt/qtnetwork-${PV} )
- xcb? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXi-1.7.5
- >=x11-libs/libxcb-1.10:=[xkb]
- >=x11-libs/libxkbcommon-0.4.1[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
-"
-DEPEND="${RDEPEND}
- evdev? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
- ibus? ( app-i18n/ibus )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/qvkgen
- src/gui
- src/openglextensions
- src/platformheaders
- src/platformsupport
- src/plugins/generic
- src/plugins/imageformats
- src/plugins/platforms
- src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
- accessibility:accessibility-atspi-bridge
- egl
- eglfs
- eglfs:eglfs_egldevice:
- eglfs:eglfs_gbm:
- evdev
- evdev:mtdev:
- :fontconfig
- :system-freetype:FREETYPE
- !:no-freetype:
- !gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
- !:no-gui:
- :system-harfbuzz:HARFBUZZ
- !:no-harfbuzz:
- jpeg:system-jpeg:IMAGEFORMAT_JPEG
- !jpeg:no-jpeg:
- libinput
- libinput:xkbcommon-evdev:
- :opengl
- png:png:
- png:system-png:IMAGEFORMAT_PNG
- !png:no-png:
- tslib
- udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xinput2:
- xcb::XKB
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :gui
-)
-
-src_prepare() {
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
- qt_use_disable_config dbus dbus \
- src/platformsupport/themes/genericunix/genericunix.pri
-
- qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
-
- qt_use_disable_mod ibus dbus \
- src/plugins/platforminputcontexts/platforminputcontexts.pro
-
- use vnc || sed -i -e '/SUBDIRS += vnc/d' \
- src/plugins/platforms/platforms.pro || die
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myconf=(
- $(usex dbus -dbus-linked '')
- $(qt_use egl)
- $(qt_use eglfs)
- $(usex eglfs '-gbm -kms' '')
- $(qt_use evdev)
- $(qt_use evdev mtdev)
- -fontconfig
- -system-freetype
- $(usex gif '' -no-gif)
- -gui
- -system-harfbuzz
- $(qt_use jpeg libj
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/, dev-qt/qtgui/
commit: aef30f8ce96a91339b398b0092b64f397fed1333
Author: Andreas Sturmlechner gmail com>
AuthorDate: Thu Feb 22 10:05:40 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 22 22:13:30 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=aef30f8c
dev-qt/qtgui: Bail if cached shader fails to load
Qt-Bug: https://bugreports.qt.io/browse/QTBUG-66420
See also: https://codereview.qt-project.org/#/c/221098
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch| 87 ++
...-5.11.0_alpha.ebuild => qtgui-5.10.1-r1.ebuild} | 4 +-
dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild | 2 +
3 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
b/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
new file mode 100644
index ..2a447414
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
@@ -0,0 +1,87 @@
+From b63aeba4a88088c7de61c1664a510c02d38ade84 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa
+Date: Fri, 16 Feb 2018 13:18:42 +0100
+Subject: [PATCH] opengl: Bail if cached shader fails to load
+
+QOpenGLProgramBinaryCache::setProgramBinary() should check
+GL_LINK_STATUS after glProgramBinary(), but doesn't.
+
+In practice, this means that SDDM is a white screen, and KDE is just
+a gray task bar.
+
+So far, Qt tries to check this using its internal ::link() function.
+But in case the cached binary fails to load, Qt currently attempts to
+link the inexistent program, resulting in a zero-length, fixed
+pipeline shader.
+
+Checking this already in ::setProgramBinary() makes the call to
+::link() superfluous, so we remove that as well.
+
+Done-with: Max Staudt
+Done-with: Michal Srb
+Done-with: Fabian Vogt
+Task-number: QTBUG-66420
+Change-Id: Iabb51d0eb2c0c16bde696efff623e57d15f28d82
+Reviewed-by: Jesus Fernandez
+Reviewed-by: Laszlo Agocs
+(cherry picked from commit fa091640134b3ff99a9eb92df8286d15203122bf)
+---
+ src/gui/opengl/qopenglprogrambinarycache.cpp | 20 ++--
+ src/gui/opengl/qopenglshaderprogram.cpp | 8 +---
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp
b/src/gui/opengl/qopenglprogrambinarycache.cpp
+index 06373e1..d16173d 100644
+--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
b/src/gui/opengl/qopenglprogrambinarycache.cpp
+@@ -161,10 +161,26 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint
programId, uint blobFormat
+ QOpenGLExtraFunctions *funcs =
QOpenGLContext::currentContext()->extraFunctions();
+ while (funcs->glGetError() != GL_NO_ERROR) { }
+ funcs->glProgramBinary(programId, blobFormat, p, blobSize);
+-int err = funcs->glGetError();
++
++GLenum err = funcs->glGetError();
++if (err != GL_NO_ERROR) {
++qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program
%u, size %d, "
++ "format 0x%x, err = 0x%x",
++programId, blobSize, blobFormat, err);
++return false;
++}
++GLint linkStatus = 0;
++funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
++if (linkStatus != GL_TRUE) {
++qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program
%u, size %d, "
++ "format 0x%x, linkStatus = 0x%x, err =
0x%x",
++programId, blobSize, blobFormat, linkStatus, err);
++return false;
++}
++
+ qCDebug(DBG_SHADER_CACHE, "Program binary set for program %u, size %d,
format 0x%x, err = 0x%x",
+ programId, blobSize, blobFormat, err);
+-return err == 0;
++return true;
+ }
+
+ #ifdef Q_OS_UNIX
+diff --git a/src/gui/opengl/qopenglshaderprogram.cpp
b/src/gui/opengl/qopenglshaderprogram.cpp
+index cc8af16..3b82bac 100644
+--- a/src/gui/opengl/qopenglshaderprogram.cpp
b/src/gui/opengl/qopenglshaderprogram.cpp
+@@ -3824,13 +3824,7 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
+ bool needsCompile = true;
+ if (binCache.load(cacheKey, q->programId())) {
+ qCDebug(DBG_SHADER_CACHE, "Program binary received from cache");
+-linkBinaryRecursion = true;
+-bool ok = q->link();
+-linkBinaryRecursion = false;
+-if (ok)
+-needsCompile = false;
+-else
+-qCDebug(DBG_SHADER_CACHE, "Link failed after glProgramBinary");
++needsCompile = false;
+ }
+
+ bool needsSave = false;
+--
+2.7.4
+
diff --git a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
b/dev-qt/qtgui/qtgui-5.10.1-r1.ebuild
similarity index 97%
copy from dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
copy to dev-qt/qtgui/qtgui-5.10.1-r1.ebuild
index 9c89728d..3ab13c62 100644
--- a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
+++ b/dev-qt/qtgui/qtgui-5.10.1-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freet
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtdeclarative/, dev-qt/qdoc/
commit: 69102d1618507b0bcf94f166ca7b01735150cdcc
Author: Jimi Huotari gentoo org>
AuthorDate: Thu Feb 22 09:54:29 2018 +
Commit: Jimi Huotari gentoo org>
CommitDate: Thu Feb 22 10:19:49 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=69102d16
dev-qt: add changes from 5. to 5.11
The 5.11. ebuilds were mistakingly created using the 5.10.
ebuilds as their base, thus missing some of the changes in 5..
Thanks to [Arfrever] for pointing it out.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild | 6 ++
dev-qt/qdoc/qdoc-5.11..ebuild | 6 ++
dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild | 8
dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild| 8
dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.11..ebuild| 2 +-
6 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
b/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
index 983d3432..61789076 100644
--- a/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.0_alpha.ebuild
@@ -15,6 +15,7 @@ IUSE="qml"
DEPEND="
~dev-qt/qtcore-${PV}
+ sys-devel/clang:=
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
@@ -27,5 +28,10 @@ src_prepare() {
qt_use_disable_mod qml qmldevtools-private \
src/qdoc/qdoc.pro
+ export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+ # this is normally loaded in qttools.pro, so skipped by using
+ # QT_TARGET_SUBDIRS causing build to fail
+ sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qdoc/qdoc-5.11..ebuild
b/dev-qt/qdoc/qdoc-5.11..ebuild
index 983d3432..61789076 100644
--- a/dev-qt/qdoc/qdoc-5.11..ebuild
+++ b/dev-qt/qdoc/qdoc-5.11..ebuild
@@ -15,6 +15,7 @@ IUSE="qml"
DEPEND="
~dev-qt/qtcore-${PV}
+ sys-devel/clang:=
qml? ( ~dev-qt/qtdeclarative-${PV} )
"
RDEPEND="${DEPEND}"
@@ -27,5 +28,10 @@ src_prepare() {
qt_use_disable_mod qml qmldevtools-private \
src/qdoc/qdoc.pro
+ export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+ # this is normally loaded in qttools.pro, so skipped by using
+ # QT_TARGET_SUBDIRS causing build to fail
+ sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
index 985b6923..0c80aec3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.0_alpha.ebuild
@@ -54,3 +54,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ -qml-debug
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild
b/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild
index 985b6923..0c80aec3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11..ebuild
@@ -54,3 +54,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ -qml-debug
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
b/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
index 56187076..9c89728d 100644
--- a/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.0_alpha.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
+ >=media-libs/harfbuzz-1.6.0:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
diff --git a/dev-qt/qtgui/qtgui-5.11..ebuild
b/dev-qt/qtgui/qtgui-5.11..ebuild
index 56187076..9c89728d 100644
--- a/dev-qt/qtgui/qtgui-5.11..ebuild
+++ b/dev-qt/qtgui/qtgui-5.11..ebuild
@@ -29,7 +29,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
+ >=media-libs/harfbuzz-1.6.0:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 16eebe06af549082a7c8f5a82203f5ef5c5b00f8
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Feb 3 03:56:32 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Feb 3 03:57:35 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=16eebe06
dev-qt/qtgui: enable gui
Since e553539e7ee050d094da9a4673b2e5ac71aae422, we started passing -no-gui so
we need to start explicitly enabling it here.
Bug: https://bugs.gentoo.org/646448
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtgui/qtgui-5.10.0.ebuild| 1 +
dev-qt/qtgui/qtgui-5.10..ebuild | 1 +
dev-qt/qtgui/qtgui-5.11..ebuild | 1 +
dev-qt/qtgui/qtgui-5.9.4.ebuild | 1 +
dev-qt/qtgui/qtgui-5.9..ebuild | 1 +
dev-qt/qtgui/qtgui-5..ebuild| 1 +
6 files changed, 6 insertions(+)
diff --git a/dev-qt/qtgui/qtgui-5.10.0.ebuild b/dev-qt/qtgui/qtgui-5.10.0.ebuild
index 0e281afe..56187076 100644
--- a/dev-qt/qtgui/qtgui-5.10.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.10.0.ebuild
@@ -153,6 +153,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
+ -gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.10..ebuild
b/dev-qt/qtgui/qtgui-5.10..ebuild
index 0e281afe..56187076 100644
--- a/dev-qt/qtgui/qtgui-5.10..ebuild
+++ b/dev-qt/qtgui/qtgui-5.10..ebuild
@@ -153,6 +153,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
+ -gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.11..ebuild
b/dev-qt/qtgui/qtgui-5.11..ebuild
index 0e281afe..56187076 100644
--- a/dev-qt/qtgui/qtgui-5.11..ebuild
+++ b/dev-qt/qtgui/qtgui-5.11..ebuild
@@ -153,6 +153,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
+ -gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.9.4.ebuild b/dev-qt/qtgui/qtgui-5.9.4.ebuild
index aeb8b422..16af003c 100644
--- a/dev-qt/qtgui/qtgui-5.9.4.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.4.ebuild
@@ -152,6 +152,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
+ -gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.9..ebuild
b/dev-qt/qtgui/qtgui-5.9..ebuild
index aeb8b422..16af003c 100644
--- a/dev-qt/qtgui/qtgui-5.9..ebuild
+++ b/dev-qt/qtgui/qtgui-5.9..ebuild
@@ -152,6 +152,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
+ -gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index a43ff0cc..9c89728d 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -153,6 +153,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
+ -gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 9f81240ffd41cda7bb75286c95bb49e8623e43de
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Jan 26 02:29:29 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Feb 2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9f81240f
dev-qt/qtgui: add QT5_GENTOO_PRIVATE_CONFIG
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtgui/qtgui-5.10.0.ebuild| 6 +-
dev-qt/qtgui/qtgui-5.10..ebuild | 6 +-
dev-qt/qtgui/qtgui-5.11..ebuild | 4
dev-qt/qtgui/qtgui-5.9.4.ebuild | 4
dev-qt/qtgui/qtgui-5.9..ebuild | 6 +-
dev-qt/qtgui/qtgui-5..ebuild| 4
6 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.10.0.ebuild b/dev-qt/qtgui/qtgui-5.10.0.ebuild
index e7b6eb22..0e281afe 100644
--- a/dev-qt/qtgui/qtgui-5.10.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -120,6 +120,10 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :gui
+)
+
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
diff --git a/dev-qt/qtgui/qtgui-5.10..ebuild
b/dev-qt/qtgui/qtgui-5.10..ebuild
index e7b6eb22..0e281afe 100644
--- a/dev-qt/qtgui/qtgui-5.10..ebuild
+++ b/dev-qt/qtgui/qtgui-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -120,6 +120,10 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :gui
+)
+
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
diff --git a/dev-qt/qtgui/qtgui-5.11..ebuild
b/dev-qt/qtgui/qtgui-5.11..ebuild
index e699a859..0e281afe 100644
--- a/dev-qt/qtgui/qtgui-5.11..ebuild
+++ b/dev-qt/qtgui/qtgui-5.11..ebuild
@@ -120,6 +120,10 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :gui
+)
+
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
diff --git a/dev-qt/qtgui/qtgui-5.9.4.ebuild b/dev-qt/qtgui/qtgui-5.9.4.ebuild
index c5c08fae..aeb8b422 100644
--- a/dev-qt/qtgui/qtgui-5.9.4.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.4.ebuild
@@ -119,6 +119,10 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :gui
+)
+
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
diff --git a/dev-qt/qtgui/qtgui-5.9..ebuild
b/dev-qt/qtgui/qtgui-5.9..ebuild
index 0e4e3eed..aeb8b422 100644
--- a/dev-qt/qtgui/qtgui-5.9..ebuild
+++ b/dev-qt/qtgui/qtgui-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -119,6 +119,10 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :gui
+)
+
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 26f4bb0b..a43ff0cc 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -120,6 +120,10 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
+QT5_GENTOO_PRIVATE_CONFIG=(
+ :gui
+)
+
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: d53ea392ebed74e67e7d46ac19060fc4d43bd29b Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 26 13:27:08 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 26 13:27:43 2018 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d53ea392 dev-qt/qtgui: raise x11-libs/libXi dependency Closes: https://bugs.gentoo.org/645790 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-qt/qtgui/qtgui-5.10.0.ebuild| 2 +- dev-qt/qtgui/qtgui-5.10..ebuild | 2 +- dev-qt/qtgui/qtgui-5.11..ebuild | 2 +- dev-qt/qtgui/qtgui-5.9.4.ebuild | 2 +- dev-qt/qtgui/qtgui-5.9..ebuild | 2 +- dev-qt/qtgui/qtgui-5..ebuild| 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.10.0.ebuild b/dev-qt/qtgui/qtgui-5.10.0.ebuild index 3cf6c9c0..e7b6eb22 100644 --- a/dev-qt/qtgui/qtgui-5.10.0.ebuild +++ b/dev-qt/qtgui/qtgui-5.10.0.ebuild @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image diff --git a/dev-qt/qtgui/qtgui-5.10..ebuild b/dev-qt/qtgui/qtgui-5.10..ebuild index 3cf6c9c0..e7b6eb22 100644 --- a/dev-qt/qtgui/qtgui-5.10..ebuild +++ b/dev-qt/qtgui/qtgui-5.10..ebuild @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image diff --git a/dev-qt/qtgui/qtgui-5.11..ebuild b/dev-qt/qtgui/qtgui-5.11..ebuild index ebdd7c12..e699a859 100644 --- a/dev-qt/qtgui/qtgui-5.11..ebuild +++ b/dev-qt/qtgui/qtgui-5.11..ebuild @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image diff --git a/dev-qt/qtgui/qtgui-5.9.4.ebuild b/dev-qt/qtgui/qtgui-5.9.4.ebuild index 812bbe83..c5c08fae 100644 --- a/dev-qt/qtgui/qtgui-5.9.4.ebuild +++ b/dev-qt/qtgui/qtgui-5.9.4.ebuild @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image diff --git a/dev-qt/qtgui/qtgui-5.9..ebuild b/dev-qt/qtgui/qtgui-5.9..ebuild index 2a71b40d..0e4e3eed 100644 --- a/dev-qt/qtgui/qtgui-5.9..ebuild +++ b/dev-qt/qtgui/qtgui-5.9..ebuild @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index de176492..26f4bb0b 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -54,7 +54,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXi-1.7.4 + >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 7560ee12b10bd9abd76020b6aea30bcb622cbc94
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Jan 1 03:09:48 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 1 03:10:07 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7560ee12
dev-qt/qtgui: raise media-libs/harfbuzz dependency
Upstream-commit: f3f4f95536133c7ec7ef27e5a8263f35cc3bc4b6
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtgui/qtgui-5..ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 3cf6c9c0..de176492 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -29,7 +29,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
+ >=media-libs/harfbuzz-1.6.0:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtcore/
commit: bb0e214e7c2d49411371432d3c95edad475df3a0 Author: Jimi Huotari gentoo org> AuthorDate: Sun Dec 10 23:42:06 2017 + Commit: Jimi Huotari gentoo org> CommitDate: Sun Dec 10 23:42:06 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bb0e214e dev-qt: move qvkgen from qtcore to qtgui Package-Manager: Portage-2.3.17, Repoman-2.3.6 dev-qt/qtcore/qtcore-5.10.0.ebuild| 1 - dev-qt/qtcore/qtcore-5.10..ebuild | 1 - dev-qt/qtcore/qtcore-5..ebuild| 1 - dev-qt/qtgui/qtgui-5.10.0.ebuild | 1 + dev-qt/qtgui/qtgui-5.10..ebuild | 1 + dev-qt/qtgui/qtgui-5..ebuild | 1 + 6 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtcore/qtcore-5.10.0.ebuild b/dev-qt/qtcore/qtcore-5.10.0.ebuild index bbe1ad96..b568c54d 100644 --- a/dev-qt/qtcore/qtcore-5.10.0.ebuild +++ b/dev-qt/qtcore/qtcore-5.10.0.ebuild @@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=( src/tools/qfloat16-tables src/corelib src/tools/qlalr - src/tools/qvkgen doc ) diff --git a/dev-qt/qtcore/qtcore-5.10..ebuild b/dev-qt/qtcore/qtcore-5.10..ebuild index bbe1ad96..b568c54d 100644 --- a/dev-qt/qtcore/qtcore-5.10..ebuild +++ b/dev-qt/qtcore/qtcore-5.10..ebuild @@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=( src/tools/qfloat16-tables src/corelib src/tools/qlalr - src/tools/qvkgen doc ) diff --git a/dev-qt/qtcore/qtcore-5..ebuild b/dev-qt/qtcore/qtcore-5..ebuild index 0dcfb236..779bc30c 100644 --- a/dev-qt/qtcore/qtcore-5..ebuild +++ b/dev-qt/qtcore/qtcore-5..ebuild @@ -31,7 +31,6 @@ QT5_TARGET_SUBDIRS=( src/tools/qfloat16-tables src/corelib src/tools/qlalr - src/tools/qvkgen doc ) diff --git a/dev-qt/qtgui/qtgui-5.10.0.ebuild b/dev-qt/qtgui/qtgui-5.10.0.ebuild index 2a71b40d..3cf6c9c0 100644 --- a/dev-qt/qtgui/qtgui-5.10.0.ebuild +++ b/dev-qt/qtgui/qtgui-5.10.0.ebuild @@ -72,6 +72,7 @@ PDEPEND=" " QT5_TARGET_SUBDIRS=( + src/tools/qvkgen src/gui src/openglextensions src/platformheaders diff --git a/dev-qt/qtgui/qtgui-5.10..ebuild b/dev-qt/qtgui/qtgui-5.10..ebuild index 2a71b40d..3cf6c9c0 100644 --- a/dev-qt/qtgui/qtgui-5.10..ebuild +++ b/dev-qt/qtgui/qtgui-5.10..ebuild @@ -72,6 +72,7 @@ PDEPEND=" " QT5_TARGET_SUBDIRS=( + src/tools/qvkgen src/gui src/openglextensions src/platformheaders diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index 2a71b40d..3cf6c9c0 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -72,6 +72,7 @@ PDEPEND=" " QT5_TARGET_SUBDIRS=( + src/tools/qvkgen src/gui src/openglextensions src/platformheaders
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 33ce515b7280346c7ebc04ab016aeb033229ab8b Author: Michael Palimaka gentoo org> AuthorDate: Tue Oct 10 11:46:43 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Oct 10 11:46:58 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=33ce515b dev-qt/qtgui: enable libinput USE flag by default dev-qt/qtwayland[libinput] is enabled by default and depends on dev-qt/qtgui[libinput], so let's avoid a USE conflict out of the box. Bug: https://bugs.gentoo.org/633884 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-qt/qtgui/qtgui-5.10..ebuild | 2 +- dev-qt/qtgui/qtgui-5.9..ebuild | 2 +- dev-qt/qtgui/qtgui-5..ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.10..ebuild b/dev-qt/qtgui/qtgui-5.10..ebuild index 53aa133b..2a71b40d 100644 --- a/dev-qt/qtgui/qtgui-5.10..ebuild +++ b/dev-qt/qtgui/qtgui-5.10..ebuild @@ -14,7 +14,7 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg libinput +png tslib tuio +udev vnc +xcb" + jpeg +libinput +png tslib tuio +udev vnc +xcb" REQUIRED_USE=" || ( eglfs xcb ) accessibility? ( dbus xcb ) diff --git a/dev-qt/qtgui/qtgui-5.9..ebuild b/dev-qt/qtgui/qtgui-5.9..ebuild index 53aa133b..2a71b40d 100644 --- a/dev-qt/qtgui/qtgui-5.9..ebuild +++ b/dev-qt/qtgui/qtgui-5.9..ebuild @@ -14,7 +14,7 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg libinput +png tslib tuio +udev vnc +xcb" + jpeg +libinput +png tslib tuio +udev vnc +xcb" REQUIRED_USE=" || ( eglfs xcb ) accessibility? ( dbus xcb ) diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index 53aa133b..2a71b40d 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -14,7 +14,7 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus - jpeg libinput +png tslib tuio +udev vnc +xcb" + jpeg +libinput +png tslib tuio +udev vnc +xcb" REQUIRED_USE=" || ( eglfs xcb ) accessibility? ( dbus xcb )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/
commit: 72ac48b12c74a3465a6f84bdf127e9b8afb4c4d9
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Oct 8 01:25:30 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Oct 8 01:51:31 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=72ac48b1
dev-qt/qtgui: remove unused patch
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch | 37 --
1 file changed, 37 deletions(-)
diff --git a/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch
b/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch
deleted file mode 100644
index 82acd839..
--- a/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Bernhard Rosenkränzer
-Date: Fri, 30 Jun 2017 15:39:01 + (+0200)
-Subject: Fix detection of AT-SPI
-X-Git-Url:
https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=386af91c57948b88ba98cb040430e4a3878e3e3b;hp=989b9da3007ff06c79ab7ee553acfce9177df5b6
-
-Fix detection of AT-SPI
-
-Building qtbase 5.9.1 on Linux always results in a build with
-accessibility support disabled.
-
-The problem is that the config option for accessibility-atspi-bridge
-checks for config.atspi, which isn't defined anywhere - it should
-check for libs.atspi (which is set if pkg-config finds atspi-2) instead.
-
-[ChangeLog][QtGui][Platform Specific Changes][Linux/XCB]
-Fixed detection of AT-SPI, allowing accessibility support to be built
-again.
-
-Task-number: QTBUG-61731
-Change-Id: If3bd5dfccda40158c566f8507e34b6877b59b6fb
-Reviewed-by: Frederik Gladhorn
-Reviewed-by: Bernhard Rosenkränzer
-
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index a2a78aa..ef7ba51 100644
a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -434,7 +434,7 @@
- "features": {
- "accessibility-atspi-bridge": {
- "label": "ATSPI Bridge",
--"condition": "features.accessibility && features.xcb &&
features.dbus && config.atspi",
-+"condition": "features.accessibility && features.xcb &&
features.dbus && libs.atspi",
- "output": [ "privateFeature", "feature" ]
- },
- "angle": {
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 359c56207c4419716bec6f80013dc31b6ee72c63 Author: Michael Palimaka gentoo org> AuthorDate: Sun Aug 27 05:46:03 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 27 05:49:57 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=359c5620 dev-qt/qtgui: remove unused local USE description Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtgui/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 4b8150c6..a18a5dcb 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -10,7 +10,6 @@ Build the EGL Full Screen/Single Surface platform plugin Enable support for input devices via evdev Use GLES 2.0 or later instead of full OpenGL - Build the GTK platform theme plugin Build a widgets style that mimics the active GTK+ theme Build the IBus input method plugin Enable support for input devices via dev-libs/libinput
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/, dev-qt/qtgui/
commit: 83c3cadf0bb3202448cf7a803a0139c34ff2b1a2
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Jul 4 12:39:19 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Jul 4 12:39:31 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=83c3cadf
dev-qt/qtgui: backport patch from upstream fixing accessibility
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch | 37 ++
dev-qt/qtgui/qtgui-5.9.1.ebuild| 2 ++
2 files changed, 39 insertions(+)
diff --git a/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch
b/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch
new file mode 100644
index ..82acd839
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.1-atspi.patch
@@ -0,0 +1,37 @@
+From: Bernhard Rosenkränzer
+Date: Fri, 30 Jun 2017 15:39:01 + (+0200)
+Subject: Fix detection of AT-SPI
+X-Git-Url:
https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=386af91c57948b88ba98cb040430e4a3878e3e3b;hp=989b9da3007ff06c79ab7ee553acfce9177df5b6
+
+Fix detection of AT-SPI
+
+Building qtbase 5.9.1 on Linux always results in a build with
+accessibility support disabled.
+
+The problem is that the config option for accessibility-atspi-bridge
+checks for config.atspi, which isn't defined anywhere - it should
+check for libs.atspi (which is set if pkg-config finds atspi-2) instead.
+
+[ChangeLog][QtGui][Platform Specific Changes][Linux/XCB]
+Fixed detection of AT-SPI, allowing accessibility support to be built
+again.
+
+Task-number: QTBUG-61731
+Change-Id: If3bd5dfccda40158c566f8507e34b6877b59b6fb
+Reviewed-by: Frederik Gladhorn
+Reviewed-by: Bernhard Rosenkränzer
+---
+
+diff --git a/src/gui/configure.json b/src/gui/configure.json
+index a2a78aa..ef7ba51 100644
+--- a/src/gui/configure.json
b/src/gui/configure.json
+@@ -434,7 +434,7 @@
+ "features": {
+ "accessibility-atspi-bridge": {
+ "label": "ATSPI Bridge",
+-"condition": "features.accessibility && features.xcb &&
features.dbus && config.atspi",
++"condition": "features.accessibility && features.xcb &&
features.dbus && libs.atspi",
+ "output": [ "privateFeature", "feature" ]
+ },
+ "angle": {
diff --git a/dev-qt/qtgui/qtgui-5.9.1.ebuild b/dev-qt/qtgui/qtgui-5.9.1.ebuild
index 53aa133b..3af03f98 100644
--- a/dev-qt/qtgui/qtgui-5.9.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.1.ebuild
@@ -71,6 +71,8 @@ PDEPEND="
ibus? ( app-i18n/ibus )
"
+PATCHES=( "${FILESDIR}/${P}-atspi.patch" )
+
QT5_TARGET_SUBDIRS=(
src/gui
src/openglextensions
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 7518ff161f46f5dd508f7b40ce07d2ecc39a44b9
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 4 13:32:30 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 4 13:32:35 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7518ff16
dev-qt/qtgui: fix build with USE="-dbus"
Gentoo-bug: 620348
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtgui/qtgui-5.9.0.ebuild| 4 ++--
dev-qt/qtgui/qtgui-5.9..ebuild | 4 ++--
dev-qt/qtgui/qtgui-5..ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.9.0.ebuild b/dev-qt/qtgui/qtgui-5.9.0.ebuild
index b328d687..53aa133b 100644
--- a/dev-qt/qtgui/qtgui-5.9.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.0.ebuild
@@ -123,8 +123,8 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config dbus dbus \
+ src/platformsupport/themes/genericunix/genericunix.pri
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
diff --git a/dev-qt/qtgui/qtgui-5.9..ebuild
b/dev-qt/qtgui/qtgui-5.9..ebuild
index b328d687..53aa133b 100644
--- a/dev-qt/qtgui/qtgui-5.9..ebuild
+++ b/dev-qt/qtgui/qtgui-5.9..ebuild
@@ -123,8 +123,8 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config dbus dbus \
+ src/platformsupport/themes/genericunix/genericunix.pri
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index b328d687..53aa133b 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -123,8 +123,8 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config dbus dbus \
+ src/platformsupport/themes/genericunix/genericunix.pri
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 13bd21aa255a68991c0dca5a2787e7973682bca0
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Mar 15 16:14:37 2017 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Apr 15 04:40:24 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=13bd21aa
dev-qt/qtgui: Stop passing -xrender to configure on {5,5.8}.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
dev-qt/qtgui/qtgui-5.8..ebuild | 6 ++
dev-qt/qtgui/qtgui-5..ebuild | 6 ++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.8..ebuild
b/dev-qt/qtgui/qtgui-5.8..ebuild
index 93dcfd12..b328d687 100644
--- a/dev-qt/qtgui/qtgui-5.8..ebuild
+++ b/dev-qt/qtgui/qtgui-5.8..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,6 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libXi-1.7.4
- x11-libs/libXrender
>=x11-libs/libxcb-1.10:=[xkb]
>=x11-libs/libxkbcommon-0.4.1[X]
x11-libs/xcb-util-image
@@ -118,7 +117,6 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
- xcb:xrender
)
src_prepare() {
@@ -160,7 +158,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
+ $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 93dcfd12..b328d687 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,6 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libXi-1.7.4
- x11-libs/libXrender
>=x11-libs/libxcb-1.10:=[xkb]
>=x11-libs/libxkbcommon-0.4.1[X]
x11-libs/xcb-util-image
@@ -118,7 +117,6 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
- xcb:xrender
)
src_prepare() {
@@ -160,7 +158,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
+ $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
)
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 2d2756f1cd50ec834b3c7dda43fde670b717ce7d Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 1 14:20:51 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 1 14:21:18 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2d2756f1 dev-qt/qtgui: gtk platform plugin was ported from 2 -> 3 Qt-Change-Id: Iacb01279b6432e0901e3bb1353d5792543cc76e4 Package-Manager: portage-2.3.2 dev-qt/qtgui/qtgui-5.7..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5.8..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5..ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.7..ebuild b/dev-qt/qtgui/qtgui-5.7..ebuild index b4e9ee6..33a8154 100644 --- a/dev-qt/qtgui/qtgui-5.7..ebuild +++ b/dev-qt/qtgui/qtgui-5.7..ebuild @@ -41,7 +41,7 @@ RDEPEND=" ) evdev? ( sys-libs/mtdev ) gtk? ( - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] @@ -104,7 +104,7 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 - gtk:gtk2: + gtk:gtk3: !:no-gui: :system-harfbuzz:HARFBUZZ !:no-harfbuzz: diff --git a/dev-qt/qtgui/qtgui-5.8..ebuild b/dev-qt/qtgui/qtgui-5.8..ebuild index 93d456c..a8baafa 100644 --- a/dev-qt/qtgui/qtgui-5.8..ebuild +++ b/dev-qt/qtgui/qtgui-5.8..ebuild @@ -41,7 +41,7 @@ RDEPEND=" ) evdev? ( sys-libs/mtdev ) gtk? ( - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] @@ -105,7 +105,7 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 - gtk:gtk2: + gtk:gtk3: !:no-gui: :system-harfbuzz:HARFBUZZ !:no-harfbuzz: diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index 93d456c..a8baafa 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -41,7 +41,7 @@ RDEPEND=" ) evdev? ( sys-libs/mtdev ) gtk? ( - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] @@ -105,7 +105,7 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 - gtk:gtk2: + gtk:gtk3: !:no-gui: :system-harfbuzz:HARFBUZZ !:no-harfbuzz:
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 3c7ccc40ac224ac086c1660342eb6f06669a402a
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Nov 30 19:37:07 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Dec 1 13:49:10 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c7ccc40
dev-qt/qtgui: fix automagic dependency
Package-Manager: portage-2.3.2
dev-qt/qtgui/qtgui-5.8..ebuild | 11 ++-
dev-qt/qtgui/qtgui-5..ebuild | 11 ++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.8..ebuild
b/dev-qt/qtgui/qtgui-5.8..ebuild
index b4e9ee6..93d456c 100644
--- a/dev-qt/qtgui/qtgui-5.8..ebuild
+++ b/dev-qt/qtgui/qtgui-5.8..ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
- ibus jpeg libinput +png tslib tuio +udev +xcb"
+ ibus jpeg libinput +png tslib tuio +udev vnc +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -56,6 +56,7 @@ RDEPEND="
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
+ vnc? ( ~dev-qt/qtnetwork-${PV} )
xcb? (
x11-libs/libICE
x11-libs/libSM
@@ -133,16 +134,16 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
- # avoid automagic dep on qtdbus
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+
qt_use_disable_mod ibus dbus \
src/plugins/platforminputcontexts/platforminputcontexts.pro
- # avoid automagic dep on qtnetwork
- use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
- src/plugins/generic/generic.pro || die
+ use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+ src/plugins/platforms/platforms.pro || die
qt5-build_src_prepare
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index b4e9ee6..93d456c 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
- ibus jpeg libinput +png tslib tuio +udev +xcb"
+ ibus jpeg libinput +png tslib tuio +udev vnc +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -56,6 +56,7 @@ RDEPEND="
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
+ vnc? ( ~dev-qt/qtnetwork-${PV} )
xcb? (
x11-libs/libICE
x11-libs/libSM
@@ -133,16 +134,16 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
- # avoid automagic dep on qtdbus
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+
qt_use_disable_mod ibus dbus \
src/plugins/platforminputcontexts/platforminputcontexts.pro
- # avoid automagic dep on qtnetwork
- use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
- src/plugins/generic/generic.pro || die
+ use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+ src/plugins/platforms/platforms.pro || die
qt5-build_src_prepare
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 4f155eb89ef45a083951a2253caf7c4ea9ff861b
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Jun 13 00:00:41 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Jun 13 00:11:05 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4f155eb8
dev-qt/qtgui: convert to usex
Package-Manager: portage-2.3.0_rc1
dev-qt/qtgui/qtgui-5.6.1.ebuild| 4 ++--
dev-qt/qtgui/qtgui-5.6..ebuild | 4 ++--
dev-qt/qtgui/qtgui-5.7.0_rc.ebuild | 4 ++--
dev-qt/qtgui/qtgui-5.7..ebuild | 4 ++--
dev-qt/qtgui/qtgui-5..ebuild | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.6.1.ebuild b/dev-qt/qtgui/qtgui-5.6.1.ebuild
index 9f7cb6d..3543876 100644
--- a/dev-qt/qtgui/qtgui-5.6.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.6.1.ebuild
@@ -152,7 +152,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
- $(use eglfs && echo -gbm -kms)
+ $(usex eglfs '-gbm -kms' '')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
@@ -169,7 +169,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+ $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild
b/dev-qt/qtgui/qtgui-5.6..ebuild
index 9f7cb6d..3543876 100644
--- a/dev-qt/qtgui/qtgui-5.6..ebuild
+++ b/dev-qt/qtgui/qtgui-5.6..ebuild
@@ -152,7 +152,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
- $(use eglfs && echo -gbm -kms)
+ $(usex eglfs '-gbm -kms' '')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
@@ -169,7 +169,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+ $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.7.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.7.0_rc.ebuild
index de5dc55..b4e9ee6 100644
--- a/dev-qt/qtgui/qtgui-5.7.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.7.0_rc.ebuild
@@ -152,7 +152,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
- $(use eglfs && echo -gbm -kms)
+ $(usex eglfs '-gbm -kms' '')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
@@ -169,7 +169,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+ $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.7..ebuild
b/dev-qt/qtgui/qtgui-5.7..ebuild
index de5dc55..b4e9ee6 100644
--- a/dev-qt/qtgui/qtgui-5.7..ebuild
+++ b/dev-qt/qtgui/qtgui-5.7..ebuild
@@ -152,7 +152,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
- $(use eglfs && echo -gbm -kms)
+ $(usex eglfs '-gbm -kms' '')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
@@ -169,7 +169,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+ $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index de5dc55..b4e9ee6 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -152,7 +152,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
- $(use eglfs && echo -gbm -kms)
+ $(usex eglfs '-gbm -kms' '')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
@@ -169,7 +169,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+ $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 61fd60ca40336d90b534330a19a7a90479d819ab
Author: Davide Pesavento gentoo org>
AuthorDate: Tue May 24 20:52:37 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue May 24 20:52:37 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=61fd60ca
dev-qt/qtgui: directfb is deprecated and will probably be removed in a future
release
http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.7&id=b94aa943f507a43f59cbc4a755d5ec7a71a50bad
Package-Manager: portage-2.3.0_rc1
dev-qt/qtgui/qtgui-5.6..ebuild | 2 +-
dev-qt/qtgui/qtgui-5.7.0_beta.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.7..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild
b/dev-qt/qtgui/qtgui-5.6..ebuild
index a1bff5f..9f7cb6d 100644
--- a/dev-qt/qtgui/qtgui-5.6..ebuild
+++ b/dev-qt/qtgui/qtgui-5.6..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
diff --git a/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
b/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
index bcd075f..de5dc55 100644
--- a/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
+++ b/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
ibus jpeg libinput +png tslib tuio +udev +xcb"
diff --git a/dev-qt/qtgui/qtgui-5.7..ebuild
b/dev-qt/qtgui/qtgui-5.7..ebuild
index bcd075f..de5dc55 100644
--- a/dev-qt/qtgui/qtgui-5.7..ebuild
+++ b/dev-qt/qtgui/qtgui-5.7..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
ibus jpeg libinput +png tslib tuio +udev +xcb"
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index bcd075f..de5dc55 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
ibus jpeg libinput +png tslib tuio +udev +xcb"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: c97b2ee08b83c40203e47fa83447b7c5c2ad543d
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Apr 23 16:11:25 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Apr 23 16:11:25 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c97b2ee0
dev-qt/qtgui: add missing xrender handling to QT5_GENTOO_CONFIG
Gentoo-Bug: 578108
Package-Manager: portage-2.2.28
dev-qt/qtgui/qtgui-5.6.0.ebuild | 1 +
dev-qt/qtgui/qtgui-5.6..ebuild | 1 +
dev-qt/qtgui/qtgui-5.7.0_beta.ebuild | 1 +
dev-qt/qtgui/qtgui-5.7..ebuild | 1 +
dev-qt/qtgui/qtgui-5..ebuild | 1 +
5 files changed, 5 insertions(+)
diff --git a/dev-qt/qtgui/qtgui-5.6.0.ebuild b/dev-qt/qtgui/qtgui-5.6.0.ebuild
index d97e413..e9c0c9b 100644
--- a/dev-qt/qtgui/qtgui-5.6.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.6.0.ebuild
@@ -126,6 +126,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
+ xcb:xrender
)
src_prepare() {
diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild
b/dev-qt/qtgui/qtgui-5.6..ebuild
index d97e413..e9c0c9b 100644
--- a/dev-qt/qtgui/qtgui-5.6..ebuild
+++ b/dev-qt/qtgui/qtgui-5.6..ebuild
@@ -126,6 +126,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
+ xcb:xrender
)
src_prepare() {
diff --git a/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
b/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
index f1c6239..3336440 100644
--- a/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
+++ b/dev-qt/qtgui/qtgui-5.7.0_beta.ebuild
@@ -126,6 +126,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
+ xcb:xrender
)
src_prepare() {
diff --git a/dev-qt/qtgui/qtgui-5.7..ebuild
b/dev-qt/qtgui/qtgui-5.7..ebuild
index f1c6239..3336440 100644
--- a/dev-qt/qtgui/qtgui-5.7..ebuild
+++ b/dev-qt/qtgui/qtgui-5.7..ebuild
@@ -126,6 +126,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
+ xcb:xrender
)
src_prepare() {
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index f1c6239..3336440 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -126,6 +126,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
+ xcb:xrender
)
src_prepare() {
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: b25641b582608ba37d210c038d0e0fc34527fa32
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jan 19 19:13:52 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jan 19 19:13:52 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b25641b5
dev-qt/qtgui: add proper support for (some) eglfs backends
Package-Manager: portage-2.2.27
dev-qt/qtgui/qtgui-5.6.0_beta.ebuild | 9 -
dev-qt/qtgui/qtgui-5.6..ebuild | 9 -
dev-qt/qtgui/qtgui-5..ebuild | 9 -
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.6.0_beta.ebuild
b/dev-qt/qtgui/qtgui-5.6.0_beta.ebuild
index 1440e1f..51d2338 100644
--- a/dev-qt/qtgui/qtgui-5.6.0_beta.ebuild
+++ b/dev-qt/qtgui/qtgui-5.6.0_beta.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, kms integration in eglfs
+# TODO: directfb, linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
@@ -35,6 +35,10 @@ RDEPEND="
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
+ eglfs? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm
+ )
evdev? ( sys-libs/mtdev )
gtkstyle? (
x11-libs/gtk+:2
@@ -89,6 +93,8 @@ QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
egl
eglfs
+ eglfs:eglfs_egldevice:
+ eglfs:eglfs_gbm:
evdev
evdev:mtdev:
:fontconfig
@@ -145,6 +151,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
+ $(use eglfs && echo -gbm -kms)
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild
b/dev-qt/qtgui/qtgui-5.6..ebuild
index 1440e1f..51d2338 100644
--- a/dev-qt/qtgui/qtgui-5.6..ebuild
+++ b/dev-qt/qtgui/qtgui-5.6..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, kms integration in eglfs
+# TODO: directfb, linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
@@ -35,6 +35,10 @@ RDEPEND="
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
+ eglfs? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm
+ )
evdev? ( sys-libs/mtdev )
gtkstyle? (
x11-libs/gtk+:2
@@ -89,6 +93,8 @@ QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
egl
eglfs
+ eglfs:eglfs_egldevice:
+ eglfs:eglfs_gbm:
evdev
evdev:mtdev:
:fontconfig
@@ -145,6 +151,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
+ $(use eglfs && echo -gbm -kms)
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index af07209..181fb24 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, kms integration in eglfs
+# TODO: directfb, linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
ibus jpeg libinput +png tslib tuio +udev +xcb"
@@ -35,6 +35,10 @@ RDEPEND="
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
+ eglfs? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm
+ )
evdev? ( sys-libs/mtdev )
gtk? (
x11-libs/gtk+:2
@@ -90,6 +94,8 @@ QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
egl
eglfs
+ eglfs:eglfs_egldevice:
+ eglfs:eglfs_gbm:
evdev
evdev:mtdev:
:fontconfig
@@ -145,6 +151,7 @@ src_configure() {
$(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
+ $(use eglfs && echo -gbm -kms)
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: b6151c6ddbf899c75c4a8f8814f010f1c5ddba79
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Dec 3 16:38:11 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Dec 3 16:38:11 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b6151c6d
dev-qt/qtgui: raise freetype dep to match bundled copy version
Package-Manager: portage-2.2.26
dev-qt/qtgui/qtgui-5.6..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild
b/dev-qt/qtgui/qtgui-5.6..ebuild
index 0309231..0313266 100644
--- a/dev-qt/qtgui/qtgui-5.6..ebuild
+++ b/dev-qt/qtgui/qtgui-5.6..ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
media-libs/fontconfig
- >=media-libs/freetype-2.5.5:2
+ >=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.0.6:=
>=sys-libs/zlib-1.2.5
virtual/opengl
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index b35f93d..2570f58 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
media-libs/fontconfig
- >=media-libs/freetype-2.5.5:2
+ >=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.0.6:=
>=sys-libs/zlib-1.2.5
virtual/opengl
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: a72a8ec8c38d26d41892efcecac3fb49f9d42bc2
Author: Jan Kundrát kde org>
AuthorDate: Thu Dec 3 15:42:25 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Dec 3 16:30:24 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a72a8ec8
dev-qt/qtgui: require new enough harfbuzz
This got changed in qtbase/5.6 in commit
4f8c75acbd7598ee5664b558293fb542817e0091.
The listed requirement is on 0.9.42, but the bundled version is 1.0.6,
and that is also the version I build-tested against in Gentoo.
dev-qt/qtgui/qtgui-5.6..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild
b/dev-qt/qtgui/qtgui-5.6..ebuild
index c406993..0309231 100644
--- a/dev-qt/qtgui/qtgui-5.6..ebuild
+++ b/dev-qt/qtgui/qtgui-5.6..ebuild
@@ -30,7 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
- >=media-libs/harfbuzz-0.9.40:=
+ >=media-libs/harfbuzz-1.0.6:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index ba372b2..b35f93d 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -30,7 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
- >=media-libs/harfbuzz-0.9.40:=
+ >=media-libs/harfbuzz-1.0.6:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: bdb5b8c8fd1a35756c6352b273e523edf047d6e8 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 29 12:49:10 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 29 12:49:53 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bdb5b8c8 dev-qt/qtgui: ensure that a GL integration plugin is always built Gentoo-bug: 563156 Package-Manager: portage-2.2.20.1 dev-qt/qtgui/qtgui-5.5..ebuild | 1 + dev-qt/qtgui/qtgui-5.6..ebuild | 1 + dev-qt/qtgui/qtgui-5..ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild b/dev-qt/qtgui/qtgui-5.5..ebuild index 507b6d3..c406993 100644 --- a/dev-qt/qtgui/qtgui-5.5..ebuild +++ b/dev-qt/qtgui/qtgui-5.5..ebuild @@ -22,6 +22,7 @@ REQUIRED_USE=" eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) + xcb? ( gles2? ( egl ) ) " RDEPEND=" diff --git a/dev-qt/qtgui/qtgui-5.6..ebuild b/dev-qt/qtgui/qtgui-5.6..ebuild index 507b6d3..c406993 100644 --- a/dev-qt/qtgui/qtgui-5.6..ebuild +++ b/dev-qt/qtgui/qtgui-5.6..ebuild @@ -22,6 +22,7 @@ REQUIRED_USE=" eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) + xcb? ( gles2? ( egl ) ) " RDEPEND=" diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index 3c23bec..ba372b2 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -22,6 +22,7 @@ REQUIRED_USE=" eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) + xcb? ( gles2? ( egl ) ) " RDEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 43208dab27ae0c8c7ac39ba321f6427721e37d03
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Jun 24 18:41:51 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Jun 24 18:41:51 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=43208dab
[dev-qt/qtgui:5] EGL doesn't really require evdev.
Package-Manager: portage-2.2.20
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 3 +--
dev-qt/qtgui/qtgui-5.5..ebuild | 3 +--
dev-qt/qtgui/qtgui-5..ebuild | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index d3c5a9f..6195f1c 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -12,14 +12,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: directfb, linuxfb, kms integration in eglfs
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
- egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index d3c5a9f..6195f1c 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -12,14 +12,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: directfb, linuxfb, kms integration in eglfs
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
- egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index d3c5a9f..6195f1c 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -12,14 +12,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb
+# TODO: directfb, linuxfb, kms integration in eglfs
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
- egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: d7d1ed0bdf6e9dc3231836bef970d2456b1b2c93 Author: Davide Pesavento gentoo org> AuthorDate: Wed Jun 24 18:14:01 2015 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Jun 24 18:14:01 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d7d1ed0b [dev-qt/qtgui:5] More accurate USE flag descriptions. Package-Manager: portage-2.2.20 dev-qt/qtgui/metadata.xml | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 9408f2d..b2868d4 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -3,16 +3,16 @@ qt - Use EGL instead of default GLX to manage OpenGL contexts - Compile EGL Full Screen/Single Surface support - Enable evdev input support + Enable EGL integration + Build the EGL Full Screen/Single Surface platform plugin + Enable support for input devices via evdev Add support for exceptions - like catching them inside the event loop (recommended by upstream) Use GLES 2.0 or later instead of full OpenGL - Enable dev-libs/glib eventloop support + Enable integration with the dev-libs/glib event loop Build a Qt style called GTK+ that mimics the active GTK+ theme Build the IBus input method plugin - Enable input device support via dev-libs/libinput + Enable support for input devices via dev-libs/libinput Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. Build the 'trace' graphicssystem engine which allows to record @@ -20,6 +20,7 @@ later with the qttracereplay tool. Enable support for touchscreen devices via x11-libs/tslib Build plugin to receive touch events over the TUIO protocol + Build the XCB platform plugin and enable X11 integration https://bugreports.qt.io/
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 9841d5388b365b55e5dc4bc65eef36e61f1b942b
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Jun 24 17:34:41 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Jun 24 17:34:41 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9841d538
[dev-qt/qtgui:5] Make sure at least one QPA platform plugin is enabled.
Package-Manager: portage-2.2.20
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 3 ++-
dev-qt/qtgui/qtgui-5.5..ebuild | 3 ++-
dev-qt/qtgui/qtgui-5..ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 5f1b27a..d3c5a9f 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -12,11 +12,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
+ || ( eglfs xcb )
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 5f1b27a..d3c5a9f 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -12,11 +12,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
+ || ( eglfs xcb )
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 5f1b27a..d3c5a9f 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -12,11 +12,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
+ || ( eglfs xcb )
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 15fbd730fa2ef85f589fb6e7c0a55436b6ea065c Author: Davide Pesavento gentoo org> AuthorDate: Wed Jun 24 17:10:28 2015 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Jun 24 17:10:28 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=15fbd730 [dev-qt/qtgui:5] Raise minimum required libXi version. In order to avoid issues with touch events, see qtbase commit 53d289ec4c0f512a3475da4bbf1f940cd6838ace Package-Manager: portage-2.2.20 dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 4 ++-- dev-qt/qtgui/qtgui-5.5..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5..ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild index 090a574..5f1b27a 100644 --- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild +++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild @@ -53,8 +53,8 @@ RDEPEND=" xcb? ( x11-libs/libICE x11-libs/libSM - >=x11-libs/libX11-1.5 - >=x11-libs/libXi-1.6 + x11-libs/libX11 + >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild b/dev-qt/qtgui/qtgui-5.5..ebuild index 090a574..5f1b27a 100644 --- a/dev-qt/qtgui/qtgui-5.5..ebuild +++ b/dev-qt/qtgui/qtgui-5.5..ebuild @@ -53,8 +53,8 @@ RDEPEND=" xcb? ( x11-libs/libICE x11-libs/libSM - >=x11-libs/libX11-1.5 - >=x11-libs/libXi-1.6 + x11-libs/libX11 + >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index 090a574..5f1b27a 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -53,8 +53,8 @@ RDEPEND=" xcb? ( x11-libs/libICE x11-libs/libSM - >=x11-libs/libX11-1.5 - >=x11-libs/libXi-1.6 + x11-libs/libX11 + >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 89a73ba1f54d7491ec8233c521ad654676fde9ec
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Jun 24 16:47:06 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Jun 24 16:47:06 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=89a73ba1
[dev-qt/qtgui:5] Remove USE=kms.
The KMS platform plugin is deprecated and replaced by eglfs.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 1 -
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 10 +-
dev-qt/qtgui/qtgui-5.5..ebuild | 10 +-
dev-qt/qtgui/qtgui-5..ebuild | 10 +-
4 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index c05ce15..9408f2d 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -12,7 +12,6 @@
Enable dev-libs/glib eventloop
support
Build a Qt style called GTK+ that mimics
the active GTK+ theme
Build the IBus input method plugin
- Build the KMS platform plugin
Enable input device support via
dev-libs/libinput
Enable the Qt3Support libraries for
Qt4. Note that
this does not mean you can compile pure Qt3 programs
with Qt4.
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 171ad0e..090a574 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -15,13 +15,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
- ibus jpeg kms libinput +png tslib tuio +udev +xcb"
+ ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
- kms? ( egl gles2 )
libinput? ( udev )
"
@@ -43,11 +42,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
- kms? (
- media-libs/mesa[gbm]
- virtual/libudev:=
- x11-libs/libdrm
- )
libinput? (
dev-libs/libinput:=
x11-libs/libxkbcommon
@@ -109,7 +103,6 @@ QT5_GENTOO_CONFIG=(
!:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
- kms:kms:
libinput
libinput:xkbcommon-evdev:
:opengl
@@ -159,7 +152,6 @@ src_configure() {
$(qt_use gtkstyle)
-system-harfbuzz
$(qt_use jpeg libjpeg system)
- $(qt_use kms)
$(qt_use libinput)
$(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 171ad0e..090a574 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -15,13 +15,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
- ibus jpeg kms libinput +png tslib tuio +udev +xcb"
+ ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
- kms? ( egl gles2 )
libinput? ( udev )
"
@@ -43,11 +42,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
- kms? (
- media-libs/mesa[gbm]
- virtual/libudev:=
- x11-libs/libdrm
- )
libinput? (
dev-libs/libinput:=
x11-libs/libxkbcommon
@@ -109,7 +103,6 @@ QT5_GENTOO_CONFIG=(
!:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
- kms:kms:
libinput
libinput:xkbcommon-evdev:
:opengl
@@ -159,7 +152,6 @@ src_configure() {
$(qt_use gtkstyle)
-system-harfbuzz
$(qt_use jpeg libjpeg system)
- $(qt_use kms)
$(qt_use libinput)
$(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 171ad0e..090a574 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -15,13 +15,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
- ibus jpeg kms libinput +png tslib tuio +udev +xcb"
+ ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
- kms? ( egl gles2 )
libinput? ( udev )
"
@@ -43,11 +42,6 @@ RDEPEND="
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: ac8227ee706bab705776681e3bd2719f297e6259
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Jun 24 16:30:06 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Jun 24 16:30:06 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ac8227ee
[dev-qt/qtgui:5] Add USE=libinput and enable udev by default.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 1 +
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 15 ---
dev-qt/qtgui/qtgui-5.5..ebuild | 15 ---
dev-qt/qtgui/qtgui-5..ebuild | 15 ---
4 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index a3505b0..539f157 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -14,6 +14,7 @@
Use media-libs/harfbuzz for
text shaping
Build the IBus input method plugin
Build the KMS platform plugin
+ Enable input device support via
dev-libs/libinput
Enable the Qt3Support libraries for
Qt4. Note that
this does not mean you can compile pure Qt3 programs
with Qt4.
Build the 'trace' graphicssystem engine
which allows to record
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 2ec9eca..a70a21d 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -12,16 +12,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
- ibus jpeg kms +png tslib tuio udev +xcb"
+ ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
kms? ( egl gles2 )
+ libinput? ( udev )
"
RDEPEND="
@@ -47,6 +48,10 @@ RDEPEND="
virtual/libudev:=
x11-libs/libdrm
)
+ libinput? (
+ dev-libs/libinput:=
+ x11-libs/libxkbcommon
+ )
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
@@ -67,7 +72,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
- test? ( ~dev-qt/qtnetwork-${PV} )
+ udev? ( sys-kernel/linux-headers )
"
PDEPEND="
ibus? ( app-i18n/ibus )
@@ -105,6 +110,8 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
+ libinput
+ libinput:xkbcommon-evdev:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -153,6 +160,8 @@ src_configure() {
$(qt_use harfbuzz harfbuzz system)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
+ $(qt_use libinput)
+ $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 2ec9eca..a70a21d 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -12,16 +12,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
- ibus jpeg kms +png tslib tuio udev +xcb"
+ ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
kms? ( egl gles2 )
+ libinput? ( udev )
"
RDEPEND="
@@ -47,6 +48,10 @@ RDEPEND="
virtual/libudev:=
x11-libs/libdrm
)
+ libinput? (
+ dev-libs/libinput:=
+ x11-libs/libxkbcommon
+ )
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
@@ -67,7 +72,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
- test? ( ~dev-qt/qtnetwork-${PV} )
+ udev? ( sys-kernel/linux-headers )
"
PDEPEND="
ibus? ( app-i18n/ibus )
@@ -105,6 +110,8 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
+ libinput
+ libinput:xkbcommon-evdev:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -153,6 +160,8 @@ src_configure() {
$(qt_use harfbuzz harfbuzz sy
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: d0167a532ebbb7d33bedfe96d7f0487168b4b360
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Jun 24 16:38:13 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Jun 24 16:38:13 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d0167a53
[dev-qt/qtgui:5] Make harfbuzz mandatory.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 1 -
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 10 +-
dev-qt/qtgui/qtgui-5.5..ebuild | 10 +-
dev-qt/qtgui/qtgui-5..ebuild | 10 +-
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 539f157..c05ce15 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -11,7 +11,6 @@
Use GLES 2.0 or later instead of full
OpenGL
Enable dev-libs/glib eventloop
support
Build a Qt style called GTK+ that mimics
the active GTK+ theme
- Use media-libs/harfbuzz for
text shaping
Build the IBus input method plugin
Build the KMS platform plugin
Enable input device support via
dev-libs/libinput
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index a70a21d..171ad0e 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
@@ -30,6 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
+ >=media-libs/harfbuzz-0.9.40:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
@@ -41,7 +42,6 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -105,8 +105,8 @@ QT5_GENTOO_CONFIG=(
gtkstyle:gtkstyle:
gtkstyle:gtk2:STYLE_GTK
!:no-gui:
- harfbuzz:system-harfbuzz:HARFBUZZ
- !harfbuzz:no-harfbuzz:
+ :system-harfbuzz:HARFBUZZ
+ !:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
@@ -157,7 +157,7 @@ src_configure() {
-system-freetype
$(usex gif '' -no-gif)
$(qt_use gtkstyle)
- $(qt_use harfbuzz harfbuzz system)
+ -system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index a70a21d..171ad0e 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
@@ -30,6 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
+ >=media-libs/harfbuzz-0.9.40:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
@@ -41,7 +42,6 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -105,8 +105,8 @@ QT5_GENTOO_CONFIG=(
gtkstyle:gtkstyle:
gtkstyle:gtk2:STYLE_GTK
!:no-gui:
- harfbuzz:system-harfbuzz:HARFBUZZ
- !harfbuzz:no-harfbuzz:
+ :system-harfbuzz:HARFBUZZ
+ !:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
@@ -157,7 +157,7 @@ src_configure() {
-system-freetype
$(usex gif '' -no-gif)
$(qt_use gtkstyle)
- $(qt_use harfbuzz harfbuzz system)
+ -system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index a70a21d..171ad0e 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+IUSE="ac
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 1b73567ccfe0be30606035104052af548223cdb8
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jun 23 20:18:40 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jun 23 20:18:40 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1b73567c
[dev-qt/qtgui:5] Add USE=tuio to disable the TuioTouch plugin.
...and avoid a qtnetwork dependency.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 7 +++
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 10 --
dev-qt/qtgui/qtgui-5.5..ebuild | 10 --
dev-qt/qtgui/qtgui-5..ebuild | 10 --
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 3ecd8fd..a3505b0 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -10,8 +10,7 @@
inside the event loop (recommended by upstream)
Use GLES 2.0 or later instead of full
OpenGL
Enable dev-libs/glib eventloop
support
- Build a Qt style called GTK+ that mimics
the active
- GTK+ theme
+ Build a Qt style called GTK+ that mimics
the active GTK+ theme
Use media-libs/harfbuzz for
text shaping
Build the IBus input method plugin
Build the KMS platform plugin
@@ -20,8 +19,8 @@
Build the 'trace' graphicssystem engine
which allows to record
all drawing operations into a trace buffer. The trace
can be replayed
later with the qttracereplay tool.
- Enable support for touchscreen devices via
- x11-libs/tslib
+ Enable support for touchscreen devices via
x11-libs/tslib
+ Build plugin to receive touch events over the
TUIO protocol
https://bugreports.qt.io/
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index e890de3..dc1a65f 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -12,9 +12,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+ ibus jpeg kms +png tslib tuio udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
@@ -48,6 +49,7 @@ RDEPEND="
)
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
+ tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -131,6 +133,10 @@ src_prepare() {
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ # avoid automagic dep on qtnetwork
+ use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+ src/plugins/generic/generic.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index e890de3..dc1a65f 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -12,9 +12,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+ ibus jpeg kms +png tslib tuio udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
@@ -48,6 +49,7 @@ RDEPEND="
)
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
+ tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -131,6 +133,10 @@ src_prepare() {
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ # avoid automagic dep on qtnetwork
+ use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+ src/plugins/generic/generic.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index e890de3..dc1a65f 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -12,9 +12,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TO
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: cc7af6de212bf63a2cf4d51a0e2ad00c4255da1e
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jun 23 20:56:01 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jun 23 20:56:01 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cc7af6de
[dev-qt/qtgui:5] Rework how we enable/disable certain plugins.
Package-Manager: portage-2.2.20
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 13 ++---
dev-qt/qtgui/qtgui-5.5..ebuild | 13 ++---
dev-qt/qtgui/qtgui-5..ebuild | 13 ++---
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index dc1a65f..2ec9eca 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/generic
src/plugins/imageformats
src/plugins/platforms
+ src/plugins/platforminputcontexts
+ src/plugins/platformthemes
)
QT5_GENTOO_CONFIG=(
@@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
-pkg_setup() {
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
- use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
- use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
-
+src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-}
-src_prepare() {
# avoid automagic dep on qtdbus
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ qt_use_disable_mod ibus dbus \
+ src/plugins/platforminputcontexts/platforminputcontexts.pro
+
# avoid automagic dep on qtnetwork
use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
src/plugins/generic/generic.pro || die
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index dc1a65f..2ec9eca 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/generic
src/plugins/imageformats
src/plugins/platforms
+ src/plugins/platforminputcontexts
+ src/plugins/platformthemes
)
QT5_GENTOO_CONFIG=(
@@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
-pkg_setup() {
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
- use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
- use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
-
+src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-}
-src_prepare() {
# avoid automagic dep on qtdbus
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ qt_use_disable_mod ibus dbus \
+ src/plugins/platforminputcontexts/platforminputcontexts.pro
+
# avoid automagic dep on qtnetwork
use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
src/plugins/generic/generic.pro || die
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index dc1a65f..2ec9eca 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/generic
src/plugins/imageformats
src/plugins/platforms
+ src/plugins/platforminputcontexts
+ src/plugins/platformthemes
)
QT5_GENTOO_CONFIG=(
@@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=(
xcb::XKB
)
-pkg_setup() {
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
- use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
- use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
-
+src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
-}
-src_prepare() {
# avoid automagic dep on qtdbus
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ qt_use_disable_mod ibus dbus \
+ src/plugins/platforminputcontexts/platforminputcontexts.pro
+
# avoid automagic dep on qtnetwork
use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
src/plugins/generic/generic.pro || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 68451d97c9bfbefa026b6cccb8fbc6426b614c90
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jun 23 16:40:49 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jun 23 16:40:49 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=68451d97
[dev-qt/qtgui:5] Add USE=tslib.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 5 +++--
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 5 -
dev-qt/qtgui/qtgui-5.5..ebuild | 5 -
dev-qt/qtgui/qtgui-5..ebuild | 5 -
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index ce6b0b5..3ecd8fd 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -17,10 +17,11 @@
Build the KMS platform plugin
Enable the Qt3Support libraries for
Qt4. Note that
this does not mean you can compile pure Qt3 programs
with Qt4.
-
- Build the 'trace' graphicssystem engine which allows to
record
+ Build the 'trace' graphicssystem engine
which allows to record
all drawing operations into a trace buffer. The trace
can be replayed
later with the qttracereplay tool.
+ Enable support for touchscreen devices via
+ x11-libs/tslib
https://bugreports.qt.io/
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index fc5f8b6..5f18a22 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
REQUIRED_USE="
egl? ( evdev )
eglfs? ( egl )
@@ -45,6 +45,7 @@ RDEPEND="
x11-libs/libdrm
)
png? ( media-libs/libpng:0= )
+ tslib? ( x11-libs/tslib )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -103,6 +104,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
+ tslib
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -140,6 +142,7 @@ src_configure() {
$(qt_use kms)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
+ $(qt_use tslib)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index fc5f8b6..5f18a22 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
REQUIRED_USE="
egl? ( evdev )
eglfs? ( egl )
@@ -45,6 +45,7 @@ RDEPEND="
x11-libs/libdrm
)
png? ( media-libs/libpng:0= )
+ tslib? ( x11-libs/tslib )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -103,6 +104,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
+ tslib
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -140,6 +142,7 @@ src_configure() {
$(qt_use kms)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
+ $(qt_use tslib)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index fc5f8b6..5f18a22 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
REQUIRED_USE="
egl? ( evdev )
eglfs? ( egl )
@@ -45,6 +45,7 @@ RDEPEND="
x11-libs/libdrm
)
png? ( media-libs/libpng:0= )
+ tslib? ( x11-libs/tslib )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -103,6 +104,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
+ tslib
udev:libudev:
xcb:xcb:
x
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: cb9be82a3738b8c2f5c6818a21997855cc68d5b1
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jun 23 17:59:13 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jun 23 17:59:13 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cb9be82a
[dev-qt/qtgui:5] Add USE=dbus to control platformsupport/dbus{menu,tray}.
Package-Manager: portage-2.2.20
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 18 +-
dev-qt/qtgui/qtgui-5.5..ebuild | 18 +-
dev-qt/qtgui/qtgui-5..ebuild | 18 +-
3 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 5f18a22..e890de3 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -14,10 +14,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
REQUIRED_USE="
+ accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
+ ibus? ( dbus )
kms? ( egl gles2 )
"
@@ -28,6 +30,7 @@ RDEPEND="
>=media-libs/freetype-2.5.5:2
>=sys-libs/zlib-1.2.5
virtual/opengl
+ dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gtkstyle? (
@@ -37,7 +40,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
- ibus? ( ~dev-qt/qtdbus-${PV} )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -59,7 +61,6 @@ RDEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
- accessibility? ( ~dev-qt/qtdbus-${PV} )
)
"
DEPEND="${RDEPEND}
@@ -125,10 +126,17 @@ pkg_setup() {
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
}
+src_prepare() {
+ # avoid automagic dep on qtdbus
+ use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
+ src/platformsupport/platformsupport.pro || die
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
- $(use accessibility && usex xcb -dbus-linked '')
- $(usex ibus -dbus-linked '')
+ $(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 5f18a22..e890de3 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -14,10 +14,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
REQUIRED_USE="
+ accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
+ ibus? ( dbus )
kms? ( egl gles2 )
"
@@ -28,6 +30,7 @@ RDEPEND="
>=media-libs/freetype-2.5.5:2
>=sys-libs/zlib-1.2.5
virtual/opengl
+ dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gtkstyle? (
@@ -37,7 +40,6 @@ RDEPEND="
)
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
- ibus? ( ~dev-qt/qtdbus-${PV} )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -59,7 +61,6 @@ RDEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
- accessibility? ( ~dev-qt/qtdbus-${PV} )
)
"
DEPEND="${RDEPEND}
@@ -125,10 +126,17 @@ pkg_setup() {
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
}
+src_prepare() {
+ # avoid automagic dep on qtdbus
+ use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
+ src/platformsupport/platformsupport.pro || die
+
+ qt5-build_src_prepare
+}
+
src_configure() {
local myconf=(
- $(use accessibility && usex xcb -dbus-linked '')
- $(usex ibus -dbus-linked '')
+ $(usex dbus -dbus-linked '')
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 5f18a22..e890de3 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -14,10 +14,12 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 3c15dd1ff1bf442d0ad2f04215625b4360d556bc
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jun 23 16:14:22 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jun 23 16:14:22 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c15dd1f
[dev-qt/qtgui] The xkbcommon flag was renamed in 5.5
Package-Manager: portage-2.2.20
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.5..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 0b7c0fb..fc5f8b6 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -142,7 +142,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon system)
+ $(qt_use xcb xkbcommon-x11 system)
$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 0b7c0fb..fc5f8b6 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -142,7 +142,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon system)
+ $(qt_use xcb xkbcommon-x11 system)
$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 0b7c0fb..fc5f8b6 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -142,7 +142,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon system)
+ $(qt_use xcb xkbcommon-x11 system)
$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: f21d5265d3895561131224eaf124c34fbc118de1
Author: Davide Pesavento gentoo org>
AuthorDate: Sun May 10 01:17:10 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun May 10 01:17:10 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f21d5265
[dev-qt/qtgui:4] Sync.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-4.8..ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-4.8..ebuild
b/dev-qt/qtgui/qtgui-4.8..ebuild
index 105f0e7..e1ee875 100644
--- a/dev-qt/qtgui/qtgui-4.8..ebuild
+++ b/dev-qt/qtgui/qtgui-4.8..ebuild
@@ -145,7 +145,6 @@ multilib_src_configure() {
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
- $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug
367045
)
qt4_multilib_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 46ccf6a756753fdb416170f96e157e722b392b89 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 19 18:10:12 2015 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 19 18:10:12 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=46ccf6a7 [dev-qt/qtgui] Improve gtkstyle-related config. Package-Manager: portage-2.2.18 dev-qt/qtgui/qtgui-5.4..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5.5..ebuild | 4 ++-- dev-qt/qtgui/qtgui-5..ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild b/dev-qt/qtgui/qtgui-5.4..ebuild index ca640d2..258663d 100644 --- a/dev-qt/qtgui/qtgui-5.4..ebuild +++ b/dev-qt/qtgui/qtgui-5.4..ebuild @@ -95,8 +95,8 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 - gtkstyle - gtkstyle:gtk2 + gtkstyle:gtkstyle: + gtkstyle:gtk2:STYLE_GTK !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz: diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild b/dev-qt/qtgui/qtgui-5.5..ebuild index 06c37c0..cc94414 100644 --- a/dev-qt/qtgui/qtgui-5.5..ebuild +++ b/dev-qt/qtgui/qtgui-5.5..ebuild @@ -95,8 +95,8 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 - gtkstyle - gtkstyle:gtk2 + gtkstyle:gtkstyle: + gtkstyle:gtk2:STYLE_GTK !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz: diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index 06c37c0..cc94414 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -95,8 +95,8 @@ QT5_GENTOO_CONFIG=( !gif:no-gif: gles2::OPENGL_ES gles2:opengles2:OPENGL_ES_2 - gtkstyle - gtkstyle:gtk2 + gtkstyle:gtkstyle: + gtkstyle:gtk2:STYLE_GTK !:no-gui: harfbuzz:system-harfbuzz:HARFBUZZ !harfbuzz:no-harfbuzz:
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 4891053988ae321f965328b7cc47406d1d8d33bf
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Apr 19 17:13:29 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Apr 19 17:13:29 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=48910539
[dev-qt/qtgui] Reorder QT5_TARGET_SUBDIRS.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-5.4..ebuild | 2 +-
dev-qt/qtgui/qtgui-5.5..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index 0ceb3e2..ca640d2 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -119,8 +119,8 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+ use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 349f7ae..c07b42e 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -119,8 +119,8 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+ use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 349f7ae..c07b42e 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -119,8 +119,8 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+ use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 44038ef2d9b125ea1512f6db2189294705063af7
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Apr 19 17:16:44 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Apr 19 17:16:44 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=44038ef2
[dev-qt/qtgui] Raise harfbuzz dep to match bundled copy version.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-5.5..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index c07b42e..06c37c0 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -40,7 +40,7 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.38:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index c07b42e..06c37c0 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -40,7 +40,7 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.38:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: eb9152725baf126b185df14a43035149bf9504ac
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Apr 19 16:47:24 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Apr 19 16:51:56 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb915272
[dev-qt/qtgui] Add gtkstyle USE flag by Harvey Mittens
riseup.net> wrt bug #526866.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-5.4..ebuild | 17 +
dev-qt/qtgui/qtgui-5.5..ebuild | 17 +
dev-qt/qtgui/qtgui-5..ebuild | 17 +
3 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index 3b2ba21..0ceb3e2 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -18,7 +18,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 +harfbuzz ibus jpeg kms +opengl
+png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +opengl +png udev +xcb"
REQUIRED_USE="
egl? ( evdev opengl )
eglfs? ( egl )
@@ -34,6 +34,11 @@ RDEPEND="
>=sys-libs/zlib-1.2.5
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
+ gtkstyle? (
+ x11-libs/gtk+:2
+ x11-libs/pango
+ !!x11-libs/cairo[qt4]
+ )
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
@@ -90,6 +95,8 @@ QT5_GENTOO_CONFIG=(
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
+ gtkstyle
+ gtkstyle:gtk2
!:no-gui:
harfbuzz:system-harfbuzz:HARFBUZZ
!harfbuzz:no-harfbuzz:
@@ -112,9 +119,10 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
- use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
- use xcb&&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+ use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
+ use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+ use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
+ use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
@@ -139,6 +147,7 @@ src_configure() {
-system-freetype
$(use gif || echo -no-gif)
${gl}
+ $(qt_use gtkstyle)
$(qt_use harfbuzz harfbuzz system)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 67f3639..349f7ae 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -18,7 +18,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 +harfbuzz ibus jpeg kms +opengl
+png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg
kms +opengl +png udev +xcb"
REQUIRED_USE="
egl? ( evdev opengl )
eglfs? ( egl )
@@ -34,6 +34,11 @@ RDEPEND="
>=sys-libs/zlib-1.2.5
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
+ gtkstyle? (
+ x11-libs/gtk+:2
+ x11-libs/pango
+ !!x11-libs/cairo[qt4]
+ )
gles2? ( media-libs/mesa[gles2] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.38:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
@@ -90,6 +95,8 @@ QT5_GENTOO_CONFIG=(
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
+ gtkstyle
+ gtkstyle:gtk2
!:no-gui:
harfbuzz:system-harfbuzz:HARFBUZZ
!harfbuzz:no-harfbuzz:
@@ -112,9 +119,10 @@ QT5_GENTOO_CONFIG=(
)
pkg_setup() {
- use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
- use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
- use xcb&&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+ use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
+ use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+ use ibus &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
+ use xcb &&
QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
@@ -139,6 +147,7 @@ src_configure() {
-system-freetype
$(u
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 9600a279595e4718c6d7c6e20cb90e3dfbe29581
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Apr 1 00:35:38 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Apr 1 00:35:38 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9600a279
[dev-qt/qtgui:4] Sync.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-4.8..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-4.8..ebuild
b/dev-qt/qtgui/qtgui-4.8..ebuild
index 5c3d48d..105f0e7 100644
--- a/dev-qt/qtgui/qtgui-4.8..ebuild
+++ b/dev-qt/qtgui/qtgui-4.8..ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
# cairo[-qt4] is needed because of bug 454066
RDEPEND="
- app-admin/eselect-qtgraphicssystem
+ app-eselect/eselect-qtgraphicssystem
~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
commit: dea72564ede66a45dd653a392a9f73f9fb637388
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Mar 26 02:53:02 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Mar 26 02:53:02 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dea72564
[dev-qt/qtgui] Remove patches already applied upstream.
Package-Manager: portage-2.2.18
...4.8.5-cleanlooks-floating-point-exception.patch | 38 ---
...gui-4.8.5-dont-crash-on-broken-GIF-images.patch | 43 --
dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch | 43 --
dev-qt/qtgui/qtgui-5.4..ebuild | 2 -
4 files changed, 126 deletions(-)
diff --git
a/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
b/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
deleted file mode 100644
index a54efef..000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0db65e148dcb4d5e5b98475f207d41a287c401a1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev
-Date: Wed, 28 May 2014 00:22:55 -0400
-Subject: [PATCH] Cleanlooks style: Fix floating point exception
-
-In QCleanlooksStyle::drawControl, if indeterminate == true and
-rect.width() == 4, we will end up with slideWidth of zero, and
-take a mod by zero when calculating the value of step.
-
-This causes a crash in Quassel 0.10; see
-https://bugs.gentoo.org/show_bug.cgi?id=507124
-
-Instead, calculate slideWidth based on max(width, minWidth) where
-minWidth was already set as 4, ensuring that slideWidth >= 2.
-
-Change-Id: I6678789105e359fa26c99409f449cad0ba3bd0ae
-(cherry picked from qtstyleplugins/8ff2ac6035fb1d01f5c0054ba14afb949410e3a7)
-Reviewed-by: Giuseppe D'Angelo
- src/gui/styles/qcleanlooksstyle.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/styles/qcleanlooksstyle.cpp
b/src/gui/styles/qcleanlooksstyle.cpp
-index 504734a..3f665ca 100644
a/src/gui/styles/qcleanlooksstyle.cpp
-+++ b/src/gui/styles/qcleanlooksstyle.cpp
-@@ -1773,7 +1773,7 @@ void QCleanlooksStyle::drawControl(ControlElement
element, const QStyleOption *o
- }
- } else {
- Q_D(const QCleanlooksStyle);
--int slideWidth = ((rect.width() - 4) * 2) / 3;
-+int slideWidth = (qMax(rect.width() - 4, minWidth) * 2) / 3;
- int step = ((d->animateStep * slideWidth) / d->animationFps)
% slideWidth;
- if d->animateStep * slideWidth) / d->animationFps) % (2 *
slideWidth)) >= slideWidth)
- step = slideWidth - step;
---
-2.0.0
-
diff --git
a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
b/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
deleted file mode 100644
index d800caf..000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001
-From: Lars Knoll
-Date: Thu, 24 Apr 2014 15:33:27 +0200
-Subject: Don't crash on broken GIF images
-
-Broken GIF images could set invalid width and height
-values inside the image, leading to Qt creating a null
-QImage for it. In that case we need to abort decoding
-the image and return an error.
-
-Initial patch by Rich Moore.
-
-Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
-Task-number: QTBUG-38367
-Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
-Security-advisory: CVE-2014-0190
-Reviewed-by: Richard J. Moore
- src/gui/image/qgifhandler.cpp | 7 +++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 3324f04..5199dd3 100644
a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar
*buffer, int length,
- memset(bits, 0, image->byteCount());
- }
-
-+// Check if the previous attempt to create the image failed.
If it
-+// did then the image is broken and we should give up.
-+if (image->isNull()) {
-+state = Error;
-+return -1;
-+}
-+
- disposePrevious(image);
- disposed = false;
-
---
-1.9.3
-
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
deleted file mode 100644
index 35c4538..000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001
-From: "Richard J. Moore"
-Date: Sat, 21 Feb 2015 17:43:21 +
-Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
-
-This fixes a division by 0 when pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: f6ff34c67ade7a3ccaa103819681dbd4b8a8dec2
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Mar 26 02:59:06 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Mar 26 02:59:06 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6ff34c6
[dev-qt/qtgui:4] Re-add forgotten QClipboard patch to live ebuild.
This has NOT been merged upstream yet.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-4.8..ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtgui/qtgui-4.8..ebuild
b/dev-qt/qtgui/qtgui-4.8..ebuild
index 99bc0eb..5c3d48d 100644
--- a/dev-qt/qtgui/qtgui-4.8..ebuild
+++ b/dev-qt/qtgui/qtgui-4.8..ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
+ "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
)
QT4_TARGET_DIRECTORIES="
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: c91634ad0380ad710ad77c0bda01d21e68dc1e3a
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Mar 26 02:12:54 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Mar 26 02:12:54 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c91634ad
[dev-qt/qtgui:4] >=cairo-1.14.2 no longer has qt4 USE flag.
Thanks to Dennis Schridde in bug 544506.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-4.8..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtgui/qtgui-4.8..ebuild
b/dev-qt/qtgui/qtgui-4.8..ebuild
index 7c504e1..99bc0eb 100644
--- a/dev-qt/qtgui/qtgui-4.8..ebuild
+++ b/dev-qt/qtgui/qtgui-4.8..ebuild
@@ -48,7 +48,7 @@ RDEPEND="
egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
gtkstyle? (
- >=x11-libs/cairo-1.12[-qt4,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}]
>=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
)
mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: d3b566bcc998771a930a7de2348ae851a3aefcd9
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Mar 26 01:36:52 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Mar 26 01:36:52 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d3b566bc
[dev-qt/qtgui:5] Raise some deps based on the version of bundled copies.
Package-Manager: portage-2.2.18
dev-qt/qtgui/qtgui-5.4..ebuild | 2 +-
dev-qt/qtgui/qtgui-5.5..ebuild | 6 +++---
dev-qt/qtgui/qtgui-5..ebuild | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index 89229f0..9184e84 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -31,7 +31,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}[debug=]
media-libs/fontconfig
media-libs/freetype:2
- sys-libs/zlib
+ >=sys-libs/zlib-1.2.5
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
diff --git a/dev-qt/qtgui/qtgui-5.5..ebuild
b/dev-qt/qtgui/qtgui-5.5..ebuild
index 514725d..67f3639 100644
--- a/dev-qt/qtgui/qtgui-5.5..ebuild
+++ b/dev-qt/qtgui/qtgui-5.5..ebuild
@@ -30,12 +30,12 @@ RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}[debug=]
media-libs/fontconfig
- media-libs/freetype:2
- sys-libs/zlib
+ >=media-libs/freetype-2.5.5:2
+ >=sys-libs/zlib-1.2.5
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.38:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 514725d..67f3639 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -30,12 +30,12 @@ RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}[debug=]
media-libs/fontconfig
- media-libs/freetype:2
- sys-libs/zlib
+ >=media-libs/freetype-2.5.5:2
+ >=sys-libs/zlib-1.2.5
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.38:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 02cbbff19c9759c8a0caf3660de5dcd336164fff Author: Davide Pesavento gentoo org> AuthorDate: Thu Mar 26 01:08:30 2015 + Commit: Davide Pesavento gentoo org> CommitDate: Thu Mar 26 01:08:30 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=02cbbff1 [dev-qt/qtgui] Sync metadata. Package-Manager: portage-2.2.18 dev-qt/qtgui/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 2f88a12..2800cc4 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -12,10 +12,7 @@ Enable dev-libs/glib eventloop support Build a Qt style called GTK+ that mimics the active GTK+ theme - Use media-libs/harfbuzz for text shaping - (experimental in Qt 5.3.x, default in Qt 5.4.0 and later). If enabled, - it can still be disabled at runtime by setting QT_HARFBUZZ environment - variable to "old". + Use media-libs/harfbuzz for text shaping Build the IBus input method plugin Build the KMS platform plugin Enable the Qt3Support libraries for Qt4. Note that
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
commit: 04813ef4c2153cb4e91af61b48561f15909527c8
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Mar 16 16:28:02 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Mar 16 16:28:02 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=04813ef4
[dev-qt/qtgui] Backport patch from upstream to solve CVE-2015-0295 wrt bug
#541972.
Package-Manager: portage-2.2.17
dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch | 43 ++
dev-qt/qtgui/qtgui-5.4..ebuild | 2 +
2 files changed, 45 insertions(+)
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
new file mode 100644
index 000..35c4538
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
@@ -0,0 +1,43 @@
+From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001
+From: "Richard J. Moore"
+Date: Sat, 21 Feb 2015 17:43:21 +
+Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
+
+This fixes a division by 0 when processing a maliciously crafted BMP
+file. No impact beyond DoS.
+
+Task-number: QTBUG-44547
+Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
+Reviewed-by: Thiago Macieira
+Reviewed-by: Oswald Buddenhagen
+---
+ src/gui/image/qbmphandler.cpp | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
+index 21c1a2f..df66499 100644
+--- a/src/gui/image/qbmphandler.cpp
b/src/gui/image/qbmphandler.cpp
+@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const
BMP_INFOHDR &bi, int offset, int
+ }
+ } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
+ red_shift = calc_shift(red_mask);
++if (((red_mask >> red_shift) + 1) == 0)
++return false;
+ red_scale = 256 / ((red_mask >> red_shift) + 1);
+ green_shift = calc_shift(green_mask);
++if (((green_mask >> green_shift) + 1) == 0)
++return false;
+ green_scale = 256 / ((green_mask >> green_shift) + 1);
+ blue_shift = calc_shift(blue_mask);
++if (((blue_mask >> blue_shift) + 1) == 0)
++return false;
+ blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
+ alpha_shift = calc_shift(alpha_mask);
++if (((alpha_mask >> alpha_shift) + 1) == 0)
++return false;
+ alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
+ } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
+ blue_mask = 0x00ff;
+--
+2.0.5
\ No newline at end of file
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index 2f62794..0618208 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -69,6 +69,8 @@ PDEPEND="
ibus? ( app-i18n/ibus )
"
+PATCHES=( "${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch" )
+
QT5_TARGET_SUBDIRS=(
src/gui
src/platformheaders
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: eba9523dbd865367cd70d8e26df18f9e3fbf8705 Author: David Heidelberger ixit cz> AuthorDate: Thu Oct 16 17:28:38 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Thu Oct 16 18:34:45 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=eba9523d [dev-qt/qtgui] add subslot operator for libxcb Prepared bump to libxcb-1.11 (in ::x11) has already subslot, because change ABI. Signed-off-by: David Heidelberger ixit.cz> --- dev-qt/qtgui/qtgui-5.3..ebuild| 2 +- dev-qt/qtgui/qtgui-5.4.0_alpha.ebuild | 2 +- dev-qt/qtgui/qtgui-5.4..ebuild| 2 +- dev-qt/qtgui/qtgui-5..ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild b/dev-qt/qtgui/qtgui-5.3..ebuild index e55118c..70c868f 100644 --- a/dev-qt/qtgui/qtgui-5.3..ebuild +++ b/dev-qt/qtgui/qtgui-5.3..ebuild @@ -52,7 +52,7 @@ RDEPEND=" >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender - >=x11-libs/libxcb-1.10[xkb] + >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms diff --git a/dev-qt/qtgui/qtgui-5.4.0_alpha.ebuild b/dev-qt/qtgui/qtgui-5.4.0_alpha.ebuild index a0e3f26..8dcc25e 100644 --- a/dev-qt/qtgui/qtgui-5.4.0_alpha.ebuild +++ b/dev-qt/qtgui/qtgui-5.4.0_alpha.ebuild @@ -52,7 +52,7 @@ RDEPEND=" >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender - >=x11-libs/libxcb-1.10[xkb] + >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild b/dev-qt/qtgui/qtgui-5.4..ebuild index a0e3f26..8dcc25e 100644 --- a/dev-qt/qtgui/qtgui-5.4..ebuild +++ b/dev-qt/qtgui/qtgui-5.4..ebuild @@ -52,7 +52,7 @@ RDEPEND=" >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender - >=x11-libs/libxcb-1.10[xkb] + >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild index a0e3f26..8dcc25e 100644 --- a/dev-qt/qtgui/qtgui-5..ebuild +++ b/dev-qt/qtgui/qtgui-5..ebuild @@ -52,7 +52,7 @@ RDEPEND=" >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender - >=x11-libs/libxcb-1.10[xkb] + >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: ec8ab0ac03a0b055e238e9ebc7c85134faf5a756
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Sep 2 03:13:35 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Sep 2 03:13:35 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ec8ab0ac
[dev-qt/qtgui:5] USE=ibus requires dbus to be enabled (bug 519860)
Package-Manager: portage-2.2.12-r1
---
dev-qt/qtgui/qtgui-5.3.1-r1.ebuild | 1 +
dev-qt/qtgui/qtgui-5.3..ebuild | 1 +
dev-qt/qtgui/qtgui-5.4..ebuild | 1 +
dev-qt/qtgui/qtgui-5..ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index 69820b5..e55118c 100644
--- a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -129,6 +129,7 @@ src_configure() {
local myconf=(
$(use accessibility && use xcb && echo -dbus-linked)
+ $(use ibus && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index 69820b5..e55118c 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -129,6 +129,7 @@ src_configure() {
local myconf=(
$(use accessibility && use xcb && echo -dbus-linked)
+ $(use ibus && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index c0777c3..a0e3f26 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -130,6 +130,7 @@ src_configure() {
local myconf=(
$(use accessibility && use xcb && echo -dbus-linked)
+ $(use ibus && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index c0777c3..a0e3f26 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -130,6 +130,7 @@ src_configure() {
local myconf=(
$(use accessibility && use xcb && echo -dbus-linked)
+ $(use ibus && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: f7586925c7d41325adcebcbdccdde69b04e0d563
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Sep 1 23:26:36 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Sep 1 23:26:36 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7586925
[dev-qt/qtgui:4] Raise minimum deps to ensure correct multilib USE deps.
Package-Manager: portage-2.2.12-r1
---
dev-qt/qtgui/qtgui-4.8.6.ebuild| 46 +++---
dev-qt/qtgui/qtgui-4.8..ebuild | 46 +++---
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index ed74f5d..825f89b 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -26,42 +26,42 @@ RDEPEND="
app-admin/eselect-qtgraphicssystem
~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
- media-libs/fontconfig[${MULTILIB_USEDEP}]
- media-libs/freetype:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
virtual/jpeg:0[${MULTILIB_USEDEP}]
!aqua? (
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
+ xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}]
)
+ xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] )
)
cups? ( net-print/cups[${MULTILIB_USEDEP}] )
egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
gtkstyle? (
- x11-libs/cairo[-qt4,${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12[-qt4,${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
)
- mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] )
- nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
+ nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
!=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
virtual/jpeg:0[${MULTILIB_USEDEP}]
!aqua? (
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.6.2-r
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: a29b141e9cfc1af1522187a1b5e6b829def0820b
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Aug 21 13:57:39 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Aug 21 13:57:39 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a29b141e
[dev-qt/qtgui:5] Raise harfbuzz dep to match bundled version.
Package-Manager: portage-2.2.12
---
dev-qt/qtgui/qtgui-5.3.1-r1.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.3..ebuild | 2 +-
dev-qt/qtgui/qtgui-5.4..ebuild | 2 +-
dev-qt/qtgui/qtgui-5..ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index f32a53a..69820b5 100644
--- a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.25:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index f32a53a..69820b5 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -35,7 +35,7 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.25:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index 213b731..c0777c3 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -35,7 +35,7 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.28:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 213b731..c0777c3 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -35,7 +35,7 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.28:= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 5bf65234b29e9a884d21ec27c6f9b673cc5e7c01
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Aug 21 10:38:18 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Aug 21 10:38:18 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5bf65234
[dev-qt/qtgui] Harfbuzz is the default shaper in 5.4
See qtbase commit 7304c9a4e800f803221f99d5768ced03ca354654
Package-Manager: portage-2.2.12
---
dev-qt/qtgui/metadata.xml | 5 +++--
dev-qt/qtgui/qtgui-5.3.1-r1.ebuild | 6 +++---
dev-qt/qtgui/qtgui-5.3..ebuild | 6 +++---
dev-qt/qtgui/qtgui-5.4..ebuild | 8
dev-qt/qtgui/qtgui-5..ebuild | 8
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 1cae8ab..6c92d3b 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -13,8 +13,9 @@
Build a Qt style called GTK+ that mimics
the active
GTK+ theme
Use media-libs/harfbuzz for
text shaping
- (EXPERIMENTAL). If enabled, it can still be disabled at
runtime by
- setting QT_HARFBUZZ environment variable to
"old".
+ (experimental in Qt 5.3.x, default in Qt 5.4.0 and
later). If enabled,
+ it can still be disabled at runtime by setting
QT_HARFBUZZ environment
+ variable to "old".
Build the IBus input method plugin
Build the KMS platform plugin
Enable the Qt3Support libraries for
Qt4. Note that
diff --git a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index 0688654..f32a53a 100644
--- a/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -35,17 +35,17 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.12:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
- virtual/libudev:0=
+ virtual/libudev:=
x11-libs/libdrm
)
opengl? ( virtual/opengl )
png? ( media-libs/libpng:0= )
- udev? ( virtual/libudev:0= )
+ udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
x11-libs/libSM
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index 0688654..f32a53a 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -35,17 +35,17 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.12:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
- virtual/libudev:0=
+ virtual/libudev:=
x11-libs/libdrm
)
opengl? ( virtual/opengl )
png? ( media-libs/libpng:0= )
- udev? ( virtual/libudev:0= )
+ udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
x11-libs/libSM
diff --git a/dev-qt/qtgui/qtgui-5.4..ebuild
b/dev-qt/qtgui/qtgui-5.4..ebuild
index a5647d9..213b731 100644
--- a/dev-qt/qtgui/qtgui-5.4..ebuild
+++ b/dev-qt/qtgui/qtgui-5.4..ebuild
@@ -18,7 +18,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 harfbuzz ibus jpeg kms +opengl
+png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 +harfbuzz ibus jpeg kms +opengl
+png udev +xcb"
REQUIRED_USE="
egl? ( evdev opengl )
eglfs? ( egl )
@@ -35,17 +35,17 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.28:= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
- virtual/libudev:0=
+ virtual/libudev:=
x11-libs/libdrm
)
opengl? ( virtual/opengl )
png? ( media-libs/libpng:0= )
- udev? ( virtual/libudev:0= )
+ udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
x11-libs/libSM
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index a5647d9..213b731 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -18,7 +18,7 @@ fi
# TODO: directfb, linuxfb, off
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtcore/, eclass/, dev-qt/qtwidgets/
commit: 5fe0e48523ce64aa2fec7f91d62ba97d20329037
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jul 29 23:39:27 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jul 29 23:39:27 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5fe0e485
[Qt5] Drop USE=glib and enable it unconditionally.
---
.../{qtcore-5.3.1.ebuild => qtcore-5.3.1-r1.ebuild} | 5 ++---
dev-qt/qtcore/qtcore-5.3..ebuild| 5 ++---
dev-qt/qtcore/qtcore-5..ebuild | 5 ++---
.../qtgui/{qtgui-5.3.1.ebuild => qtgui-5.3.1-r1.ebuild} | 7 +++
dev-qt/qtgui/qtgui-5.3..ebuild | 7 +++
dev-qt/qtgui/qtgui-5..ebuild| 7 +++
...idgets-5.3.1-r1.ebuild => qtwidgets-5.3.1-r2.ebuild} | 0
eclass/qt5-build.eclass | 17 +
8 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild
b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
similarity index 90%
rename from dev-qt/qtcore/qtcore-5.3.1.ebuild
rename to dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
index f3675ba..ab2aa2e 100644
--- a/dev-qt/qtcore/qtcore-5.3.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
@@ -16,13 +16,13 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+glib icu"
+IUSE="icu"
DEPEND="
+ dev-libs/glib:2
>=dev-libs/libpcre-8.30[pcre16]
sys-libs/zlib
virtual/libiconv
- glib? ( dev-libs/glib:2 )
icu? ( dev-libs/icu:= )
"
RDEPEND="${DEPEND}"
@@ -36,7 +36,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use glib)
$(qt_use icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.3..ebuild
b/dev-qt/qtcore/qtcore-5.3..ebuild
index f3675ba..ab2aa2e 100644
--- a/dev-qt/qtcore/qtcore-5.3..ebuild
+++ b/dev-qt/qtcore/qtcore-5.3..ebuild
@@ -16,13 +16,13 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+glib icu"
+IUSE="icu"
DEPEND="
+ dev-libs/glib:2
>=dev-libs/libpcre-8.30[pcre16]
sys-libs/zlib
virtual/libiconv
- glib? ( dev-libs/glib:2 )
icu? ( dev-libs/icu:= )
"
RDEPEND="${DEPEND}"
@@ -36,7 +36,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use glib)
$(qt_use icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5..ebuild
b/dev-qt/qtcore/qtcore-5..ebuild
index f3675ba..ab2aa2e 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -16,13 +16,13 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+glib icu"
+IUSE="icu"
DEPEND="
+ dev-libs/glib:2
>=dev-libs/libpcre-8.30[pcre16]
sys-libs/zlib
virtual/libiconv
- glib? ( dev-libs/glib:2 )
icu? ( dev-libs/icu:= )
"
RDEPEND="${DEPEND}"
@@ -36,7 +36,6 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
- $(qt_use glib)
$(qt_use icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild
b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
similarity index 94%
rename from dev-qt/qtgui/qtgui-5.3.1.ebuild
rename to dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
index a82e0eb..b76db5c 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 +glib harfbuzz ibus jpeg kms
+opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 harfbuzz ibus jpeg kms +opengl
+png udev +xcb"
REQUIRED_USE="
egl? ( evdev opengl )
eglfs? ( egl )
@@ -27,14 +27,14 @@ REQUIRED_USE="
"
RDEPEND="
- ~dev-qt/qtcore-${PV}[debug=,glib=]
+ dev-libs/glib:2
+ ~dev-qt/qtcore-${PV}[debug=]
media-libs/fontconfig
media-libs/freetype:2
sys-libs/zlib
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
gles2? ( media-libs/mesa[gles2] )
- glib? ( dev-libs/glib:2 )
harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
jpeg? ( virtual/jpeg:0 )
@@ -139,7 +139,6 @@ src_configure() {
-system-freetype
$(use gif || echo -no-gif)
${gl}
- $(qt_use glib)
$(qt_use harfbuzz harfbuzz system)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index a82e0eb..b76db5c 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -18,7 +18,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility egl eglfs evdev +gif gles2 +glib harfbuzz ibus jpeg kms
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, eclass/
commit: 4c7137e0bd7c261a323f4f8ae378ac59ba7a0a68
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Jul 29 21:45:31 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Jul 29 21:45:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4c7137e0
[qt5-build.eclass] Enable session management globally and unconditionally.
---
dev-qt/qtgui/qtgui-5.3.1.ebuild| 2 --
dev-qt/qtgui/qtgui-5.3..ebuild | 2 --
dev-qt/qtgui/qtgui-5..ebuild | 2 --
eclass/qt5-build.eclass| 6 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index d301791..a82e0eb 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -99,7 +99,6 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- ::SESSIONMANAGER
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -145,7 +144,6 @@ src_configure() {
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use png libpng system)
- -sm
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index d301791..a82e0eb 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -99,7 +99,6 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- ::SESSIONMANAGER
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -145,7 +144,6 @@ src_configure() {
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use png libpng system)
- -sm
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index d4a7bd2..abb068c 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -100,7 +100,6 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- ::SESSIONMANAGER
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -146,7 +145,6 @@ src_configure() {
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use png libpng system)
- -sm
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ed92ab5..80f4886 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -534,13 +534,17 @@ qt5_base_configure() {
# disable undocumented X11-related flags, override in qtgui
# (not shown in ./configure -help output)
- -no-sm -no-xkb -no-xrender
+ -no-xkb -no-xrender
# disable obsolete/unused X11-related flags
# (not shown in ./configure -help output)
-no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput
-no-xrandr -no-xshape -no-xsync -no-xvideo
+ # always enable session management support: it doesn't need
extra deps
+ # at configure time and turning it off is dangerous, see bug
518262
+ -sm
+
# typedef qreal to double (warning: changing this flag breaks
the ABI)
-qreal double
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 54a50878f160e4b9d77a2b97346a58f670910a62
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Jul 28 23:47:59 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Jul 28 23:47:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=54a50878
[dev-qt/qtgui:5] Fix session management support.
Enable -sm unconditionally because it's also used outside the xcb
platform plugin. The deps are left unchanged because only the plugin
links against libSM.
Package-Manager: portage-2.2.10
---
dev-qt/qtgui/qtgui-5.3.1.ebuild| 6 --
dev-qt/qtgui/qtgui-5.3..ebuild | 6 --
dev-qt/qtgui/qtgui-5..ebuild | 6 --
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index 88324f7..d301791 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -99,12 +99,13 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
+ ::SESSIONMANAGER
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
xcb:xcb-plugin:
xcb:xcb-render:
- xcb:xcb-sm:SESSIONMANAGER
+ xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
@@ -144,10 +145,11 @@ src_configure() {
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use png libpng system)
+ -sm
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
- $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index 88324f7..d301791 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -99,12 +99,13 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
+ ::SESSIONMANAGER
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
xcb:xcb-plugin:
xcb:xcb-render:
- xcb:xcb-sm:SESSIONMANAGER
+ xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
@@ -144,10 +145,11 @@ src_configure() {
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use png libpng system)
+ -sm
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
- $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 8f5e29e..d4a7bd2 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -100,12 +100,13 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
+ ::SESSIONMANAGER
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
xcb:xcb-plugin:
xcb:xcb-render:
- xcb:xcb-sm:SESSIONMANAGER
+ xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xinput2:
xcb::XKB
@@ -145,10 +146,11 @@ src_configure() {
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use png libpng system)
+ -sm
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
- $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 5fa116b5b64531687d673a31455ce252180d67d4
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Jul 28 12:55:44 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Jul 28 12:55:44 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5fa116b5
[dev-qt/qtgui:5] Fix xkb and xkbcommon support.
Package-Manager: portage-2.2.10
---
dev-qt/qtgui/qtgui-5.3.1.ebuild| 5 -
dev-qt/qtgui/qtgui-5.3..ebuild | 5 -
dev-qt/qtgui/qtgui-5..ebuild | 5 -
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index ee936d2..88324f7 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -107,6 +107,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:SESSIONMANAGER
xcb:xcb-xlib:
xcb:xinput2:
+ xcb::XKB
)
pkg_setup() {
@@ -144,7 +145,9 @@ src_configure() {
$(qt_use kms)
$(qt_use png libpng system)
$(qt_use udev libudev)
- $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index ee936d2..88324f7 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -107,6 +107,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:SESSIONMANAGER
xcb:xcb-xlib:
xcb:xinput2:
+ xcb::XKB
)
pkg_setup() {
@@ -144,7 +145,9 @@ src_configure() {
$(qt_use kms)
$(qt_use png libpng system)
$(qt_use udev libudev)
- $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index a755ca2..8f5e29e 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -108,6 +108,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:SESSIONMANAGER
xcb:xcb-xlib:
xcb:xinput2:
+ xcb::XKB
)
pkg_setup() {
@@ -145,7 +146,9 @@ src_configure() {
$(qt_use kms)
$(qt_use png libpng system)
$(qt_use udev libudev)
- $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
commit: 692d37c05ebe292513576412543214914a464391
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Jul 27 13:36:00 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Jul 27 13:36:00 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=692d37c0
[dev-qt/qtgui:5] Simplify dbus handling.
qt5_base_configure already passes -no-dbus, no need to repeat it here.
Package-Manager: portage-2.2.10
---
dev-qt/qtgui/qtgui-5.3.1.ebuild| 7 +--
dev-qt/qtgui/qtgui-5.3..ebuild | 7 +--
dev-qt/qtgui/qtgui-5..ebuild | 7 +--
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index 14c0fef..ee936d2 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -121,11 +121,6 @@ pkg_setup() {
}
src_configure() {
- local dbus="-no-dbus"
- if use accessibility && use xcb; then
- dbus="-dbus"
- fi
-
local gl="-no-opengl"
if use gles2; then
gl="-opengl es2"
@@ -134,7 +129,7 @@ src_configure() {
fi
local myconf=(
- ${dbus}
+ $(use accessibility && use xcb && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5.3..ebuild
b/dev-qt/qtgui/qtgui-5.3..ebuild
index 14c0fef..ee936d2 100644
--- a/dev-qt/qtgui/qtgui-5.3..ebuild
+++ b/dev-qt/qtgui/qtgui-5.3..ebuild
@@ -121,11 +121,6 @@ pkg_setup() {
}
src_configure() {
- local dbus="-no-dbus"
- if use accessibility && use xcb; then
- dbus="-dbus"
- fi
-
local gl="-no-opengl"
if use gles2; then
gl="-opengl es2"
@@ -134,7 +129,7 @@ src_configure() {
fi
local myconf=(
- ${dbus}
+ $(use accessibility && use xcb && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index 6bcb9f8..a755ca2 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -122,11 +122,6 @@ pkg_setup() {
}
src_configure() {
- local dbus="-no-dbus"
- if use accessibility && use xcb; then
- dbus="-dbus"
- fi
-
local gl="-no-opengl"
if use gles2; then
gl="-opengl es2"
@@ -135,7 +130,7 @@ src_configure() {
fi
local myconf=(
- ${dbus}
+ $(use accessibility && use xcb && echo -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
