* [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
@ 2016-11-11 20:07 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-11-11 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 007835f10f1c35e9da072186b5fca6f20560eb3d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 20:06:40 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 20:06:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007835f1
x11-themes/qtcurve: Added live ebuild based on work from seden overlay.
Package-Manager: portage-2.3.2
.../files/qtcurve-9999-add_utils_include.patch | 10 +++
x11-themes/qtcurve/qtcurve-9999.ebuild | 94 ++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/x11-themes/qtcurve/files/qtcurve-9999-add_utils_include.patch b/x11-themes/qtcurve/files/qtcurve-9999-add_utils_include.patch
new file mode 100644
index 00000000..5536937
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-9999-add_utils_include.patch
@@ -0,0 +1,10 @@
+--- 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-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
new file mode 100644
index 00000000..b888456
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils kde5-functions git-r3
+
+DESCRIPTION="A set of widget styles for Qt and GTK2"
+HOMEPAGE="https://quickgit.kde.org/?p=qtcurve.git"
+EGIT_REPO_URI="git://anongit.kde.org/qtcurve"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+X gtk nls plasma qt4 +qt5 test"
+KEYWORDS=""
+
+REQUIRED_USE="gtk? ( X )
+ || ( gtk qt4 qt5 )
+ plasma? ( qt5 )
+"
+
+RDEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+ 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/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )
+ plasma? (
+ dev-qt/qtprintsupport:5
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ )
+ !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=(
+# "${FILESDIR}/${P}-add_utils_include.patch"
+#)
+
+pkg_setup() {
+ # bug #498776
+ if ! version_is_at_least 4.7 $(gcc-version) ; then
+ append-cxxflags -Doverride=
+ fi
+}
+
+src_configure() {
+ local mycmakeargs
+
+ mycmakeargs=(
+ -DQTC_QT4_ENABLE_KDE=OFF
+ -DQTC_QT4_ENABLE_KWIN=OFF
+ -DQTC_KDE4_DEFAULT_HOME=ON
+ -DENABLE_GTK2="$(usex gtk)"
+ -DENABLE_QT4="$(usex qt4)"
+ -DENABLE_QT5="$(usex qt5)"
+ -DENABLE_TEST="$(usex test)"
+ -DQTC_ENABLE_X11="$(usex X)"
+ -DQTC_INSTALL_PO="$(usex nls)"
+ -DQTC_QT5_ENABLE_KDE="$(usex plasma)"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
@ 2017-05-28 15:15 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2017-05-28 15:15 UTC (permalink / raw
To: gentoo-commits
commit: ae7fdd079f7fcaf1063c609ab3942155f4daf942
Author: Ivan Savyhin <bendertron <AT> gmail <DOT> com>
AuthorDate: Sun May 28 15:14:20 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 28 15:14:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7fdd07
x11-themes/qtcurve: add patch to fix build with glibc-2.23
Gentoo-bug: 606564
Package-Manager: Portage-2.3.5, Repoman-2.3.2
x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch | 13 +++++++++++++
x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..06a27d5a885
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch
@@ -0,0 +1,13 @@
+--- 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/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
index 7eee61a30f2..7a9617a62d9 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -50,6 +50,7 @@ PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
@ 2017-06-10 10:31 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2017-06-10 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 61394a4b59402c501f29d3945ce0468355deca7b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 10:31:16 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 10:31:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61394a4b
x11-themes/qtcurve: add snapshot
Package-Manager: Portage-2.3.5, Repoman-2.3.2
x11-themes/qtcurve/Manifest | 1 +
.../files/qtcurve-1.8.18_p20170601-include.patch | 10 ++++
x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild | 66 ++++++++++++++++++++++
3 files changed, 77 insertions(+)
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 5270810d74b..ea85cb9fd31 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,2 +1,3 @@
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
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
new file mode 100644
index 00000000000..8b66c693c76
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch
@@ -0,0 +1,10 @@
+--- 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/qtcurve-1.8.18_p20170601.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild
new file mode 100644
index 00000000000..5beaa57b806
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild
@@ -0,0 +1,66 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
@ 2019-07-15 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-07-15 20:52 UTC (permalink / raw
To: gentoo-commits
commit: dd4adc4f4d854d318a8ff8d19be55268be6aaceb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 20:00:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:51:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4adc4f
x11-themes/qtcurve: EAPI-7 bump, LO crashfix
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtcurve-1.9.0-libreoffice-crashfix.patch | 58 ++++++++++++++
x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild | 90 ++++++++++++++++++++++
2 files changed, 148 insertions(+)
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
new file mode 100644
index 00000000000..c431ab743d0
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch
@@ -0,0 +1,58 @@
+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/qtcurve-1.9.0-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
new file mode 100644
index 00000000000..418fc5a6d0f
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_KDEINSTALLDIRS="false"
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Widget styles for Qt and GTK2"
+HOMEPAGE="https://cgit.kde.org/qtcurve.git"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+X gtk nls plasma +qt5 test"
+
+if [[ "${PV}" != 9999 ]] ; 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 )
+"
+DEPEND="
+ gtk? ( x11-libs/gtk+:2 )
+ plasma? (
+ $(add_frameworks_dep frameworkintegration)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtprintsupport)
+ )
+ qt5? (
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ X? ( $(add_qt_dep qtx11extras) )
+ )
+ 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"
+)
+
+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)"
+ -DQTC_ENABLE_X11="$(usex X)"
+ -DQTC_INSTALL_PO="$(usex nls)"
+ -DQTC_QT5_ENABLE_KDE="$(usex plasma)"
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
@ 2020-05-31 21:38 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-05-31 21:38 UTC (permalink / raw
To: gentoo-commits
commit: bb3a3a392b907b3fe0802e3b68776ceb71fa6fd9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 21:38:23 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 31 21:38:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3a3a39
x11-themes/qtcurve: Fix build with Qt 5.15
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtcurve/files/qtcurve-1.9.0-qt-5.15.patch | 25 ++++++++++++++++++++++
x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild | 1 +
2 files changed, 26 insertions(+)
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
new file mode 100644
index 00000000000..795f94141b2
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch
@@ -0,0 +1,25 @@
+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
index addf0baca57..a9a99616655 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
@ 2021-09-18 19:16 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-09-18 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 7e3267a063daf545d6b8bfd40448bd78f4da37db
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 19:09:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 19:16:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3267a0
x11-themes/qtcurve: Drop 1.9.0-r1
Bug: https://bugs.gentoo.org/759769
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-themes/qtcurve/Manifest | 1 -
.../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 ----------------------
7 files changed, 301 deletions(-)
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 5af9bf44763..f68617ec691 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 16f7198aba8..00000000000
--- 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 56bf30b4562..00000000000
--- 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 c431ab743d0..00000000000
--- 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 883a8af2435..00000000000
--- 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 795f94141b2..00000000000
--- 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 a9a99616655..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-18 19:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-28 15:15 [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2021-09-18 19:16 Andreas Sturmlechner
2020-05-31 21:38 Andreas Sturmlechner
2019-07-15 20:52 Andreas Sturmlechner
2017-06-10 10:31 Michael Palimaka
2016-11-11 20:07 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox