From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C593E1396D0 for ; Fri, 8 Sep 2017 15:52:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 196C82748E9; Fri, 8 Sep 2017 15:52:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DDD322748E9 for ; Fri, 8 Sep 2017 15:52:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 551B73417CD for ; Fri, 8 Sep 2017 15:52:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4F439011 for ; Fri, 8 Sep 2017 15:52:06 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1504885918.c00c316dcf9e123f2d1eeeabd11774a8a491dafc.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/qtcore-5.10.9999.ebuild dev-qt/qtcore/qtcore-5.9.1.ebuild dev-qt/qtcore/qtcore-5.9.9999.ebuild dev-qt/qtcore/qtcore-5.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c00c316dcf9e123f2d1eeeabd11774a8a491dafc X-VCS-Branch: master Date: Fri, 8 Sep 2017 15:52:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 14ddb579-9b49-421c-b598-ba29a37c59bf X-Archives-Hash: eac137a0ce76eeb25b8640c17178be42 commit: c00c316dcf9e123f2d1eeeabd11774a8a491dafc Author: Michael Palimaka gentoo org> AuthorDate: Mon Aug 7 14:26:26 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Sep 8 15:51:58 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c00c316d dev-qt/qtcore: replicate ifdefs removed in >=5.8 Gentoo-bug: 620348 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtcore/qtcore-5.10.9999.ebuild | 22 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.9.1.ebuild | 22 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.9.9999.ebuild | 22 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.9999.ebuild | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/dev-qt/qtcore/qtcore-5.10.9999.ebuild b/dev-qt/qtcore/qtcore-5.10.9999.ebuild index 175000e7..b568c54d 100644 --- a/dev-qt/qtcore/qtcore-5.10.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.10.9999.ebuild @@ -42,3 +42,25 @@ src_configure() { ) qt5-build_src_configure } + +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 XCURSOR + XFIXES XKB XRANDR XRENDER XSYNC ZLIB + ) + + for flag in ${flags[@]}; do + cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.9.1.ebuild b/dev-qt/qtcore/qtcore-5.9.1.ebuild index 175000e7..779bc30c 100644 --- a/dev-qt/qtcore/qtcore-5.9.1.ebuild +++ b/dev-qt/qtcore/qtcore-5.9.1.ebuild @@ -42,3 +42,25 @@ src_configure() { ) qt5-build_src_configure } + +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 XCURSOR + XFIXES XKB XRANDR XRENDER XSYNC ZLIB + ) + + for flag in ${flags[@]}; do + cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.9.9999.ebuild b/dev-qt/qtcore/qtcore-5.9.9999.ebuild index 175000e7..779bc30c 100644 --- a/dev-qt/qtcore/qtcore-5.9.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9.9999.ebuild @@ -42,3 +42,25 @@ src_configure() { ) qt5-build_src_configure } + +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 XCURSOR + XFIXES XKB XRANDR XRENDER XSYNC ZLIB + ) + + for flag in ${flags[@]}; do + cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index 175000e7..779bc30c 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -42,3 +42,25 @@ src_configure() { ) qt5-build_src_configure } + +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 XCURSOR + XFIXES XKB XRANDR XRENDER XSYNC ZLIB + ) + + for flag in ${flags[@]}; do + cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +}