From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-qt/qtwidgets/Manifest | 8 -- ...5.9.6-QDockWidget-revert-restore-geometry.patch | 115 --------------------- dev-qt/qtwidgets/metadata.xml | 20 ---- dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild | 57 ---------- dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild | 57 ---------- dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild | 59 ----------- 6 files changed, 316 deletions(-) delete mode 100644 dev-qt/qtwidgets/Manifest delete mode 100644 dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch delete mode 100644 dev-qt/qtwidgets/metadata.xml delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild (limited to 'dev-qt/qtwidgets') diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest deleted file mode 100644 index f8c7b68b376b..000000000000 --- a/dev-qt/qtwidgets/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c -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 qtwidgets-5.11.1.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476 -EBUILD qtwidgets-5.9.4-r1.ebuild 1059 BLAKE2B c1c09e2e1aa5d3634ec45185b4280a86b2b2cf2cb68f949fb7389220c0f1a112f168667b52da4e2f0f9477fd58d0da98e0acada386655ba1299824fcefccd978 SHA512 8fbef18c9dd5ec033eb53f599d1078336dc357c59e8b95e4833266f579bc4242f74755f04c4d30db0c3cf5dff94a9b1343c6aeeba6d754f25c458f3395e4cb2e -EBUILD qtwidgets-5.9.6-r1.ebuild 1136 BLAKE2B cec35fc492331334a42fb5d30f309f9a8d5a4ace395dab1aaf91e458b081f1483da867b9d4647ba54b73f81f2144e329b1b1f9e32e350e84abcd64e9b14cc6fd SHA512 e73498ea8e61ac499b583e823ddd78d3b55d3d4dc26df57ca31ccc8e51d0ba6e34b6bf4d1389796d1318a0ae821494eab68e4e09ca6c212bf69c2da2fc9c98b7 -MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192 diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch deleted file mode 100644 index 3123fc3e50f5..000000000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 57bc08dac38b02128031357976436fa0f68bd574 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 20 Jun 2018 20:18:11 +0200 -Subject: [PATCH] Revert "Fix restoring geometry of dockwidget" - -See also: Regression caused by the fix for QTBUG-16252 -QTBUG: https://bugreports.qt.io/browse/QTBUG-68939 - -This reverts commit cbfb6bda1d1ce3e169db6a0deb9bd901076653e4. ---- - src/widgets/widgets/qdockarealayout.cpp | 20 ++------------------ - src/widgets/widgets/qdockarealayout_p.h | 1 - - 2 files changed, 2 insertions(+), 19 deletions(-) - -diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp -index bef7214c75..21d1d4cb85 100644 ---- a/src/widgets/widgets/qdockarealayout.cpp -+++ b/src/widgets/widgets/qdockarealayout.cpp -@@ -226,7 +226,7 @@ static quintptr tabId(const QDockAreaLayoutItem &item) - static const int zero = 0; - - QDockAreaLayoutInfo::QDockAreaLayoutInfo() -- : restoredSizeHint(0,0), sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0) -+ : sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0) - #if QT_CONFIG(tabbar) - , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth) - #endif -@@ -236,7 +236,7 @@ QDockAreaLayoutInfo::QDockAreaLayoutInfo() - QDockAreaLayoutInfo::QDockAreaLayoutInfo(const int *_sep, QInternal::DockPosition _dockPos, - Qt::Orientation _o, int tbshape, - QMainWindow *window) -- : restoredSizeHint(0,0), sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window) -+ : sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window) - #if QT_CONFIG(tabbar) - , tabbed(false), tabBar(0), tabBarShape(static_cast(tbshape)) - #endif -@@ -407,9 +407,6 @@ QSize QDockAreaLayoutInfo::sizeHint() const - if (isEmpty()) - return QSize(0, 0); - -- if (!restoredSizeHint.isNull()) -- return restoredSizeHint; -- - int a = 0, b = 0; - int min_perp = 0; - int max_perp = QWIDGETSIZE_MAX; -@@ -2376,7 +2373,6 @@ bool QDockAreaLayout::restoreState(QDataStream &stream, const QList> size; - if (!testing) { - docks[pos].rect = QRect(QPoint(0, 0), size); -- docks[pos].restoredSizeHint = size; - } - if (!docks[pos].restoreState(stream, dockwidgets, testing)) { - stream.setStatus(QDataStream::ReadCorruptData); -@@ -2678,8 +2674,6 @@ void QDockAreaLayout::getGrid(QVector *_ver_struct_list, - center_rect.setBottom(rect.bottom() - docks[QInternal::BottomDock].rect.height() - sep); - - QSize left_hint = docks[QInternal::LeftDock].size(); -- if (!docks[QInternal::LeftDock].restoredSizeHint.isNull()) -- left_hint = docks[QInternal::LeftDock].restoredSizeHint; - if (left_hint.isNull() || fallbackToSizeHints) - left_hint = docks[QInternal::LeftDock].sizeHint(); - QSize left_min = docks[QInternal::LeftDock].minimumSize(); -@@ -2687,8 +2681,6 @@ void QDockAreaLayout::getGrid(QVector *_ver_struct_list, - left_hint = left_hint.boundedTo(left_max).expandedTo(left_min); - - QSize right_hint = docks[QInternal::RightDock].size(); -- if (!docks[QInternal::RightDock].restoredSizeHint.isNull()) -- right_hint = docks[QInternal::RightDock].restoredSizeHint; - if (right_hint.isNull() || fallbackToSizeHints) - right_hint = docks[QInternal::RightDock].sizeHint(); - QSize right_min = docks[QInternal::RightDock].minimumSize(); -@@ -2696,8 +2688,6 @@ void QDockAreaLayout::getGrid(QVector *_ver_struct_list, - right_hint = right_hint.boundedTo(right_max).expandedTo(right_min); - - QSize top_hint = docks[QInternal::TopDock].size(); -- if (!docks[QInternal::TopDock].restoredSizeHint.isNull()) -- top_hint = docks[QInternal::TopDock].restoredSizeHint; - if (top_hint.isNull() || fallbackToSizeHints) - top_hint = docks[QInternal::TopDock].sizeHint(); - QSize top_min = docks[QInternal::TopDock].minimumSize(); -@@ -2705,8 +2695,6 @@ void QDockAreaLayout::getGrid(QVector *_ver_struct_list, - top_hint = top_hint.boundedTo(top_max).expandedTo(top_min); - - QSize bottom_hint = docks[QInternal::BottomDock].size(); -- if (!docks[QInternal::BottomDock].restoredSizeHint.isNull()) -- bottom_hint = docks[QInternal::BottomDock].restoredSizeHint; - if (bottom_hint.isNull() || fallbackToSizeHints) - bottom_hint = docks[QInternal::BottomDock].sizeHint(); - QSize bottom_min = docks[QInternal::BottomDock].minimumSize(); -@@ -3288,10 +3276,6 @@ int QDockAreaLayout::separatorMove(const QList &separator, const QPoint &or - int delta = 0; - int index = separator.last(); - -- for (int i = 0; i < QInternal::DockCount; ++i) -- if (!docks[i].restoredSizeHint.isNull()) -- docks[i].restoredSizeHint = QSize(0, 0); -- - if (separator.count() > 1) { - QDockAreaLayoutInfo *info = this->info(separator); - delta = pick(info->o, dest - origin); -diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h -index ea397e00ac..82244c192e 100644 ---- a/src/widgets/widgets/qdockarealayout_p.h -+++ b/src/widgets/widgets/qdockarealayout_p.h -@@ -189,7 +189,6 @@ public: - - QMainWindowLayout *mainWindowLayout() const; - -- QSize restoredSizeHint; - const int *sep; - mutable QVector separatorWidgets; - QInternal::DockPosition dockPos; --- -2.17.1 diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml deleted file mode 100644 index 17b1d11ac715..000000000000 --- a/dev-qt/qtwidgets/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - qt@gentoo.org - Gentoo Qt Project - - - Use GLES 2.0 or later instead of full OpenGL - - - https://bugreports.qt.io/ - https://doc.qt.io/ - - - - Must only be used by packages that are known to use private parts of the Qt API. - - - diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild deleted file mode 100644 index caf1f79a84de..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild +++ /dev/null @@ -1,57 +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="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -fi - -# keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] - gtk? ( - ~dev-qt/qtgui-${PV}[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -src_configure() { - local myconf=( - -opengl $(usex gles2 es2 desktop) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon system) - $(usex xcb '-xcb-xlib -xinput2 -xkb' '') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild deleted file mode 100644 index 227aec0b741d..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild +++ /dev/null @@ -1,57 +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="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" -fi - -# keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] - gtk? ( - ~dev-qt/qtgui-${PV}[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -src_configure() { - local myconf=( - -opengl $(usex gles2 es2 desktop) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon system) - $(usex xcb '-xcb-xlib -xinput2 -xkb' '') - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild deleted file mode 100644 index 2512fb63819d..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild +++ /dev/null @@ -1,59 +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="Set of components for creating classic desktop-style UIs for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -fi - -# keep IUSE defaults in sync with qtgui -IUSE="gles2 gtk +png +xcb" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] - gtk? ( - ~dev-qt/qtgui-${PV}[dbus] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-QDockWidget-revert-restore-geometry.patch" ) - -QT5_TARGET_SUBDIRS=( - src/tools/uic - src/widgets - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - gtk:gtk3: - ::widgets - !:no-widgets: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :widgets -) - -src_configure() { - local myconf=( - -opengl $(usex gles2 es2 desktop) - $(qt_use gtk) - -gui - $(qt_use png libpng system) - -widgets - $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon system) - $(usex xcb '-xcb-xlib -xinput2 -xkb' '') - ) - qt5-build_src_configure -} -- cgit v1.2.3