From b2be182d49eea46686b5cf2680d457df61e89dc4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jun 2018 08:49:38 +0100 Subject: gentoo resync : 30.06.2018 --- dev-qt/qtcore/Manifest | 5 +- .../qtcore-5.11.0-restore-qt5_use_modules.patch | 224 --------------------- dev-qt/qtcore/qtcore-5.11.0_rc2-r1.ebuild | 77 ------- dev-qt/qtcore/qtcore-5.11.1.ebuild | 75 +++++++ 4 files changed, 77 insertions(+), 304 deletions(-) delete mode 100644 dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch delete mode 100644 dev-qt/qtcore/qtcore-5.11.0_rc2-r1.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.11.1.ebuild (limited to 'dev-qt/qtcore') diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 1db08d6bf4db..088d39eaaff6 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -2,13 +2,12 @@ AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 BLAK AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 BLAKE2B 13b105b166613516a1f86a5eb50317f0c674d2612f0c39c3e46b4f24fe924f953491f1cd56991fcbd693761075500d7c86b45c70ba213e7bd5856f1833bd1fc9 SHA512 bd63961bcb695beebe8686142b84bff7702db4d85d737f5c2da927252b931700d03602f80048223cbbb05d85a5ddb9cb818321d756577f84843690b318f0c413 AUX qtcore-4.8.7-libressl.patch 2161 BLAKE2B e6c5c494fe76840c0c3d1c7e91c72a825dd595194368af35ed824552e6e851b961a4f7242acc7982cc7b80331e4190d0544052a5aad29c3beea726306ee19c38 SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021 AUX qtcore-4.8.7-moc.patch 926 BLAKE2B 1fd7a9b6d7d69aa110761a587bbe1d13910f4537c0dd60e6f681c8242b150fc23a476d2011211565412f855bc1fb90a58e363d349bb18b40e6e299261e0a5a7a SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86 -AUX qtcore-5.11.0-restore-qt5_use_modules.patch 9037 BLAKE2B b43f173196bddc542ffe543b12ffbf89964270ee8756854c1e95892d29145516396a41d6070ce1a208bba75f0eacac499fd8462febf0b382a95cb0687ee2ef6c SHA512 0951ef38338c20957b91c34526b2d965a687b40ddeb596dd2d8525bb7e533c2e5161c5431e89b65ed1b0125b52bc3e778ab7850273788880c3d0b88088cb324d DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 -DIST qtbase-everywhere-src-5.11.0-rc2.tar.xz 46810456 BLAKE2B 4d3e0c89f828332356d8cd8f666b4973bc436a735571786ee24ee2baa3b28868007513d9937511a8262e35b3d4e2234db372b804837f0c5eeda25f4648a6ac1d SHA512 54290b950f808d2e6f3560f66b3ebe47a95a00eba163d515a34d6b17c077aa38253b0e3ebac79844ae077c8a9bc4bcb68eece21af5a9ad38a616c4151d6a98f8 +DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb EBUILD qtcore-4.8.7-r4.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875 -EBUILD qtcore-5.11.0_rc2-r1.ebuild 1575 BLAKE2B d5046f4b637594814737f2cd2246f5f3acdca3dc41d626b2d0d5790b4e59abb94053cfc1ded7e474e450c725af4baa5ef9f170d4959089c8f49078f705137eb9 SHA512 bc1b52c81652497fcf3abb37cf50ff13aa5e4c88f0d004a159776c67f51857cff89b3c1b7a333422fc7a9efd7f656f45205d2daa1e356173e17b3d7ff3c0d09c +EBUILD qtcore-5.11.1.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f EBUILD qtcore-5.9.4-r2.ebuild 1501 BLAKE2B dce6d23557075493060d6899b641e01a30423bc8bf6144c036399c41b2decba8accf17a5e7b0af61f4f85be28c7eda77093fd6b3b770cd097c0c1ecba5130563 SHA512 21d2daaae4b90d677e568e8d7ad9c43582f22fdd2589d45685426b779c5ae8b01aac06996071c317cc5c37601c9a51cb042973f6189a34b23b1af947eed3ca4e EBUILD qtcore-5.9.6.ebuild 1505 BLAKE2B ae9f8ad65f4b8eeb433cd2b544f7a69c5aee9beac809f00bf4c3241a37a411deff93f5ce6a5e7ad5dd04cc3ca570529923d5217304c268756f991d3a3a1a6952 SHA512 796e3958162b2805adbc0c227699b423a7ceaad4883b89439ff24468434195053bf3d486c1ae50dbbbf4dc485f2a9fdc4c74a3b36985c9d96dfec08e02789b2f MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb diff --git a/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch b/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch deleted file mode 100644 index 3b1818d22bbb..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch +++ /dev/null @@ -1,224 +0,0 @@ -From d1bbe4acbd8ce09f8f4263bca1aa5682c6559c23 Mon Sep 17 00:00:00 2001 -From: Kevin Funk -Date: Thu, 14 Jun 2018 14:50:39 +0200 -Subject: [PATCH] CMake: Restore qt5_use_modules() function - -It appears that in the 5 years since we deprecated this function, people -have not stopped using it. The removal of qt5_use_modules() caused lots of -troubles in packages still using it when they were compiled against Qt 5.11.0. - -Instead, let's revive this function and keep it for the Qt5 life time. - -See discussion on qt-development mailing list: - http://lists.qt-project.org/pipermail/development/2018-June/032837.html - -Change-Id: Ic263e3bb6706268cb9ea38a0711665f166a3aa9e ---- - src/corelib/Qt5CoreMacros.cmake | 51 ++++++++++++++++++++++ - tests/auto/cmake/CMakeLists.txt | 1 + - .../cmake/test_use_modules_function/CMakeLists.txt | 18 ++++++++ - .../auto/cmake/test_use_modules_function/three.cpp | 45 +++++++++++++++++++ - tests/auto/cmake/test_use_modules_function/two.cpp | 43 ++++++++++++++++++ - 5 files changed, 158 insertions(+) - create mode 100644 tests/auto/cmake/test_use_modules_function/CMakeLists.txt - create mode 100644 tests/auto/cmake/test_use_modules_function/three.cpp - create mode 100644 tests/auto/cmake/test_use_modules_function/two.cpp - -diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 1627de40029..819b48f9734 100644 ---- a/src/corelib/Qt5CoreMacros.cmake -+++ b/src/corelib/Qt5CoreMacros.cmake -@@ -294,3 +294,54 @@ function(QT5_ADD_RESOURCES outfiles ) - endfunction() - - set(_Qt5_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..") -+ -+if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) -+ macro(qt5_use_modules _target _link_type) -+ if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11) -+ if(CMAKE_WARN_DEPRECATED) -+ set(messageType WARNING) -+ endif() -+ if(CMAKE_ERROR_DEPRECATED) -+ set(messageType FATAL_ERROR) -+ endif() -+ if(messageType) -+ message(${messageType} "The qt5_use_modules macro is obsolete. Use target_link_libraries with IMPORTED targets instead.") -+ endif() -+ endif() -+ -+ if (NOT TARGET ${_target}) -+ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.") -+ endif() -+ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) -+ set(_qt5_modules ${ARGN}) -+ set(_qt5_link_type ${_link_type}) -+ else() -+ set(_qt5_modules ${_link_type} ${ARGN}) -+ endif() -+ -+ if ("${_qt5_modules}" STREQUAL "") -+ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.") -+ endif() -+ -+ foreach(_module ${_qt5_modules}) -+ if (NOT Qt5${_module}_FOUND) -+ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) -+ if (NOT Qt5${_module}_FOUND) -+ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") -+ endif() -+ endif() -+ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES}) -+ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS}) -+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS}) -+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG) -+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG) -+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG) -+ if (Qt5_POSITION_INDEPENDENT_CODE -+ AND (CMAKE_VERSION VERSION_LESS 2.8.12 -+ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" -+ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) -+ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) -+ endif() -+ endforeach() -+ endmacro() -+endif() -diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt -index f1d86570919..ec75ec7caf7 100644 ---- a/tests/auto/cmake/CMakeLists.txt -+++ b/tests/auto/cmake/CMakeLists.txt -@@ -47,6 +47,7 @@ find_package(Qt5Core REQUIRED) - - include("${_Qt5CTestMacros}") - -+expect_pass(test_use_modules_function) - expect_pass(test_umbrella_config) - expect_pass(test_wrap_cpp_and_resources) - if (NOT NO_WIDGETS) -diff --git a/tests/auto/cmake/test_use_modules_function/CMakeLists.txt b/tests/auto/cmake/test_use_modules_function/CMakeLists.txt -new file mode 100644 -index 00000000000..be05c75054c ---- /dev/null -+++ b/tests/auto/cmake/test_use_modules_function/CMakeLists.txt -@@ -0,0 +1,18 @@ -+ -+cmake_minimum_required(VERSION 2.8) -+ -+project(test_use_modules_function) -+ -+set(CMAKE_AUTOMOC ON) -+ -+set(CMAKE_INCLUDE_CURRENT_DIR ON) -+ -+add_executable(two two.cpp) -+add_executable(three three.cpp) -+ -+find_package(Qt5Core) -+ -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") -+ -+qt5_use_modules(two Test) -+qt5_use_modules(three Gui Test) -diff --git a/tests/auto/cmake/test_use_modules_function/three.cpp b/tests/auto/cmake/test_use_modules_function/three.cpp -new file mode 100644 -index 00000000000..507cc8479d0 ---- /dev/null -+++ b/tests/auto/cmake/test_use_modules_function/three.cpp -@@ -0,0 +1,45 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the test suite of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3 as published by the Free Software -+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include -+#include -+ -+class Three : public QObject -+{ -+ Q_OBJECT -+public: -+ Three(QObject *parent = 0) -+ { -+ QWindow *w = new QWindow; -+ w->show(); -+ } -+}; -+ -+QTEST_MAIN(Three) -+ -+#include "three.moc" -diff --git a/tests/auto/cmake/test_use_modules_function/two.cpp b/tests/auto/cmake/test_use_modules_function/two.cpp -new file mode 100644 -index 00000000000..44eb7fe96e3 ---- /dev/null -+++ b/tests/auto/cmake/test_use_modules_function/two.cpp -@@ -0,0 +1,43 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the test suite of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3 as published by the Free Software -+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include -+ -+class Two : public QObject -+{ -+ Q_OBJECT -+public: -+ Two(QObject *parent = 0) -+ { -+ -+ } -+}; -+ -+QTEST_MAIN(Two) -+ -+#include "two.moc" --- -2.16.3 - diff --git a/dev-qt/qtcore/qtcore-5.11.0_rc2-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.0_rc2-r1.ebuild deleted file mode 100644 index 52a62e65c926..000000000000 --- a/dev-qt/qtcore/qtcore-5.11.0_rc2-r1.ebuild +++ /dev/null @@ -1,77 +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="Cross-platform application development framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 -} diff --git a/dev-qt/qtcore/qtcore-5.11.1.ebuild b/dev-qt/qtcore/qtcore-5.11.1.ebuild new file mode 100644 index 000000000000..489161041fcf --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.11.1.ebuild @@ -0,0 +1,75 @@ +# 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="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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