summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-06-26 15:13:43 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-06-27 21:00:20 +0200
commite73cc3362d40d5fbd7d8362c4d9f49fe6933c61b (patch)
tree709775bbfe4300f91f49c6aa2b2ce2616577df61 /dev-qt/qtcore
parentdev-qt: Add Qt 5.11.1 (masked) (diff)
downloadgentoo-e73cc3362d40d5fbd7d8362c4d9f49fe6933c61b.tar.gz
gentoo-e73cc3362d40d5fbd7d8362c4d9f49fe6933c61b.tar.bz2
gentoo-e73cc3362d40d5fbd7d8362c4d9f49fe6933c61b.zip
dev-qt: Drop Qt 5.11.0_rc2
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r--dev-qt/qtcore/Manifest1
-rw-r--r--dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch224
-rw-r--r--dev-qt/qtcore/qtcore-5.11.0_rc2-r1.ebuild77
3 files changed, 0 insertions, 302 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a37a398e5e8..eedf45b0bb8 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,4 @@
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
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 3b1818d22bb..00000000000
--- 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 <kevin.funk@kdab.com>
-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 <stephen.kelly@kdab.com>
-+** 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 <QtTest>
-+#include <QWindow>
-+
-+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 <stephen.kelly@kdab.com>
-+** 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 <QtTest>
-+
-+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 52a62e65c92..00000000000
--- 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}
- !<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/qfloat16-tables
- src/corelib
- src/tools/qlalr
- doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- !:network
- !:sql
- !:testlib
- !:xml
-)
-
-PATCHES=( "${FILESDIR}/${PN}-5.11.0-restore-qt5_use_modules.patch" )
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use !icu iconv)
- $(qt_use systemd journald)
- )
- 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 WIDGETS
- 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
-}