<pre style='margin:0'>
Andrea D'Amore (anddam) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c9c3483cf8b2a153a81e82b2826e31b31097118">https://github.com/macports/macports-ports/commit/1c9c3483cf8b2a153a81e82b2826e31b31097118</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1c9c3483cf8b2a153a81e82b2826e31b31097118
</span>Author: R.J.V. Bertin <rjvbertin@gmail.com>
AuthorDate: Sun Dec 11 13:41:24 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> port:qtcurve : fixing regressions that slipped through.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adds a missing dependency on QtSvg and replaces hard-coded Qt4 install
</span><span style='display:block; white-space:pre;color:#404040;'> locations with the appropriate variable from the PortGroup.
</span><span style='display:block; white-space:pre;color:#404040;'> Also removes an obsolete patchfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Committed from host : Portia.local
</span>---
kde/qtcurve/Portfile | 13 +++++---
.../files/patch-deactivate-config-pages.diff | 35 ----------------------
2 files changed, 9 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/Portfile b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d42432c..f4b6d5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +164,7 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${kf5::pyversion} \
-DQTC_QT5_ENABLE_KDE:BOOL=ON
if {![variant_isset devel]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kf5.allow_docs_generation no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kf5.allow_apidocs_generation no
</span> }
platform darwin {
notes-append "Install port:kf5-osx-integration and set KDE_SESSION_VERSION to 5 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,6 +186,11 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> cmake.install_rpath-prepend \
${qt_libs_dir}
configure.args-append -DQTC_QT5_ENABLE_KDE:BOOL=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if and when port:qt5-kde is committed we can add the QtSvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependency in a more elegant fashion, using qt5.depends_components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists qt5.using_kde] || !${qt5.using_kde}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append qt5-qtsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# CMake will look for automoc4, but will of course not use it.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +215,7 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> -DQTC_QT5_ENABLE_KDE:BOOL=OFF -DQTC_UTILSLIB_INFIX:STRING="-qt4"
notes-append "To access QtCurve and other KDE styles from pure Qt4 applications, execute
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/kde4/plugins/styles ${prefix}/share/qt4/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/kde4/plugins/styles ${qt_plugins_dir}
</span> with the appropriate privileges"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -230,9 +235,9 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> post-destroot {
if {${subport} eq "${name}-qt5"} {
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/qt4/plugins
</span> if {[file exists ${qt_plugins_dir}] && ![file exists ${qt_plugins_dir}/styles]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ln -s ${prefix}/lib/kde4/plugins/styles ${destroot}${qt_plugins_dir}/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${qt_plugins_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/kde4/plugins/styles ${destroot}${qt_plugins_dir}
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/files/patch-deactivate-config-pages.diff b/kde/qtcurve/files/patch-deactivate-config-pages.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index da9ac41..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/files/patch-deactivate-config-pages.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qt5/config/qtcurveconfig.cpp qt5/config/qtcurveconfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index df8ce89..b1f4655 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qt5/config/qtcurveconfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qt5/config/qtcurveconfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1697,13 +1697,15 @@ void QtCurveConfig::setupStack()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kwin->setNote(i18n("<p><b>NOTE:</b><i>The settings here affect the borders drawn around application windows and dialogs - and "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "not internal (or MDI) windows. Therefore, these settings will <b>not</b> be reflected in the Preview "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "page.</i></p>"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(qtcSlot(kwin, changed), qtcSlot(this, updateChanged));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stack->insertWidget(i, kwin);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- new CStackItem(stackList, i18n("Window Manager"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CStackItem *winManager = new CStackItem(stackList, i18n("Window Manager"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new CStackItem(stackList, i18n("Window buttons"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- new CStackItem(stackList, i18n("Window button colors"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CStackItem *winButtonColours = new CStackItem(stackList, i18n("Window button colors"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new CStackItem(stackList, i18n("Menubars"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new CStackItem(stackList, i18n("Popup menus"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new CStackItem(stackList, i18n("Toolbars"), i++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1718,6 +1720,11 @@ void QtCurveConfig::setupStack()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stackList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stackList->setSelectionMode(QAbstractItemView::SingleSelection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- first->setSelected(true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ winManager->setDisabled(true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // disable this page for now: it doesn't work properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ winButtonColours->setDisabled(true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(qtcSlot(stackList, itemSelectionChanged),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcSlot(this, changeStack));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>