<!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>[133889] 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/133889">133889</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2015-03-14 14:30:19 -0700 (Sat, 14 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>digikam: upgrade to current 4.8.0</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdedigikamPortfile">trunk/dports/kde/digikam/Portfile</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/kde/digikam/files/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdedigikamPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/digikam/Portfile (133888 => 133889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/digikam/Portfile        2015-03-14 21:17:37 UTC (rev 133888)
+++ trunk/dports/kde/digikam/Portfile        2015-03-14 21:30:19 UTC (rev 133889)
</span><span class="lines">@@ -6,22 +6,21 @@
</span><span class="cx"> PortGroup           compiler_blacklist_versions 1.0
</span><span class="cx"> 
</span><span class="cx"> name                digikam
</span><del>-version             4.0.0
-revision            1
</del><ins>+version             4.8.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="cx">                     gmail.com:caulier.gilles
</span><span class="cx"> platforms           darwin
</span><span class="cx"> 
</span><del>-description         Photo Management Program
-long_description    Digital photo management program to import, organize, enhance, search and export your digital images.
</del><ins>+description         Photo Management Programme
+long_description    Digital photo management programme to import, organise, enhance, search and export your digital images.
</ins><span class="cx"> 
</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 1ffc3e164772d031ff4b017598265bcd1934b919 \
-                    sha256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae
</del><ins>+checksums           rmd160  93ceb3b3b98739254c97df5aefc2c3965a7a9011 \
+                    sha256  e20f84508f35fddcaec3b931efbc604a95050ec08c6796b6bc60a61cd58fa390
</ins><span class="cx"> 
</span><span class="cx"> use_bzip2           yes
</span><span class="cx"> 
</span><span class="lines">@@ -37,6 +36,7 @@
</span><span class="cx">                     port:libpng \
</span><span class="cx">                     port:opencv \
</span><span class="cx">                     port:marble
</span><ins>+depends_lib-append  port:libpgf
</ins><span class="cx"> 
</span><span class="cx"> # Dependencies of kipi-plugins
</span><span class="cx"> 
</span><span class="lines">@@ -68,12 +68,14 @@
</span><span class="cx">                     port:kde4-runtime \
</span><span class="cx">                     port:oxygen-icons \
</span><span class="cx">                     port:qt4-mac-sqlite3-plugin
</span><del>-# Following dependencies are needed for Panorama and ExpoBlending tools, but
</del><ins>+# Following dependency is needed for the Panorama (and ExpoBlending?) tool, but
</ins><span class="cx"> # cannot be installed on Intel Macs currently as far as I know. Also they need
</span><span class="cx"> # wxWidgets which currently cannot be installed with XCode of OS X 10.7 or
</span><span class="cx"> # newer.
</span><ins>+# RJVB 20140918: hugin needs wxWidgets 3 nowadays, which introduces a dependency to another GUI framework. Users who
+# want the Panorama tool can install hugin-app manually and then build digikam from source
+# (or we could add yet another variant)
</ins><span class="cx"> #                   port:hugin-app \
</span><del>-#                   port:enblend
</del><span class="cx"> 
</span><span class="cx"> # kde4-baseapps is not universal
</span><span class="cx"> universal_variant   no
</span><span class="lines">@@ -83,19 +85,22 @@
</span><span class="cx"> compiler.blacklist  gcc-4.0
</span><span class="cx"> compiler.blacklist-append   {clang &lt; 318}
</span><span class="cx"> 
</span><del>-# build fix due to lensfun 0.3.0 API changes (CCI support removed)
-# see http://sourceforge.net/p/lensfun/code/ci/f0c293162fb1480142073743c96ac7e6f4ba3628/
-patchfiles-append   patch-lensfun-0.3.0.diff
-
</del><span class="cx"> # Configurations rules to compile fine #####################################
</span><span class="cx"> 
</span><del>-configure.args-append -DCMAKE_C_FLAGS='-D__KDE_HAVE_GCC_VISIBILITY' \
-                      -DCMAKE_CXX_FLAGS='-D__KDE_HAVE_GCC_VISIBILITY' \
-                      -DCMAKE_SYSTEM_PREFIX_PATH=\&quot;${prefix}\;/usr\&quot; \
-                      -DCMAKE_MODULE_PATH=\&quot;${prefix}/share/cmake-2.8/Modules\;${prefix}/share/cmake/modules\&quot; \
-                      -DCMAKE_PREFIX_PATH=\&quot;${prefix}/lib/cmake\&quot; \
-                      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
</del><ins>+# 20140918: do we really need to specify the CMAKE_MODULE_PATH nowadays?
+# -DCMAKE_MODULE_PATH=\&quot;${prefix}/share/cmake-2.8/Modules\;${prefix}/share/cmake/modules\&quot; \
+# We do need to add ENABLE_KDEPIMLIBSSUPPORT though, otherwise the dependency on kdepimlibs4 is
+# there for nothing!
+# There also appears to be no (more) need to force-defined __KDE_HAVE_GCC_VISIBILITY
+# -DCMAKE_CXX_FLAGS='-D__KDE_HAVE_GCC_VISIBILITY'
+#-DCMAKE_SYSTEM_PREFIX_PATH=\&quot;${prefix}\;/usr\&quot;
+#-DCMAKE_PREFIX_PATH=\&quot;${prefix}/lib/cmake\&quot;
+#-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
+
+configure.args-append -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON \
</ins><span class="cx">                       -DOpenCV_DIR=${prefix}/lib/cmake \
</span><ins>+                      -DDIGIKAMSC_COMPILE_LIBKGEOMAP:BOOL=ON -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE:BOOL=ON \
+                      -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI:BOOL=ON -DDIGIKAMSC_COMPILE_LIBKFACE:BOOL=ON \
</ins><span class="cx">                       -Wno-dev \
</span><span class="cx">                       ../${distname}
</span><span class="cx"> 
</span><span class="lines">@@ -106,7 +111,9 @@
</span><span class="cx"> if {[variant_isset debug]} {
</span><span class="cx">     configure.args-append -DCMAKE_BUILD_TYPE=debugfull
</span><span class="cx"> } else {
</span><del>-    configure.args-append -DCMAKE_BUILD_TYPE=releasewithdebug
</del><ins>+    # RJVB: use RelWithDebInfo instead of releasewithdebug, and prevent stripping
+    #configure.args-append -DCMAKE_BUILD_TYPE=releasewithdebug
+    configure.args-append -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_STRIP:FILEPATH=/bin/echo
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> # Option to compile handbook
</span><span class="lines">@@ -122,9 +129,9 @@
</span><span class="cx"> variant translations description {Build digiKam GUI translations} {}
</span><span class="cx"> 
</span><span class="cx"> if {[variant_isset translations]} {
</span><del>-    configure.args-append -DDIGIKAMSC_COMPILE_PO=on
</del><ins>+    configure.args-append -DDIGIKAMSC_COMPILE_PO=ON
</ins><span class="cx"> } else {
</span><del>-    configure.args-append -DDIGIKAMSC_COMPILE_PO=off
</del><ins>+    configure.args-append -DDIGIKAMSC_CHECKOUT_PO:BOOL=OFF -DDIGIKAMSC_COMPILE_PO=off
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> # Option to compile target using internal implementation of KdeGraphics shared libs maintained by digiKam team
</span></span></pre>
</div>
</div>

</body>
</html>