From 79599515788b85b18aa655e7b7f8cc05c1bbddd8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Feb 2019 12:59:29 +0000 Subject: gentoo resync : 16.02.1018 --- dev-qt/qtwidgets/Manifest | 5 +- ...5.9.6-QDockWidget-revert-restore-geometry.patch | 115 --------------------- dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild | 57 ---------- dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild | 2 +- 4 files changed, 2 insertions(+), 177 deletions(-) delete mode 100644 dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch delete mode 100644 dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild (limited to 'dev-qt/qtwidgets') diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 0840cddde8f1..11901942c536 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,6 +1,3 @@ -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-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 -EBUILD qtwidgets-5.11.1.ebuild 1063 BLAKE2B 1e2277078f4c37102be7dfc2bb9a99263285730f1b18f4f57cd7d71558f47244a36f86ab5ba40084585f6f2f326a03f10ff3cb7a1535b6513e5538175b505797 SHA512 014c8736803cb064cd7e3840cf2b4f69b1f44ec85f166c3d7f3824bfc38beff471ef9f6e31887b7242dfb7534fa5fc71ef4982d00a6e867dd5f38ae257985796 -EBUILD qtwidgets-5.11.3.ebuild 1064 BLAKE2B 09024fcb7fccd3400844e55b7cd52bb5536ab4b46c66d6cc99f28f0f8db0d57e127f5e05fa0c484fd1738c0f8a8172ba381df2e2ac1f67d18fa36e13872aef56 SHA512 f181b872568a05979a0fe6d4bdfea1b8f3f808c707e5ef7b913f63572e9a5a9a2e007a8b730bfd80cd34b35e74317587534e7a886ddddb336315c1d12d6222a1 +EBUILD qtwidgets-5.11.3.ebuild 1063 BLAKE2B e69f93f29a53ffbdfcadfadb9254e12917241f3a78f68264c169ed432ca7b6908f4a66988c349fe6a580cc3d38460bd6236ad18c2a6a123616261197d5f92fc8 SHA512 f65237271ea9f7de9f444c3eef9b86a1acd42dc6d8f49771cb789a6c3448cc2a1ca524bb33540fbbcf7bb3764f15876e098f6571e07cfc285db8c48370f4589d 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/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild deleted file mode 100644 index f13b8bf21a43..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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="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 ~sparc 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.11.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild index ae7ab906d497..576902a822cc 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild @@ -8,7 +8,7 @@ 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 ~sparc x86 ~amd64-fbsd" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd" fi # keep IUSE defaults in sync with qtgui -- cgit v1.2.3