<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129725] trunk/dports/kde/kdelibs4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129725">129725</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-12-19 05:45:56 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>kdelibs4: update to 4.14.3
remove conflicts with obsolete port</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekdelibs4Portfile">trunk/dports/kde/kdelibs4/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportskdekdelibs4filesavoidkwindowinfodestructorpatch">trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch</a></li>
<li><a href="#trunkdportskdekdelibs4filespatchfixKCrashdiff">trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekdelibs4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kdelibs4/Portfile (129724 => 129725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdelibs4/Portfile 2014-12-19 11:45:22 UTC (rev 129724)
+++ trunk/dports/kde/kdelibs4/Portfile 2014-12-19 13:45:56 UTC (rev 129725)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup kde4 1.1
</span><span class="cx">
</span><span class="cx"> name kdelibs4
</span><del>-version 4.13.3
-revision 1
</del><ins>+version 4.14.3
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers nicos
</span><span class="cx"> license LGPL-2+ GPL-2+ BSD
</span><span class="lines">@@ -18,8 +17,8 @@
</span><span class="cx"> use_xz yes
</span><span class="cx"> distname kdelibs-${version}
</span><span class="cx">
</span><del>-checksums rmd160 8db76ec77ed09d180223fb3a37b38e8ca8798d75 \
- sha256 d291b4bc159a3f686ad93ff3dfbe90a0a7e33600357e8390c84154ec050efc82
</del><ins>+checksums rmd160 f0dd628eec72c52f4dd8426a2de47d75e629ff31 \
+ sha256 f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e
</ins><span class="cx">
</span><span class="cx"> #No binary links to openssl libraries, apart from libkio.dylib at
</span><span class="cx"> #runtime if required. As libkio.dylib code is purely LGPL, there is no
</span><span class="lines">@@ -50,27 +49,21 @@
</span><span class="cx"> # the aspell dictionaries are just files
</span><span class="cx"> depends_skip_archcheck aspell-dict-en
</span><span class="cx">
</span><del>-conflicts kdelibs3
-
</del><span class="cx"> #workaround-kdeinit4-crash: Mac-specific patch developed by Macports to circumvent some crashes.
</span><del>-#avoid-kwindowinfo-destructor: Prevent sending null pointer to CFRelease (see ticket #44258)
</del><span class="cx"> #default-kde4-xdg-menu-prefix: solves a conflict with a file from gnome-menus (see ticket #18914)
</span><span class="cx"> #add-bundles-to-path: improve support for KIO slaves by adding a search path
</span><span class="cx"> #kapplications-raster: ensures that kde applications start in raster (faster) mode, but also provides a switch for non-working applications
</span><span class="cx"> #removeFindFlex: remove FindFlex.cmake which may hide the working one of cmake (ticket #44119)
</span><span class="cx"> #cmake-modules-FindKDE4-Internal.cmake: Fixes zlib detection (see ticket #24128)
</span><del>-#fixKCrash: Fix issues in the KDE reporting system on OSX (see https://git.reviewboard.kde.org/r/119497/, committed upstream)
</del><span class="cx"> #nativeDialogs: Use native mac dialogs (see https://reviewboard.kde.org/r/119243/)
</span><span class="cx"> #KdePreferences: Handles menus to be closer to standard Mac layout (see https://reviewboard.kde.org/r/120149/)
</span><span class="cx">
</span><span class="cx"> patchfiles workaround-kdeinit4-crash.patch \
</span><del>- avoid-kwindowinfo-destructor.patch \
</del><span class="cx"> default-kde4-xdg-menu-prefix.patch \
</span><span class="cx"> add-bundles-to-path.patch \
</span><span class="cx"> patch-kapplications-raster.diff \
</span><span class="cx"> patch-removeFindFlex.diff \
</span><span class="cx"> patch-cmake-modules-FindKDE4-Internal.cmake.diff \
</span><del>- patch-fixKCrash.diff \
</del><span class="cx"> patch-KdePreferences.diff
</span><span class="cx"> #Deactivated as of ticket #45373
</span><span class="cx"> # patch-nativeDialogs.diff
</span></span></pre></div>
<a id="trunkdportskdekdelibs4filesavoidkwindowinfodestructorpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch (129724 => 129725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch 2014-12-19 11:45:22 UTC (rev 129724)
+++ trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch 2014-12-19 13:45:56 UTC (rev 129725)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- kdelibs-4.12.5/kdeui/windowmanagement/kwindowinfo_mac.cpp.orig 2014-07-06 11:45:50.000000000 +0200
-+++ kdelibs-4.12.5/kdeui/windowmanagement/kwindowinfo_mac.cpp 2014-07-06 11:51:19.000000000 +0200
-@@ -51,7 +51,10 @@
-
- KWindowInfo::Private::~Private()
- {
-- CFRelease(m_axWin);
-+ // RJVB 20140706: the argument to CFRelease may not be a NULL pointer
-+ if( m_axWin ){
-+ CFRelease(m_axWin);
-+ }
- }
-
- void KWindowInfo::Private::updateData()
</del></span></pre></div>
<a id="trunkdportskdekdelibs4filespatchfixKCrashdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff (129724 => 129725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff 2014-12-19 11:45:22 UTC (rev 129724)
+++ trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff 2014-12-19 13:45:56 UTC (rev 129725)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-diff -ur kdelibs-4.13.3-orig/kdeui/util/kcrash.cpp kdelibs-4.13.3/kdeui/util/kcrash.cpp
---- kdelibs-4.13.3-orig/kdeui/util/kcrash.cpp 2014-07-11 15:42:13.000000000 +0900
-+++ kdelibs-4.13.3/kdeui/util/kcrash.cpp 2014-09-20 15:20:58.000000000 +0900
-@@ -313,7 +313,13 @@
- crashRecursionCounter++;
- }
-
--#if !defined(Q_OS_WIN)
-+ // On Apple OS X, closing all FDs now will cause a second (SIGILL) crash,
-+ // ending with "Unable to start Dr. Konqi". This is because the libdispatch
-+ // library, which can manage multi-threading, has some FDs of its own.
-+ //
-+ // Note: KCrash closes FDs unconditionally later on if it forks to Dr Konqi
-+ // and this program's FDs do not matter if kdeinit starts Dr Konqi.
-+#if !defined(Q_OS_WIN) and !defined(Q_OS_MAC)
- if (!(s_flags & KeepFDs))
- closeAllFDs();
- # if defined(Q_WS_X11)
-@@ -520,9 +526,12 @@
- // This is done because it is dangerous to use fork() in the crash handler
- // (there can be functions registered to be performed before fork(), for example handling
- // of malloc locking, which doesn't work when malloc crashes because of heap corruption).
-+#ifndef Q_OS_MAC
-+ // Fails on Apple OSX+KDE4, because kdeinit4 is using the wrong socket name.
- if (!(s_flags & AlwaysDirectly)) {
- startDirectly = !startProcessInternal(argc, argv, waitAndExit, false);
- }
-+#endif
-
- // If we can't reach kdeinit, we can still at least try to fork()
- if (startDirectly) {
-@@ -805,7 +814,8 @@
-
- server.sun_family = AF_UNIX;
- strcpy(server.sun_path, sock_file);
-- printf("sock_file=%s\n", sock_file);
-+ // Use stderr, to make the message visible on the Apple OS X Console log.
-+ fprintf(stderr, "KCrash: Connect sock_file=%s\n", sock_file);
- socklen = sizeof(server);
- if(connect(s, (struct sockaddr *)&server, socklen) == -1)
- {
</del></span></pre>
</div>
</div>
</body>
</html>