[123279] trunk/dports/kde/digikam
ryandesign at macports.org
ryandesign at macports.org
Thu Aug 7 15:29:18 PDT 2014
Revision: 123279
https://trac.macports.org/changeset/123279
Author: ryandesign at macports.org
Date: 2014-08-07 15:29:18 -0700 (Thu, 07 Aug 2014)
Log Message:
-----------
digikam: update to 4.0.0 (maintainer; #44104)
Modified Paths:
--------------
trunk/dports/kde/digikam/Portfile
Added Paths:
-----------
trunk/dports/kde/digikam/files/find-ColorSync-profiles.patch
Modified: trunk/dports/kde/digikam/Portfile
===================================================================
--- 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)
@@ -6,8 +6,7 @@
PortGroup compiler_blacklist_versions 1.0
name digikam
-version 3.5.0
-revision 1
+version 4.0.0
categories kde kde4
license GPL-2+
maintainers hyper-world.de:jan openmaintainer \
@@ -20,8 +19,8 @@
homepage http://www.digikam.org/
master_sites kde:stable/digikam/
-checksums rmd160 99afee6f47818653a5011f5a3416a04fb3a6a70f \
- sha256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a
+checksums rmd160 1ffc3e164772d031ff4b017598265bcd1934b919 \
+ sha256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae
use_bzip2 yes
@@ -50,10 +49,6 @@
port:ImageMagick \
path:include/eigen3/Eigen/Eigen:eigen3
-# opencv is not universal
-
-universal_variant no
-
# Dependencies of digiKam
depends_lib-append port:boost \
@@ -79,6 +74,9 @@
# port:hugin-app \
# port:enblend
+# kde4-baseapps is not universal
+universal_variant no
+
# gcc-4.0 is also blacklisted for opencv
# clang stumbles over CV_XADD macro, see #37184
compiler.blacklist gcc-4.0
@@ -139,9 +137,9 @@
port:libksane
}
-# Option to compile target with LCMS shared lib version 2 instead version 1
+# Option to compile target with LCMS shared lib version 2 instead of version 1
-variant lcms2 description {Build digiKam with LCMS2 shared libs instead LCMS1} {}
+variant lcms2 description {Build digiKam with LCMS2 shared libs instead of LCMS1} {}
if {[variant_isset lcms2]} {
configure.args-append -DENABLE_LCMS2=on
@@ -153,9 +151,9 @@
depends_lib-append port:lcms
}
-# Option to check MySql availability before to compile target
+# Option to check MySQL availability before compiling target
-variant mysql_check description {Check MySql availability before to build digiKam} {}
+variant mysql_check description {Check MySQL availability before building digiKam} {}
if {[variant_isset mysql_check]} {
configure.args-append -DENABLE_INTERNALMYSQL=on
@@ -164,3 +162,8 @@
} else {
configure.args-append -DENABLE_INTERNALMYSQL=off
}
+
+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+))"
+
Added: trunk/dports/kde/digikam/files/find-ColorSync-profiles.patch
===================================================================
--- 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)
@@ -0,0 +1,79 @@
+--- 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);
+ }
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140807/958ea007/attachment-0001.html>
More information about the macports-changes
mailing list