<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8da4eb3dada6c3e790fab218cd9641db350e27a0">https://github.com/macports/macports-ports/commit/8da4eb3dada6c3e790fab218cd9641db350e27a0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8da4eb3 qt4-mac/kdelibs4 : convert hardwired graphics system selection to use… (#3022)
</span>8da4eb3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8da4eb3dada6c3e790fab218cd9641db350e27a0
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Sat Dec 8 17:30:15 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac/kdelibs4 : convert hardwired graphics system selection to use… (#3022)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * qt4-mac/kdelibs4 : convert hardwired graphics system selection to user option. Kdelibs4 used to set the Raster graphics system, causing graphics issues on newer OS versions. This change puts the graphics system under user control via Qt.
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57577
</span>---
aqua/qt4-mac/Portfile | 17 ++-
.../files/patch-graphicssystem-via-qtconfig.diff | 122 +++++++++++++++++++++
aqua/qt4-mac/files/patch-tools-build_qtconfig.diff | 11 ++
kde/kdelibs4/Portfile | 12 +-
kde/kdelibs4/files/patch-kapplications-raster.diff | 16 ++-
5 files changed, 169 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a9e91f..36f522a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name qt4-mac
version 4.8.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,7 +315,13 @@ patchfiles-append patch-qthread-stacksize.diff
</span>
patchfiles-append patch-qt-custom-threadpool.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (34) Various from NiXos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (34) Allow control over the default graphics system to be used via
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt's own qtconfig utility: Native vs. Raster vs. OpenGL. Qtconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is not normally built on Mac so a patch is required to activate it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-tools-build_qtconfig.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-graphicssystem-via-qtconfig.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (35) Various from NiXos
</span> # see also < https://trac.macports.org/ticket/55932 >
# and < https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/libraries/qt-4.x/4.8 >
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1167,6 +1173,13 @@ post-activate {
</span> ui_msg "NOTE: Qt database plugins for mysql55, postgresql91, and sqlite2 are NOT installed by this port\; they are installed by qt4-mac-*-plugin instead."
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"Users experiencing graphics glitches on newer OS versions (10.13 and up) can \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+experiment with different graphics drawing systems that can be set in the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Interface tab of the ${qt_apps_dir}/qtconfig.app utility. Raster mode is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the preferred mode but is not compatible with all non-standard widget styles.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Keep an eye on the Fonts setting before saving!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
# livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-graphicssystem-via-qtconfig.diff b/aqua/qt4-mac/files/patch-graphicssystem-via-qtconfig.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bba678d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-graphicssystem-via-qtconfig.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,122 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 22da34e0154a5b37566f38c514648a9125ee5771..3efa5433eb2801bed7e2a5f1bcf8ae609ed88d86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/kernel/qapplication.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/kernel/qapplication.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -818,9 +818,19 @@ void QApplicationPrivate::construct(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt_is_gui_used = (qt_appType != QApplication::Tty);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_cmdline();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // the environment variable has the lowest precedence of runtime graphicssystem switches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // the environment variable has almost the lowest precedence of runtime graphicssystem switches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (graphics_system_name.isEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ graphics_system_name = QString::fromLocal8Bit(qgetenv("QT_GRAPHICSSYSTEM"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (graphics_system_name.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Fetch the default graphics system from the settings store if no other setting has been made
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ settings.beginGroup(QLatin1String("Qt"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const QString defaultGraphicsSystem = settings.value(QLatin1String("DefaultGraphicsSystem")).toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (! defaultGraphicsSystem.isNull() && ! defaultGraphicsSystem.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_system_name = defaultGraphicsSystem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(Q_WS_X11) && !defined(QT_NO_EGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (graphics_system_name.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tools/qtconfig/main.cpp tools/qtconfig/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a0f5dd6ed3cc204f61041bc65f96b1af88bdbb97..1cbb8538d5c8706b223e89fcaca70e9000db1c8b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qtconfig/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qtconfig/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,13 @@ int main(int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_INIT_RESOURCE(qtconfig);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const QByteArray graphicsSystem = qgetenv("QT_GRAPHICSSYSTEM");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (graphicsSystem.isNull() || graphicsSystem.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // force native graphics mode unless the user set one via QT_GRAPHICSSYSTEM.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // We have to use QT_GRAPHICSSYSTEM because that will override any previous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // settings stored in our own settings store.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qputenv("QT_GRAPHICSSYSTEM", "Native");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QApplication app(argc, argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTranslator translator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tools/qtconfig/mainwindow.cpp tools/qtconfig/mainwindow.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1bb6e4eae01fd43d9de41d627677abc8521908d8..e1726fb174c406311bf132d4f6c70ba3016a4c41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qtconfig/mainwindow.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qtconfig/mainwindow.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,6 +238,7 @@ MainWindow::MainWindow()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(ui->rtlExtensionsCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(ui->inputStyleCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(ui->inputMethodCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ connect(ui->graphicsSystemCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(ui->guiStyleCombo, SIGNAL(activated(QString)), SLOT(styleSelected(QString)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(ui->familySubstitutionCombo, SIGNAL(activated(QString)), SLOT(substituteSelected(QString)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(ui->tunePaletteButton, SIGNAL(clicked()), SLOT(tunePalette()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -416,7 +463,26 @@ MainWindow::MainWindow()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui->inputMethodCombo->hide();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui->inputMethodLabel->hide();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui->graphicsSystemCombo->setToolTip(tr("Select the graphicsssystem to be used by default.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Native: use native CoreGraphics rendering\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Raster: use raster graphics\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "OpenGL: use OpenGL (experimental!)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Raster mode is the preferred default except on Mac OS 10.14 and newer where it causes flickering.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Use Native rendering on those newer OS versions (or if you experience other graphics glitches).\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Note that Raster mode is not compatible with certain built-in widget styles like CDE or Plastique."));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QStringList graphicsSystems;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString defaultGraphicsSystem = settings.value(QLatin1String("DefaultGraphicsSystem"), QLatin1String("(unset)")).toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphicsSystems << "(unset)" << "Native" << "Raster" << "OpenGL";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui->graphicsSystemCombo->addItems(graphicsSystems);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!defaultGraphicsSystem.isNull() && !defaultGraphicsSystem.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui->graphicsSystemCombo->setCurrentIndex(graphicsSystems.indexOf(QRegExp(defaultGraphicsSystem, Qt::CaseInsensitive)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui->graphicsSystemLabel->hide();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui->graphicsSystemCombo->hide();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui->fontEmbeddingCheckBox->setChecked(settings.value(QLatin1String("embedFonts"), true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .toBool());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontpaths = settings.value(QLatin1String("fontPath")).toStringList();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -573,6 +639,13 @@ void MainWindow::fileSave()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(Q_WS_X11) && !defined(QT_NO_XIM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings.setValue(QLatin1String("DefaultInputMethod"), ui->inputMethodCombo->currentText());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ui->graphicsSystemCombo->currentIndex() > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ settings.setValue(QLatin1String("DefaultGraphicsSystem"), ui->graphicsSystemCombo->currentText());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ settings.remove(QLatin1String("DefaultGraphicsSystem"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tools/qtconfig/mainwindow.ui tools/qtconfig/mainwindow.ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 454021ecdf2c00b29b9f2b86a2a68893da57b572..7593f7140b8ad73b1c615439dd4b473e37b3e9a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qtconfig/mainwindow.ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qtconfig/mainwindow.ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -901,6 +901,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </property>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </widget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </item>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <item>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <widget class="QLabel" name="graphicsSystemLabel">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <property name="text">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>Default Graphics System:</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </property>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </widget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </item>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <item>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <widget class="QComboBox" name="graphicsSystemCombo">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <property name="currentIndex">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <number>-1</number>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </property>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </widget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </item>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <item>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <spacer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <property name="orientation">
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-tools-build_qtconfig.diff b/aqua/qt4-mac/files/patch-tools-build_qtconfig.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2a1bd7c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-tools-build_qtconfig.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/orig.tools.pro 2014-04-10 20:37:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/tools.pro 2015-03-21 21:58:01.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS += designer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unix:!symbian:!embedded:!qpa:SUBDIRS += qtconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win32:!wince*:SUBDIRS += activeqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contains(QT_CONFIG, declarative) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/Portfile b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58b8e34..717e76f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name kdelibs4
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span> categories kde kde4
maintainers {nicos @NicosPavlov}
license LGPL-2+ GPL-2+ BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +144,15 @@ post-activate {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes-append "An agent to provide communication between KDE programs must be started.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "An agent must be started to maintain KDE's desktop file system configuration cache.
</span> To start it run the following command:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- launchctl load -w ${startup_root}/Library/LaunchAgents/org.macports.kdecache.plist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ launchctl load -w ${startup_root}/Library/LaunchAgents/org.macports.kdecache.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Attention:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Users who experience graphics glitches (like flickering) in KDE4 application on newer OS versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+are invited to use the qtconfig application (in ${qt_apps_dir}) and experiment with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the Native graphics system as described in the qt4-mac notes."
</span>
#patch-authBackends: make possible to use OS X keychain through kwallet (see https://git.reviewboard.kde.org/r/119838/, shipped)
variant osxkeychain description {kwallet uses the OSX KeyChain} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/files/patch-kapplications-raster.diff b/kde/kdelibs4/files/patch-kapplications-raster.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e50d1f..4042e17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdelibs4/files/patch-kapplications-raster.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/files/patch-kapplications-raster.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ index b093034..3e1b2f2 100644
</span> d(new KApplicationPrivate(this))
{
d->read_app_startup_id();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -402,10 +410,31 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const QByte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,10 +432,39 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const QByte
</span> }
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +49,17 @@ index b093034..3e1b2f2 100644
</span> +#ifdef Q_OS_MAC
+ // Setting env RasterOff avoids setting raster. Can be used for before/after
+ // testing and to work around an application failing when raster is set.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getenv("RasterOff") == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (useRaster && GUIenabled) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QApplication::setGraphicsSystem(QString("raster"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Fetch the default graphics system from Qt's settings store managed via qtconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ settings.beginGroup(QLatin1String("Qt"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const QString defaultGraphicsSystem = settings.value(QLatin1String("DefaultGraphicsSystem")).toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (defaultGraphicsSystem.isNull() || defaultGraphicsSystem.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // only force raster mode here when not overriden via qtconfig or one of our own mechanisms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (getenv("RasterOff") == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (useRaster && GUIenabled) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QApplication::setGraphicsSystem(QString("raster"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> + }
+ }
+#endif
</pre><pre style='margin:0'>
</pre>