[126431] trunk/dports/kde/kde4-runtime
nicos at macports.org
nicos at macports.org
Thu Oct 9 20:21:45 PDT 2014
Revision: 126431
https://trac.macports.org/changeset/126431
Author: nicos at macports.org
Date: 2014-10-09 20:21:45 -0700 (Thu, 09 Oct 2014)
Log Message:
-----------
kde4-runtime: update to 4.13.3
review dependencies
add patch for DrKonqi
Modified Paths:
--------------
trunk/dports/kde/kde4-runtime/Portfile
Added Paths:
-----------
trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff
Modified: trunk/dports/kde/kde4-runtime/Portfile
===================================================================
--- trunk/dports/kde/kde4-runtime/Portfile 2014-10-10 03:08:34 UTC (rev 126430)
+++ trunk/dports/kde/kde4-runtime/Portfile 2014-10-10 03:21:45 UTC (rev 126431)
@@ -5,7 +5,7 @@
PortGroup kde4 1.1
name kde4-runtime
-version 4.12.5
+version 4.13.3
categories kde kde4
maintainers nicos
license GPL-2+ LGPL-2.1+
@@ -18,15 +18,17 @@
use_xz yes
distname kde-runtime-${version}
-checksums rmd160 9e5c16749b275c191e6efc4a61e070b8e8c48442 \
- sha256 b43e1aebd7e9dd13677f2205bb6eef7ee02a7085ae9fd34a39bad55d5df56fe7
+checksums rmd160 873bc8f5b2ff834e45bbcddd5cf1985a96e78952 \
+ sha256 d35dbf930d212e86154e87e3566797827af1ed666099e5d5df8df76b874318f0
#Binaries do not link directly to openssl, nor use the ssl backend of kdelibs4,
#nor links to libkimap or libmailtransport from kdepimlibs4
license_noconflict openssl
-#Fully removing X11 only function to prevent automoc to include it
-patchfiles patch-kwalletd.diff
+#kwalletd: Fully removing X11 only function to prevent automoc to include it
+#DrKonqi: Fix issues with Dr Konqi during bug reporting on OSX (see https://git.reviewboard.kde.org/r/119498/)
+patchfiles patch-kwalletd.diff \
+ patch-DrKonqi.diff
#Blacklist gcc42 and llvm-gcc-42 (does not build with gcc, ticket #37574)
compiler.blacklist gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
@@ -45,7 +47,13 @@
port:redland \
port:raptor2 \
port:webp \
- port:bison
+ port:bison \
+ port:shared-mime-info \
+ port:gpgme port:attica \
+ port:libgcrypt port:openexr \
+ port:xz port:zlib \
+ port:qca \
+ port:perl5
depends_run-append port:virtuoso
Added: trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff
===================================================================
--- trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff (rev 0)
+++ trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff 2014-10-10 03:21:45 UTC (rev 126431)
@@ -0,0 +1,71 @@
+diff -ur ../kde-runtime-4.13.3-orig/drkonqi/gdbhighlighter.cpp ./drkonqi/gdbhighlighter.cpp
+--- ../kde-runtime-4.13.3-orig/drkonqi/gdbhighlighter.cpp 2014-07-06 16:27:04.000000000 +0900
++++ ./drkonqi/gdbhighlighter.cpp 2014-09-20 15:27:00.000000000 +0900
+@@ -30,6 +30,9 @@
+ lines.insert(l, line);
+ l += line.toString().count('\n');
+ }
++ // Add a dummy, in case the last backtrace line has more than 1 '\n' char.
++ const BacktraceLine dummy;
++ lines.insert(l, dummy);
+
+ // setup formates
+ KColorScheme scheme(QPalette::Active);
+@@ -71,7 +74,8 @@
+ // -1 since we skip the first line
+ QMap< int, BacktraceLine >::iterator it = lines.lowerBound(lineNr - 1);
+ Q_ASSERT(it != lines.end());
+- // lowerbound would return the next higher item, even though we want the former one
++ // QMap::lowerbound() returns the next higher item or
++ // the dummy item, but we want the one before that.
+ if (it.key() > lineNr - 1) {
+ --it;
+ }
+diff -ur ../kde-runtime-4.13.3-orig/drkonqi/main.cpp ./drkonqi/main.cpp
+--- ../kde-runtime-4.13.3-orig/drkonqi/main.cpp 2014-07-06 16:27:04.000000000 +0900
++++ ./drkonqi/main.cpp 2014-09-20 15:27:00.000000000 +0900
+@@ -43,7 +43,10 @@
+
+ int main(int argc, char* argv[])
+ {
+-#ifndef Q_OS_WIN //krazy:exclude=cpp
++#if !defined(Q_OS_WIN)
++// #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
++// When starting Dr Konqi via kdeinit4, Apple OS X aborts us unconditionally for
++// using setgid/setuid, even if the privs were those of the logged-in user.
+ // Drop privs.
+ setgid(getgid());
+ if (setuid(getuid()) < 0 && geteuid() != getuid()) {
+@@ -106,6 +109,9 @@
+
+ DrKonqiDialog *w = new DrKonqiDialog();
+ w->show();
++ // Make sure the Dr Konqi dialog comes to the front, whatever the platform
++ // or window manager, but especially on Apple OS X.
++ w->raise();
+ int ret = qa->exec();
+
+ DrKonqi::cleanup();
+diff -ur ../kde-runtime-4.13.3-orig/drkonqi/reportassistantpages_bugzilla.cpp ./drkonqi/reportassistantpages_bugzilla.cpp
+--- ../kde-runtime-4.13.3-orig/drkonqi/reportassistantpages_bugzilla.cpp 2014-07-06 16:27:04.000000000 +0900
++++ ./drkonqi/reportassistantpages_bugzilla.cpp 2014-09-20 15:27:00.000000000 +0900
+@@ -283,9 +283,18 @@
+ {
+ if (!(ui.m_userEdit->text().isEmpty() || ui.m_passwordEdit->text().isEmpty())) {
+
++#ifndef Q_OS_MAC
++ // On Apple OS X, the following test is omitted (for now) because kded4,
++ // the KDE daemon is not usually running (OS X is not a KDE desktop) and
++ // the absence of kded4 causes Dr Konqi to crash.
++ //
++ // The code based on cookies is intended to be replaced because Bugzilla
++ // and bugs.kde.org no longer use cookies (Bugzilla 4.4.5, July 2014).
++ //
+ if (!canSetCookies()) {
+ return;
+ }
++#endif
+
+ ui.m_loginButton->setEnabled(false);
+
+Only in .: patch-DrKonqi.diff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141009/8f3e3eb5/attachment.html>
More information about the macports-changes
mailing list