From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- dev-qt/qtcore/Manifest | 5 +- .../files/qtcore-5.11.2-export-qt_open64.patch | 31 +++++++++ dev-qt/qtcore/qtcore-5.11.1-r1.ebuild | 4 +- dev-qt/qtcore/qtcore-5.11.2-r1.ebuild | 79 ++++++++++++++++++++++ 4 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch create mode 100644 dev-qt/qtcore/qtcore-5.11.2-r1.ebuild (limited to 'dev-qt/qtcore') diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index dd9b263f07f9..03878fcd7466 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,6 +1,9 @@ +AUX qtcore-5.11.2-export-qt_open64.patch 1215 BLAKE2B 933cd8eeaaaab8cbc0c4ee5caa422d4a0c8b49f8de717786b7dace159c07583fc83875957cb4cc8191fa675de26773e32d7ff05b495991f639cf93eca05896d3 SHA512 60089c900a690c9f6514499ea5b54230736fb89fdddcda0bba6ccfe2cbc424a36f0fab86d7b546b92316d262c5ae31dd351535b4cc7fd4f6fdcfc403cccd7a03 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 +DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -EBUILD qtcore-5.11.1-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf +EBUILD qtcore-5.11.1-r1.ebuild 1499 BLAKE2B 801d71a80d202eb5b44d06b3f6add2af5689a068455935ee44a45438ec32308ab22bed8ce3028d56dc68665827dbea0a06804e4a0dae189fd679df30da3e324a SHA512 30b0ec962489979874e14e42ca2f77605f71128b360c44f08e0b1d00f65f43ad363e736c2332504a677d447079da3bfe7e3643f638d291aa5efea44faff9d294 +EBUILD qtcore-5.11.2-r1.ebuild 1570 BLAKE2B 9c029ee97c2d6f132cc95727106b4c07c94789a80d7dc84324852f2fb2ed7fa00773ee86ebf15ad45cba4bb7cb97e0485db91a3bd81766fa44c5a641f7a1bf30 SHA512 74e6de58a624bc8855818d2dc5c3b75e78444f042d073c5d265df92a339f998124035092c5a6370e55cfeeff56a336e22d5b92c876fc917df58f3fef11d01d59 EBUILD qtcore-5.9.6-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf EBUILD qtcore-5.9.6.ebuild 1508 BLAKE2B 34ba4a5cb00b733481fa35cb0e892f6eba653f4693d24e06f8c3dadf436255d6ab33f6327a14614453e7d88a8c4c1c988fdbc16c7690453051012215c0f50b07 SHA512 7c511688ca6323acc9d7f8e97074b69a25548a8203e2dc9c8b68a2b8c0cb6950e4e3c20fd41edc1a9dfbaa59c5394ef8f3611957624179c57ceb27a962559eaa MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666 diff --git a/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch b/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch new file mode 100644 index 000000000000..a0a6bff9f66a --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch @@ -0,0 +1,31 @@ +From 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Fri, 21 Sep 2018 09:04:24 -0700 +Subject: [PATCH] Export qt_open64 from QtCore + +Other libs use qcore_unix_p.h. + +qopenglprogrambinarycache.cpp:function QOpenGLProgramBinaryCache::load(QByteArray const&, unsigned int): error: undefined reference to 'qt_open64(char const*, int, unsigned int)' + +Change-Id: I44e7d800c68141bdaae0fffd155675d15eded2e4 +Reviewed-by: Simon Hausmann +Reviewed-by: Eric Lemanissier +--- + src/corelib/kernel/qcore_unix_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h +index cb98bef3476..5a2a29a3273 100644 +--- a/src/corelib/kernel/qcore_unix_p.h ++++ b/src/corelib/kernel/qcore_unix_p.h +@@ -178,7 +178,7 @@ inline void qt_ignore_sigpipe() + + #if defined(Q_PROCESSOR_X86_32) && defined(__GLIBC__) + # if !__GLIBC_PREREQ(2, 22) +-int qt_open64(const char *pathname, int flags, mode_t); ++Q_CORE_EXPORT int qt_open64(const char *pathname, int flags, mode_t); + # undef QT_OPEN + # define QT_OPEN qt_open64 + # endif +-- +2.16.3 diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild index c3da14471f41..beb350110d0f 100644 --- a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild +++ b/dev-qt/qtcore/qtcore-5.11.1-r1.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 @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Cross-platform application development framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" fi IUSE="icu systemd" diff --git a/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild new file mode 100644 index 000000000000..e40ed0f6f4a8 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +fi + +IUSE="icu systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${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 +} -- cgit v1.2.3