commit: c7bc65ae2f713e7c45368e75a0e188ff5a3622ac Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Nov 23 22:04:33 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Nov 23 22:04:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bc65ae
x11-themes/qtcurve: Drop old Package-Manager: Portage-2.3.16, Repoman-2.3.6 x11-themes/qtcurve/Manifest | 3 - .../qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch | 13 ---- .../files/qtcurve-1.8.18-gtk2_segfault.patch | 14 ---- .../qtcurve-1.8.18-remove_qt_filedialog_api.patch | 58 ----------------- .../qtcurve/files/qtcurve-1.8.18-std_isnan.patch | 31 --------- .../files/qtcurve-1.8.18_p20170601-include.patch | 10 --- .../files/qtcurve-9999-add_utils_include.patch | 10 --- x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild | 74 ---------------------- x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild | 66 ------------------- 9 files changed, 279 deletions(-) diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest index eb61495f992..969ecaf2a7d 100644 --- a/x11-themes/qtcurve/Manifest +++ b/x11-themes/qtcurve/Manifest @@ -1,4 +1 @@ -DIST qtcurve-1.8.18-dont_use_c++11.patch 1096 SHA256 09a9c42bd045dc9161881fdfe62b854d8577fc57e00a245ae03fb00a384cb82f SHA512 3228e4e5babd6a309fca02c4a103500acd913f40364e9dffd8238aa05377f4d31c3b2ba2c84427804de909712a2dd9b391e9f84206fca5146dbadc0d96183cf7 WHIRLPOOL 23f4e2d568e6a2331e2f34f8c3061c1f4171ef0b39e74a56da44c7d761626eefc2a5ff0fa39d4983d8c99742f753ec26dcc2287320aa8d43d5cab9a0d13f2245 -DIST qtcurve-1.8.18.tar.gz 991195 SHA256 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6 SHA512 0ba7927db11d1f2d7bad08fa923d3f0f2167d89fdf0d09bf0b677ffd4f2cc547c22890c87b8f18495e73f8ce21ffbd40899792a512dd9e2a481b81a52abd84eb WHIRLPOOL d3c7dc0c08b42deafdd5fcd513dcb2d9ea9c52ade8090d6cc022315ac80b1ea196a8a763d9c96096ee645f45bc329b837f23987bf7229c718d2a5811a35c68d1 -DIST qtcurve-1.8.18_p20170601.tar.xz 450280 SHA256 aa06d2ac8d4b5b01d227db30555db81f0b6e31ad8fd46cc31abcb3e03589742a SHA512 bde72d2f03403bcdc420612fc83b5dd20c51a4e0cd99a32dfbbd5de4bd2da666a990298ce760642a6d857d74df5e5bef0c737bf49c329ed21ae7e6f2b9ab7080 WHIRLPOOL 2adf543a03b8e88718cd7382ea52be683a7940c6b5593303d8c006d6bc1a1d828b70ad1d24d04379297918fee649a4bed03320a7bceb07077476ed640d2b3f95 DIST qtcurve-1.9.0_rc1.tar.gz 800845 SHA256 3a5ca031761195f58f92f676355f0da6e424e997fdc4fe5914b3f58fe9d57291 SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e WHIRLPOOL dab6f2b56afdb9f1e52fbfee1680d5f57e489a7a5ee0963487a4b13eef44d0db21af21aa929d2907084a5ace845edac518f0899d98d6686275fe023f7959dfba diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch deleted file mode 100644 index 06a27d5a885..00000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/lib/utils/color.h.orig 2017-02-16 00:55:24.000000000 +0300 -+++ b/lib/utils/color.h 2017-02-16 01:00:40.176467232 +0300 -@@ -25,6 +25,10 @@ - - #include <math.h> - -+#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) -+#include <cmath> -+#endif -+ - #include "utils.h" - #include "options.h" - diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch deleted file mode 100644 index b4a2f1a4461..00000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.8.18-gtk2_segfault.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/QtCurve/qtcurve-gtk2/issues/3 -https://gist.github.com/anonymous/8e6e4ea32dabf03cf630 - ---- qtcurve-1.8.18/gtk2/style/qtcurve.c -+++ qtcurve-1.8.18/gtk2/style/qtcurve.c -@@ -372,7 +372,7 @@ - } else if (!(qtSettings.app == GTK_APP_JAVA && widget && - GTK_IS_LABEL(widget))) { - if (state != GTK_STATE_PRELIGHT || opts.crHighlight || -- strcmp(detail, "checkbutton") != 0) { -+ ( detail != NULL && strcmp(detail, "checkbutton") != 0 )) { - parent_class->draw_flat_box(style, window, state, shadow, area, - widget, detail, x, y, width, height); - } diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch deleted file mode 100644 index 087ec7f27f6..00000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.8.18-remove_qt_filedialog_api.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 323402d8b99502300f65e909c61153cbd5d5d997 Mon Sep 17 00:00:00 2001 -From: Marco Martin <[email protected]> -Date: Mon, 19 May 2014 10:37:37 +0200 -Subject: [PATCH] remove qt_filedialog_* api - -it has been removed and doesn't build anymore with recent Qt5 stable -branch ---- - qt5/style/qtcurve_api.cpp | 26 -------------------------- - 1 file changed, 26 deletions(-) - -diff --git a/qt5/style/qtcurve_api.cpp b/qt5/style/qtcurve_api.cpp -index a5ded22..2c794b7 100644 ---- a/qt5/style/qtcurve_api.cpp -+++ b/qt5/style/qtcurve_api.cpp -@@ -67,25 +67,6 @@ - - #include <QDebug> - --extern QString (*qt_filedialog_existing_directory_hook)( -- QWidget *parent, const QString &caption, const QString &dir, -- QFileDialog::Options options); -- --extern QString (*qt_filedialog_open_filename_hook)( -- QWidget *parent, const QString &caption, const QString &dir, -- const QString &filter, QString *selectedFilter, -- QFileDialog::Options options); -- --extern QStringList (*qt_filedialog_open_filenames_hook)( -- QWidget * parent, const QString &caption, const QString &dir, -- const QString &filter, QString *selectedFilter, -- QFileDialog::Options options); -- --extern QString (*qt_filedialog_save_filename_hook)( -- QWidget *parent, const QString &caption, const QString &dir, -- const QString &filter, QString *selectedFilter, -- QFileDialog::Options options); -- - namespace QtCurve { - - void -@@ -163,13 +144,6 @@ Style::polish(QApplication *app) - opts.menuBgndAppearance = APPEARANCE_FLAT; - } - -- if (opts.useQtFileDialogApps.contains(appName)) { -- qt_filedialog_existing_directory_hook = 0L; -- qt_filedialog_open_filename_hook = 0L; -- qt_filedialog_open_filenames_hook = 0L; -- qt_filedialog_save_filename_hook = 0L; -- } -- - QCommonStyle::polish(app); - if (opts.hideShortcutUnderline) { - app->installEventFilter(m_shortcutHandler); --- -1.9.3 - diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch deleted file mode 100644 index 1064d202689..00000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/lib/utils/color.h.orig b/lib/utils/color.h -index 2c7081f..37d83b5 100644 ---- a/lib/utils/color.h.orig -+++ b/lib/utils/color.h -@@ -23,6 +23,8 @@ - #ifndef QTC_UTILS_COLOR_H - #define QTC_UTILS_COLOR_H - -+#include <math.h> -+ - #include "utils.h" - #include "options.h" - -@@ -250,7 +252,7 @@ qtcColorTint(const QColor *base, const QColor *col, double amount) - return *base; - } else if (amount >= 1.0) { - return *col; -- } else if (isnan(amount)) { -+ } else if (std::isnan(amount)) { - return *base; - } - const QtcColor qtc_base = {base->redF(), base->greenF(), base->blueF()}; -@@ -267,7 +269,7 @@ qtcColorMix(const QColor *c1, const QColor *c2, double bias) - return *c1; - } else if (bias >= 1.0) { - return *c2; -- } else if (isnan(bias)) { -+ } else if (std::isnan(bias)) { - return *c1; - } - const QtcColor qtc_c1 = {c1->redF(), c1->greenF(), c1->blueF()}; diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch deleted file mode 100644 index 8b66c693c76..00000000000 --- a/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/qt5/style/qtcurve.cpp -+++ b/qt5/style/qtcurve.cpp -@@ -67,6 +67,7 @@ - #include <QSettings> - #include <QPixmapCache> - #include <QTextStream> -+#include <QDebug> - - #include "shadowhelper.h" - #include <qtcurve-utils/x11qtc.h> diff --git a/x11-themes/qtcurve/files/qtcurve-9999-add_utils_include.patch b/x11-themes/qtcurve/files/qtcurve-9999-add_utils_include.patch deleted file mode 100644 index 5536937f9b1..00000000000 --- a/x11-themes/qtcurve/files/qtcurve-9999-add_utils_include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/qt4/style/qtcurve_plugin.cpp 2016-10-25 10:12:41.000000000 +0200 -+++ b/qt4/style/qtcurve_plugin.cpp 2016-10-25 10:21:32.446853060 +0200 -@@ -22,6 +22,7 @@ - - #include "qtcurve_plugin.h" - #include "qtcurve.h" -+#include "utils.h" - #include "config.h" - - #include <qtcurve-utils/qtprops.h> diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild deleted file mode 100644 index 7a9617a62d9..00000000000 --- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="A set of widget styles for Qt and GTK2" -HOMEPAGE="https://github.com/QtCurve/qtcurve"; - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"; -else - SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz - https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch" - KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -fi - -LICENSE="LGPL-2+" -SLOT="0" -IUSE="+X gtk nls +qt4 qt5" -REQUIRED_USE="gtk? ( X ) - || ( gtk qt4 qt5 )" - -RDEPEND="X? ( x11-libs/libxcb - x11-libs/libX11 ) - gtk? ( x11-libs/gtk+:2 ) - qt4? ( dev-qt/qtdbus:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - ) - qt5? ( dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( dev-qt/qtdbus:5 - dev-qt/qtx11extras:5 ) - ) - !x11-themes/gtk-engines-qtcurve" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -S="${WORKDIR}/${P/_/}" - -DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) - -PATCHES=( - "${DISTDIR}/${P}-dont_use_c++11.patch" - "${FILESDIR}/${P}-remove_qt_filedialog_api.patch" - "${FILESDIR}/${P}-gtk2_segfault.patch" - "${FILESDIR}/${P}-std_isnan.patch" - "${FILESDIR}/${P}-glibc-2.23.patch" - ) - -pkg_setup() { - # bug #498776 - if ! version_is_at_least 4.7 $(gcc-version) ; then - append-cxxflags -Doverride= - fi -} - -src_configure() { - local mycmakeargs=( - -DQTC_QT4_ENABLE_KDE=OFF - -DQTC_QT4_ENABLE_KWIN=OFF - $(cmake-utils_use_enable gtk GTK2) - $(cmake-utils_use_enable qt4 QT4) - $(cmake-utils_use_enable qt5 QT5) - $(cmake-utils_use X QTC_ENABLE_X11 ) - $(cmake-utils_use nls QTC_INSTALL_PO ) - ) - cmake-utils_src_configure -} diff --git a/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild deleted file mode 100644 index 5beaa57b806..00000000000 --- a/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A set of widget styles for Qt and GTK2" -HOMEPAGE="https://github.com/QtCurve/qtcurve"; - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"; -else - SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -fi - -LICENSE="LGPL-2+" -SLOT="0" -IUSE="+X gtk nls +qt4 qt5" -REQUIRED_USE="gtk? ( X ) - || ( gtk qt4 qt5 )" - -RDEPEND="X? ( - x11-libs/libxcb - x11-libs/libX11 - ) - gtk? ( x11-libs/gtk+:2 ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( dev-qt/qtdbus:5 - dev-qt/qtx11extras:5 ) - ) - !x11-themes/gtk-engines-qtcurve" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) - -PATCHES=( "${FILESDIR}/${P}-include.patch" ) - -src_configure() { - local mycmakeargs=( - -DQTC_ENABLE_X11=$(usex X) - -DQTC_INSTALL_PO=$(usex nls) - -DQTC_QT4_ENABLE_KDE=OFF - -DQTC_QT4_ENABLE_KWIN=OFF - -DQTC_QT5_ENABLE_KDE=OFF - -DENABLE_GTK2=$(usex gtk) - -DENABLE_QT4=$(usex qt4) - -DENABLE_QT5=$(usex qt5) - ) - cmake-utils_src_configure -}
