diff options
| -rw-r--r-- | x11-themes/qtcurve/Manifest | 1 | ||||
| -rw-r--r-- | x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch | 44 | ||||
| -rw-r--r-- | x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch | 26 | ||||
| -rw-r--r-- | x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch | 58 | ||||
| -rw-r--r-- | x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch | 54 | ||||
| -rw-r--r-- | x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch | 25 | ||||
| -rw-r--r-- | x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild | 93 |
7 files changed, 0 insertions, 301 deletions
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest index 5af9bf44763f..f68617ec6919 100644 --- a/x11-themes/qtcurve/Manifest +++ b/x11-themes/qtcurve/Manifest @@ -1,2 +1 @@ -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 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 <asturm@gentoo.org> -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 <yyc1992@gmail.com> -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?= <rjvbertin@gmail.com> -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" <rjvbertin@gmail.com> -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 <qtcurve-utils/dirs.h> - #include <qtcurve-utils/process.h> - #include <qtcurve-utils/qtutils.h> -+#include <qtcurve-utils/x11base.h> - - // Qt - #include <QCheckBox> -@@ -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 <asturm@gentoo.org> -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 <QCache> - #include <QColor> - #include <QFont> -+#include <QPainter> -+#include <QPainterPath> - #include <QStyleOption> - #include <QtGlobal> - #include <QCommonStyle> --- -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 -} |