From a07defb847e34aa59146dd23b74627a31bf31c24 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Sun, 18 Mar 2018 11:16:18 -0700 Subject: dev-qt/qtgui+qtwayland: belated fixes for lto/gold Signed-off-by: Steve Arnold --- dev-qt/qtgui/Manifest | 1 + dev-qt/qtgui/qtgui-5.9.3.ebuild | 168 +++++++++++++++++++++ dev-qt/qtwayland/Manifest | 1 + .../qtwayland-5.9.3-fix-undefined-references.patch | 20 +++ dev-qt/qtwayland/qtwayland-5.9.3.ebuild | 47 ++++++ 5 files changed, 237 insertions(+) create mode 100644 dev-qt/qtgui/qtgui-5.9.3.ebuild create mode 100644 dev-qt/qtwayland/Manifest create mode 100644 dev-qt/qtwayland/files/qtwayland-5.9.3-fix-undefined-references.patch create mode 100644 dev-qt/qtwayland/qtwayland-5.9.3.ebuild diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 888774d..f74aa0e 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1 +1,2 @@ DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95 +DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed diff --git a/dev-qt/qtgui/qtgui-5.9.3.ebuild b/dev-qt/qtgui/qtgui-5.9.3.ebuild new file mode 100644 index 0000000..73b4f74 --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.9.3.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2017 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.4 + >=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/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 +) + +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 + + if [[ ${ARCH} == "arm" ]] ; then + eapply "${FILESDIR}"/${PN}-5.9.2-mkspecs-native-arm-has-neon.patch + fi + + 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) + -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 -xinput2 -xkb' '') + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest new file mode 100644 index 0000000..83e874b --- /dev/null +++ b/dev-qt/qtwayland/Manifest @@ -0,0 +1 @@ +DIST qtwayland-opensource-src-5.9.3.tar.xz 314652 SHA256 308e8c44b0ad13520868365d72786d3e3f0b384da99ee72ba543cd866f655f6d SHA512 1deb41d3a2e081fa434167211b975019840c56cbf04c8fc18325d405818c2ecee6d65c9376f498ddacc1587455d310b815d56124d6a7734b2857399abfb3b659 WHIRLPOOL d6be7509c6dcf3db4439b96ea9383323a28d18e730d0119a38761a1130418bb3438070fe4445d9eef447fda5d031b6c1685670099aaede2f76259181324a427b diff --git a/dev-qt/qtwayland/files/qtwayland-5.9.3-fix-undefined-references.patch b/dev-qt/qtwayland/files/qtwayland-5.9.3-fix-undefined-references.patch new file mode 100644 index 0000000..22e36ce --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-5.9.3-fix-undefined-references.patch @@ -0,0 +1,20 @@ +--- a/src/client/Makefile 2017-11-29 17:18:41.718068820 -0800 ++++ b/src/client/Makefile 2017-11-29 17:24:24.834304096 -0800 +@@ -44,6 +44,8 @@ + SED = sed + STRIP = armv7a-hardfloat-linux-gnueabi-strip + ++LINK_FIX_FLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs ++ + ####### Output directory + + OBJECTS_DIR = .obj/ +@@ -376,7 +378,7 @@ + ../../lib/$(TARGET): /usr/lib/libQt5FontDatabaseSupport.a /usr/lib/libQt5EventDispatcherSupport.a /usr/lib/libQt5ThemeSupport.a /usr/lib/libQt5ServiceSupport.a $(OBJECTS) $(SUBLIBS) $(OBJCOMP) + @test -d ../../lib/ || mkdir -p ../../lib/ + -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) +- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) ++ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(LINK_FIX_FLAGS) $(OBJCOMP) + -ln -s $(TARGET) $(TARGET0) + -ln -s $(TARGET) $(TARGET1) + -ln -s $(TARGET) $(TARGET2) diff --git a/dev-qt/qtwayland/qtwayland-5.9.3.ebuild b/dev-qt/qtwayland/qtwayland-5.9.3.ebuild new file mode 100644 index 0000000..4a4824e --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-5.9.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit qt5-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +fi + +IUSE="+libinput xcomposite" + +DEPEND=" + >=dev-libs/wayland-1.6.0 + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV}[egl,libinput?] + media-libs/mesa[egl] + >=x11-libs/libxkbcommon-0.2.0 + xcomposite? ( + x11-libs/libX11 + x11-libs/libXcomposite + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + qt_use_disable_config libinput xkbcommon-evdev \ + src/client/client.pro \ + src/compositor/wayland_wrapper/wayland_wrapper.pri \ + src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ + tests/auto/compositor/compositor/compositor.pro + + use xcomposite || rm -r config.tests/xcomposite || die + + qt5-build_src_prepare +} + +src_configure() { + qt5-build_src_configure + + # force workaround flags after... +# cd "${S}" && eapply "${FILESDIR}"/${P}-fix-undefined-references.patch + +} -- cgit v1.2.3-65-gdbad