From owner-svn-ports-all@freebsd.org Fri Nov 6 20:29:51 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 191142D1150; Fri, 6 Nov 2020 20:29:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSX7L6yXrz4jgC; Fri, 6 Nov 2020 20:29:50 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1AB02A770; Fri, 6 Nov 2020 20:29:50 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A6KToWa037268; Fri, 6 Nov 2020 20:29:50 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A6KToBX037264; Fri, 6 Nov 2020 20:29:50 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202011062029.0A6KToBX037264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 6 Nov 2020 20:29:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r554314 - in branches/2020Q4/x11-themes/qt5-style-plugins: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in branches/2020Q4/x11-themes/qt5-style-plugins: . files X-SVN-Commit-Revision: 554314 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 20:29:51 -0000 Author: tcberner Date: Fri Nov 6 20:29:50 2020 New Revision: 554314 URL: https://svnweb.freebsd.org/changeset/ports/554314 Log: MFH: r554313 x11-themes/qt5-style-plugins: fix background colour handling PR: 250235 Submitted by: Marcel Kaiser Obtained from: https://aur.tuna.tsinghua.edu.cn/cgit/aur.git/tree/0002-fix-gtk2-background.patch?h=qt5-styleplugins Approved by: ports-secteam (implicit) Modified: branches/2020Q4/x11-themes/qt5-style-plugins/Makefile branches/2020Q4/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15 Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/x11-themes/qt5-style-plugins/Makefile ============================================================================== --- branches/2020Q4/x11-themes/qt5-style-plugins/Makefile Fri Nov 6 20:28:44 2020 (r554313) +++ branches/2020Q4/x11-themes/qt5-style-plugins/Makefile Fri Nov 6 20:29:50 2020 (r554314) @@ -5,7 +5,7 @@ PORTNAME= qt5-style-plugins DISTVERSIONPREFIX= v DISTVERSION= 5.0.0-23 DISTVERSIONSUFFIX= -g335dbe -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-themes DIST_SUBDIR= KDE/Qt/addons Modified: branches/2020Q4/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15 ============================================================================== --- branches/2020Q4/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15 Fri Nov 6 20:28:44 2020 (r554313) +++ branches/2020Q4/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15 Fri Nov 6 20:29:50 2020 (r554314) @@ -6,28 +6,25 @@ Subject: [PATCH] fix build against Qt 5.15 With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application palette handling between QGuiApplication and QApplication") QApplicationPrivate::setSystemPalette is no longer used and necessary. ---- - src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ - src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp -index 36169c9..2544593 100644 ---- src/plugins/styles/gtk2/qgtkstyle.cpp +--- src/plugins/styles/gtk2/qgtkstyle.cpp.orig 2017-03-11 09:23:02 UTC +++ src/plugins/styles/gtk2/qgtkstyle.cpp -@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app) +@@ -440,7 +440,11 @@ void QGtkStyle::polish(QApplication *app) // not supported as these should be entirely determined by // current Gtk settings if (app->desktopSettingsAware() && d->isThemeAvailable()) { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QApplicationPrivate::setSystemPalette(standardPalette()); ++#else ++ QApplication::setPalette(standardPalette()); +#endif QApplicationPrivate::setSystemFont(d->getThemeFont()); d->applyCustomPaletteHash(); if (!d->isKDE4Session()) -diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -index e57b3d8..e71beb0 100644 ---- src/plugins/styles/gtk2/qgtkstyle_p.cpp + src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ + src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +--- src/plugins/styles/gtk2/qgtkstyle_p.cpp.orig 2017-03-11 09:23:02 UTC +++ src/plugins/styles/gtk2/qgtkstyle_p.cpp @@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme() if (oldTheme != QGtkStylePrivate::getThemeName()) { @@ -39,5 +36,3 @@ index e57b3d8..e71beb0 100644 QApplication::setPalette(newPalette); if (!QGtkStylePrivate::instances.isEmpty()) { QGtkStylePrivate::instances.last()->initGtkWidgets(); --- -2.26.2