From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- x11-themes/Manifest.gz | Bin 22079 -> 22072 bytes x11-themes/qtcurve/Manifest | 9 +- .../files/qtcurve-1.9.0-build_testing.patch | 44 ---------- x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch | 26 ------ .../files/qtcurve-1.9.0-libreoffice-crashfix.patch | 58 ------------- .../files/qtcurve-1.9.0-no-X-buildfix.patch | 54 ------------ .../qtcurve/files/qtcurve-1.9.0-qt-5.15.patch | 25 ------ x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild | 93 --------------------- x11-themes/qtcurve/qtcurve-1.9.0_p20210412.ebuild | 2 +- 9 files changed, 2 insertions(+), 309 deletions(-) delete mode 100644 x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch delete mode 100644 x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch delete mode 100644 x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch delete mode 100644 x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch delete mode 100644 x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch delete mode 100644 x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild (limited to 'x11-themes') diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz index ab318d7063d5..691ffeb78c00 100644 Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest index ad7c578891df..edab265fe69c 100644 --- a/x11-themes/qtcurve/Manifest +++ b/x11-themes/qtcurve/Manifest @@ -1,11 +1,4 @@ -AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9 -AUX qtcurve-1.9.0-gcc9.patch 1057 BLAKE2B 4071dde6768793e0bfc443816508b445fd713a0df46ae2bcfe6932f0792f1c092d67bd2797e47c88b3b0fdc2cb7e1aafdfdc21f5eb720cab0bcf2539cf832d13 SHA512 8926c432704b15c30bf56011e38349907fc3020f0576bf9f0ab8797324bdc3e7e424210ad95bc3c437ee09a92c21b769845009088a7a1ff1c09237e7324f207c -AUX qtcurve-1.9.0-libreoffice-crashfix.patch 2509 BLAKE2B f5aa8b5355da28eedde976460c9c29d5ed90a8858c1cabd061495ff1d91dff015473d7488997e8849a91dbfd0238c253bfe96805a925e1f1ae1015cb8752f2ec SHA512 f58f568df682a2a809123203f4cb88c95965810968dbd30fdaaa63918d9669641cfa1cb659a4a3cb30f3267d39b0c98d29e0c7e300fb7bcf34017617d65a8c8c -AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7 -AUX qtcurve-1.9.0-qt-5.15.patch 636 BLAKE2B 5ce188e66e8177aeaa22399f6cb2deb52c5fea420462174e285f30c9d5976ae29f4fbfc2554ca35515247ed025c7991718d440c37d4c43261da3f79dd2c7aba3 SHA512 bef081115de9704c0ae6cf213a4e530f2227ecfa5f8bdd4fd5af2c3e9edd43225f02ea14c777a9e6c62cb6278b415e3afbeb86a9103309d0deadd837c0482dce -DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66 DIST qtcurve-1.9.0_p20210412-be78a85b.tar.gz 805926 BLAKE2B 9a763f91bf073e341bf0517e5d3bc480eb1670f78c5d74242059cd229b9fcab72ec28255693335e74ae4cb8f154ce4390257b27d71a91d2285cb4f6db03e666a SHA512 686397cf408f436017782ce06baf80f91589f3486e01fe5cbda602a0a44fc11150c6d5dacf9d9c499ed713b04b64612e3e3dbaa72bb0e72e3dc2823f31d2291e -EBUILD qtcurve-1.9.0-r1.ebuild 2294 BLAKE2B 3b6dc58338aedd4a43653879e736e94fe8718ab2b3e457b60c90ba7a49c2950cf6fe79c408fac878b46e84a3ce5d596dd4117b4fa115afa21ba355fb8fea5037 SHA512 c831f719216eeb67a95eb9e315e0c6a3316261a6d59edc22911074ae1335cd451ce977ec5e5f0cd60ecca1a1c36117e6562e48d3fbeef49ae33d2d8036b3c92f -EBUILD qtcurve-1.9.0_p20210412.ebuild 1678 BLAKE2B 2408ff03a92a85ba5708a890a59b9c8adcdc7aec0d0378c6d22d3f851fd517ba3f0c25388c9382668eb9621269c8b0c9c368d151f9609c2e36cb5da20207ffe8 SHA512 439dcb7fad41971934f5553d53187ff4296f0641608236e4af7e486d9593213b5110aadee18f93f10a2f0bca37a1e1c4d60295614d1bb07c048c618adb566696 +EBUILD qtcurve-1.9.0_p20210412.ebuild 1677 BLAKE2B 4de26823658d7e34e8edf59e6f93c17b565e64ddf9662abad887fd370155ccc97ab3459a57ef4165b26caa535e5cbf9e3daace3f25379bcf6b2f1c556c60839b SHA512 8b81fc4aa11464ff47f1fc91266077799e6bdebfa86c64099c49b9a87653cf8424384fdb7e6f9daeb7994ceff92a79d22bb33ce301db89ad8cc2fc048666a2ac EBUILD qtcurve-9999.ebuild 1781 BLAKE2B 77325a5cde387f6f36a0b408fe2a84925295760d875d5ab917414ef198ce9d97337506436f3ca2697f5377f3ca2be58e468a3983e4dabce40b82743e4d397a1c SHA512 92ad215070458860d61ea6ce3ca4b575784cf12a000f12efbdbce0a588f7866853a217a5fb105931bc8ecf0d337e7e3621f4c06a73ae207f17285b8bbe1293fa MISC metadata.xml 572 BLAKE2B 2ac8773ec65b65ef83ee4eb391f21f660d9c7499e8ecd0bc810ebfe38be15abc208d4d57c886fbb9b798722c1fd58d8ca8aa8847220250f771dcd0e72229ddd3 SHA512 63238109e07dabb470ccd20f4826b26b0494f9128af24aa28f70e8336d480765a2128e707d060a837fe87e2e21b485c0998fe4fb031a38116e9e9f266d3abe41 diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch deleted file mode 100644 index 16f7198aba8f..000000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 237912b291dcc706fcc1d9b02a8398385d19f38f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 26 Jun 2018 18:03:06 +0200 -Subject: [PATCH] Switch from ENABLE_TEST to the ECM/CMake standard - BUILD_TESTING - -Summary: -BUILD_TESTING is used throughout KDE projects as provided by -CTest and/or KDECMakeSettings. - -Reviewers: yuyichao - -Reviewed By: yuyichao - -Differential Revision: https://phabricator.kde.org/D13741 ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e21b3a..15f6b177 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ qtc_option(ENABLE_QT4 "Building Qt4 theme." On) - qtc_option(ENABLE_QT5 "Building Qt5 theme." On) - qtc_option(ENABLE_GTK2 "Building Gtk2 theme." On) - # option(ENABLE_GTK3 "Building Gtk3 theme." On) --option(ENABLE_TEST "Enable testing." On) -+option(BUILD_TESTING "Enable testing." On) - option(QTC_ENABLE_X11 "Enable X11" On) - option(QTC_INSTALL_PO "Install translation files." On) - -@@ -247,7 +247,7 @@ if(ENABLE_GTK2) - add_subdirectory(gtk2) - endif() - add_subdirectory(tools) --if(ENABLE_TEST) -+if(BUILD_TESTING) - enable_testing() - add_subdirectory(test) - endif() --- -2.18.0 - diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch deleted file mode 100644 index 56bf30b4562e..000000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ee2228ea2f18ac5da9b434ee6089381df815aa94 Mon Sep 17 00:00:00 2001 -From: Yichao Yu -Date: Wed, 5 Jun 2019 09:03:40 -0400 -Subject: [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in - C++14 - -BUG: 408286 ---- - lib/utils/gtkprops.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h -index abc0675..e248255 100644 ---- a/lib/utils/gtkprops.h -+++ b/lib/utils/gtkprops.h -@@ -74,7 +74,7 @@ class GtkWidgetProps { - }; - #define DEF_WIDGET_SIG_CONN_PROPS(name) \ - struct _SigConn_##name##_ObjGetter { \ -- constexpr inline GObject* \ -+ inline GObject* \ - operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const \ - { \ - return (GObject*)qtcContainerOf(p, Props, name)->m_w; \ --- -cgit v1.1 diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch deleted file mode 100644 index c431ab743d09..000000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 293a822b2fc0572f826a819d9ad8df858c4ed1ee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= -Date: Sun, 3 Feb 2019 11:14:47 +0100 -Subject: Fix the LibreOffice fix - -My previous commit was a bit overzealous and didn't take into account -the fact that there are legitimate reasons for the widget argument to -Style::drawPrimitive() to be NULL. ---- - qt5/style/qtcurve_api.cpp | 16 +++------------- - 2 files changed, 15 insertions(+), 19 deletions(-) - -diff --git a/qt5/style/qtcurve_api.cpp b/qt5/style/qtcurve_api.cpp -index 155d159..f26c438 100644 ---- a/qt5/style/qtcurve_api.cpp -+++ b/qt5/style/qtcurve_api.cpp -@@ -2036,6 +2036,7 @@ QPalette Style::standardPalette() const - - static bool initFontTickData(Options &opts, QFont font, const QWidget *widget=0) - { -+ Q_UNUSED(widget); - if (opts.onlyTicksInMenu && opts.fontTickWidth <= 0) { - opts.tickFont = font; - #ifndef Q_OS_MACOS -@@ -2047,8 +2048,6 @@ static bool initFontTickData(Options &opts, QFont font, const QWidget *widget=0) - // adjust the size so the tickmark looks just about right - opts.tickFont.setPointSizeF(opts.tickFont.pointSizeF() * 1.3); - opts.fontTickWidth = QFontMetrics(opts.tickFont).width(opts.menuTick); -- // qDebug() << widget << "font->tickFont:" << font.toString() << opts.tickFont.toString() << "tickMark:" << opts.menuTick -- // << "width=" << opts.fontTickWidth << "/" << QFontMetrics(opts.tickFont).boundingRect(opts.menuTick).width(); - return true; - } - return false; -@@ -2123,9 +2117,7 @@ Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, - break; - case PE_FrameStatusBar: - case PE_FrameMenu: -- if (widget) { -- initFontTickData(opts, widget->font(), widget); -- } -+ initFontTickData(opts, widget ? widget->font() : QApplication::font("QMenu"), widget); - drawFunc = &Style::drawPrimitiveFrameStatusBarOrMenu; - break; - case PE_FrameDockWidget: -@@ -2182,9 +2174,7 @@ Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, - drawFunc = &Style::drawPrimitivePanelTipLabel; - break; - case PE_PanelMenu: -- if (widget) { -- initFontTickData(opts, widget->font(), widget); -- } -+ initFontTickData(opts, widget ? widget->font() : QApplication::font("QMenu"), widget); - drawFunc = &Style::drawPrimitivePanelMenu; - break; - default: --- -cgit v1.1 - diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch deleted file mode 100644 index 883a8af24355..000000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9aae21bb68308d9017977a53059dd75b347d7bbd Mon Sep 17 00:00:00 2001 -From: "R.J.V. Bertin" -Date: Tue, 3 Apr 2018 18:18:37 +0200 -Subject: Minor X11-related build fixes: - -- don't override QTC_ENABLE_X11 with platform conditionals -- use qtcX11Enabled() instead of QTC_ENABLE_X11 everywhere - -Committed from host : Portia.local ---- - qt5/CMakeLists.txt | 2 +- - qt5/config/qtcurveconfig.cpp | 7 ++++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt -index 930c919..8cff198 100644 ---- a/qt5/CMakeLists.txt -+++ b/qt5/CMakeLists.txt -@@ -36,7 +36,7 @@ if(ENABLE_QT5) - set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS}) - set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS}) - endforeach() -- if(NOT APPLE) -+ if(QTC_ENABLE_X11) - set(QTC_QT5_OPT_MODULES Qt5X11Extras) - endif() - foreach(QtModule ${QTC_QT5_OPT_MODULES}) -diff --git a/qt5/config/qtcurveconfig.cpp b/qt5/config/qtcurveconfig.cpp -index b320c25..a34f9bd 100644 ---- a/qt5/config/qtcurveconfig.cpp -+++ b/qt5/config/qtcurveconfig.cpp -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - // Qt - #include -@@ -975,9 +976,9 @@ QtCurveConfig::QtCurveConfig(QWidget *parent) - dropShadowSize->setRange(0, 100); - dropShadowSize->setSingleStep(1); - dropShadowSize->setValue(qtcX11ShadowSize()); --#ifndef QTC_ENABLE_X11 -- dropShadowSize->setEnabled(false); --#endif -+ if (!qtcX11Enabled()) { -+ dropShadowSize->setEnabled(false); -+ } - - - sliderWidth->setRange(MIN_SLIDER_WIDTH, MAX_SLIDER_WIDTH); --- -cgit v0.11.2 diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch deleted file mode 100644 index 795f94141b26..000000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 44e2a35ebb164dcab0bad1a9158b1219a3ff6504 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 31 May 2020 23:33:30 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - ---- - qt5/style/qtcurve.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/qt5/style/qtcurve.h b/qt5/style/qtcurve.h -index 9a50db00..00072d4e 100644 ---- a/qt5/style/qtcurve.h -+++ b/qt5/style/qtcurve.h -@@ -31,6 +31,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include --- -2.26.2 - diff --git a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild deleted file mode 100644 index a9a996166554..000000000000 --- a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit cmake kde.org - -DESCRIPTION="Widget styles for Qt and GTK2" -HOMEPAGE="https://invent.kde.org/system/qtcurve" - -LICENSE="LGPL-2+" -SLOT="0" -IUSE="gtk nls plasma +qt5 test +X" - -if [[ ${KDE_BUILD_TYPE} = release ]] ; then - SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86" - S="${WORKDIR}/${P/_/-}" -fi - -REQUIRED_USE="gtk? ( X ) - || ( gtk qt5 ) - plasma? ( qt5 ) -" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - plasma? ( >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 ) -" -DEPEND=" - gtk? ( x11-libs/gtk+:2 ) - plasma? ( - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - ) - qt5? ( - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - ) -" -RDEPEND="${DEPEND}" - -RESTRICT+=" test" - -DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) - -PATCHES=( - "${FILESDIR}/${PN}-1.9.0-build_testing.patch" - "${FILESDIR}/${PN}-1.9.0-no-X-buildfix.patch" - "${FILESDIR}/${PN}-1.9.0-gcc9.patch" - "${FILESDIR}/${PN}-1.9.0-libreoffice-crashfix.patch" - "${FILESDIR}/${PN}-1.9.0-qt-5.15.patch" -) - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - -DENABLE_QT4=OFF - -DQTC_QT4_ENABLE_KDE=OFF - -DQTC_KDE4_DEFAULT_HOME=ON - -DENABLE_GTK2="$(usex gtk)" - -DENABLE_QT5="$(usex qt5)" - -DBUILD_TESTING="$(usex test)" - -DQTC_ENABLE_X11="$(usex X)" - -DQTC_INSTALL_PO="$(usex nls)" - -DQTC_QT5_ENABLE_KDE="$(usex plasma)" - ) - - cmake_src_configure -} diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_p20210412.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_p20210412.ebuild index 4abd5709da5b..f36d3ed37985 100644 --- a/x11-themes/qtcurve/qtcurve-1.9.0_p20210412.ebuild +++ b/x11-themes/qtcurve/qtcurve-1.9.0_p20210412.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://invent.kde.org/system/qtcurve" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86" IUSE="gtk nls plasma +qt5 test +X" REQUIRED_USE="gtk? ( X ) -- cgit v1.2.3