<!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>[123279] trunk/dports/kde/digikam</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/123279">123279</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-08-07 15:29:18 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>digikam: update to 4.0.0 (maintainer; #44104)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdedigikamPortfile">trunk/dports/kde/digikam/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdedigikamfilesfindColorSyncprofilespatch">trunk/dports/kde/digikam/files/find-ColorSync-profiles.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdedigikamPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/digikam/Portfile (123278 => 123279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/digikam/Portfile 2014-08-07 21:30:03 UTC (rev 123278)
+++ trunk/dports/kde/digikam/Portfile 2014-08-07 22:29:18 UTC (rev 123279)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name digikam
</span><del>-version 3.5.0
-revision 1
</del><ins>+version 4.0.0
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers hyper-world.de:jan openmaintainer \
</span><span class="lines">@@ -20,8 +19,8 @@
</span><span class="cx"> homepage http://www.digikam.org/
</span><span class="cx"> master_sites kde:stable/digikam/
</span><span class="cx">
</span><del>-checksums rmd160 99afee6f47818653a5011f5a3416a04fb3a6a70f \
- sha256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a
</del><ins>+checksums rmd160 1ffc3e164772d031ff4b017598265bcd1934b919 \
+ sha256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="lines">@@ -50,10 +49,6 @@
</span><span class="cx"> port:ImageMagick \
</span><span class="cx"> path:include/eigen3/Eigen/Eigen:eigen3
</span><span class="cx">
</span><del>-# opencv is not universal
-
-universal_variant no
-
</del><span class="cx"> # Dependencies of digiKam
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:boost \
</span><span class="lines">@@ -79,6 +74,9 @@
</span><span class="cx"> # port:hugin-app \
</span><span class="cx"> # port:enblend
</span><span class="cx">
</span><ins>+# kde4-baseapps is not universal
+universal_variant no
+
</ins><span class="cx"> # gcc-4.0 is also blacklisted for opencv
</span><span class="cx"> # clang stumbles over CV_XADD macro, see #37184
</span><span class="cx"> compiler.blacklist gcc-4.0
</span><span class="lines">@@ -139,9 +137,9 @@
</span><span class="cx"> port:libksane
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Option to compile target with LCMS shared lib version 2 instead version 1
</del><ins>+# Option to compile target with LCMS shared lib version 2 instead of version 1
</ins><span class="cx">
</span><del>-variant lcms2 description {Build digiKam with LCMS2 shared libs instead LCMS1} {}
</del><ins>+variant lcms2 description {Build digiKam with LCMS2 shared libs instead of LCMS1} {}
</ins><span class="cx">
</span><span class="cx"> if {[variant_isset lcms2]} {
</span><span class="cx"> configure.args-append -DENABLE_LCMS2=on
</span><span class="lines">@@ -153,9 +151,9 @@
</span><span class="cx"> depends_lib-append port:lcms
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Option to check MySql availability before to compile target
</del><ins>+# Option to check MySQL availability before compiling target
</ins><span class="cx">
</span><del>-variant mysql_check description {Check MySql availability before to build digiKam} {}
</del><ins>+variant mysql_check description {Check MySQL availability before building digiKam} {}
</ins><span class="cx">
</span><span class="cx"> if {[variant_isset mysql_check]} {
</span><span class="cx"> configure.args-append -DENABLE_INTERNALMYSQL=on
</span><span class="lines">@@ -164,3 +162,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> configure.args-append -DENABLE_INTERNALMYSQL=off
</span><span class="cx"> }
</span><ins>+
+livecheck.type regex
+livecheck.url http://kde-apps.org/content/show.php/digiKam+Software+Collection?content=137059
+livecheck.regex "digiKam Software Collection.*(4\\.\\d+?(\\.\\d+))"
+
</ins></span></pre></div>
<a id="trunkdportskdedigikamfilesfindColorSyncprofilespatch"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/digikam/files/find-ColorSync-profiles.patch (0 => 123279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/digikam/files/find-ColorSync-profiles.patch (rev 0)
+++ trunk/dports/kde/digikam/files/find-ColorSync-profiles.patch 2014-08-07 22:29:18 UTC (rev 123279)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+--- core/libs/dimg/filters/icc/iccprofile.cpp.orig
++++ core/libs/dimg/filters/icc/iccprofile.cpp
+@@ -489,7 +489,39 @@
+ #ifdef Q_WS_WIN
+ //TODO
+ #elif defined (Q_WS_MAC)
+- //TODO
++ // RJVB 20140620: use a scheme highly identical to the Linux scheme, adapted for MacPorts in /opt/local and the OS X standard ColorSync directories
++
++ candidates << "/System/Library/ColorSync/Profiles";
++ candidates << "/Library/ColorSync/Profiles";
++ candidates << QDir::homePath() + "/Library/ColorSync/Profiles";
++
++ // MacPorts installs for KDE, so we include the XDG data dirs, including /usr/share/color/icc
++ QStringList dataDirs = QString::fromLocal8Bit(getenv("XDG_DATA_DIRS")).split(':', QString::SkipEmptyParts);
++
++ if (!dataDirs.contains(QLatin1String("/opt/local/share")))
++ {
++ dataDirs << "/opt/local/share";
++ }
++
++ foreach(const QString& dataDir, dataDirs)
++ {
++ candidates << dataDir + "/color/icc";
++ }
++
++ // XDG_DATA_HOME
++ QString dataHomeDir = QString::fromLocal8Bit(getenv("XDG_DATA_HOME"));
++
++ if (!dataHomeDir.isEmpty())
++ {
++ candidates << dataHomeDir + "/color/icc";
++ candidates << dataHomeDir + "/icc";
++ }
++
++ // home dir directories
++ candidates << QDir::homePath() + "/.local/share/color/icc/";
++ candidates << QDir::homePath() + "/.local/share/icc/";
++ candidates << QDir::homePath() + "/.color/icc/";
++
+ #else
+
+ // XDG data dirs, including /usr/share/color/icc
+--- core/utilities/setup/setupicc.cpp.orig
++++ core/utilities/setup/setupicc.cpp
+@@ -901,6 +901,25 @@
+ existingPaths = defaultSearchPaths.join("</li><li>");
+ }
+
++#ifdef Q_WS_WIN
++ //TODO
++#elif defined (Q_WS_MAC)
++ QString text = i18n("On Mac OS X, the default search paths include "
++ "<ul>"
++ "<li>/System/Library/ColorSync/Profiles</li>"
++ "<li>/Library/ColorSync/Profiles</li>"
++ "<li>~/Library/ColorSync/Profiles</li>"
++ "<li>/opt/local/share/color/icc</li>"
++ "<li>~/.local/share/color/icc/</li>"
++ "<li>~/.local/share/icc/</li>"
++ "<li>~/.color/icc/</li>"
++ "</ul>"
++ "On your system, currently these paths exist and are scanned:"
++ "<ul>"
++ "<li>%1</li>"
++ "</ul>",
++ existingPaths);
++#else
+ QString text = i18n("On Linux, the default search paths include "
+ "<ul>"
+ "<li>/usr/share/color/icc</li>"
+@@ -914,6 +933,7 @@
+ "<li>%1</li>"
+ "</ul>",
+ existingPaths);
++#endif
+ QWhatsThis::showText(d->iccFolderLabel->mapToGlobal(QPoint(0, 0)), text, d->iccFolderLabel);
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>