[104234] trunk/dports/kde/digikam
eborisch at macports.org
eborisch at macports.org
Thu Mar 21 11:00:03 PDT 2013
Revision: 104234
https://trac.macports.org/changeset/104234
Author: eborisch at macports.org
Date: 2013-03-21 11:00:02 -0700 (Thu, 21 Mar 2013)
Log Message:
-----------
digikam: Update to 3.1.0. Addresses failures with current libkdcraw. See #38442
Modified Paths:
--------------
trunk/dports/kde/digikam/Portfile
Added Paths:
-----------
trunk/dports/kde/digikam/Files/
trunk/dports/kde/digikam/Files/extra_kipi-plugins_CMakeLists.txt.patch
Added: trunk/dports/kde/digikam/Files/extra_kipi-plugins_CMakeLists.txt.patch
===================================================================
--- trunk/dports/kde/digikam/Files/extra_kipi-plugins_CMakeLists.txt.patch (rev 0)
+++ trunk/dports/kde/digikam/Files/extra_kipi-plugins_CMakeLists.txt.patch 2013-03-21 18:00:02 UTC (rev 104234)
@@ -0,0 +1,23 @@
+--- extra/kipi-plugins/CMakeLists.txt.orig 2013-03-18 12:02:07.000000000 -0500
++++ extra/kipi-plugins/CMakeLists.txt 2013-03-18 12:03:00.000000000 -0500
+@@ -335,7 +335,7 @@
+ PRINT_PLUGIN_COMPILE_STATUS("Calendar" KDEPIMLIBS_FOUND)
+ PRINT_PLUGIN_COMPILE_STATUS("GPSSync" KGEOMAP_FOUND)
+ PRINT_PLUGIN_COMPILE_STATUS("Mediawiki" MEDIAWIKI_FOUND)
+-PRINT_PLUGIN_COMPILE_STATUS("Panorama" FLEX_FOUND AND BISON_FOUND)
++PRINT_PLUGIN_COMPILE_STATUS("Panorama" FLEX_FOUND AND BISON_FOUND AND FLEX_TARGET AND BISON_TARGET)
+ PRINT_PLUGIN_COMPILE_STATUS("VideoSlideshow" ImageMagick_FOUND AND QTGSTREAMER_FOUND)
+ PRINT_PLUGIN_COMPILE_STATUS("Wallpaper" BUILD_WALLPAPER)
+
+@@ -498,9 +498,9 @@
+ ADD_SUBDIRECTORY(mediawiki)
+ ENDIF(MEDIAWIKI_FOUND)
+
+- IF(FLEX_FOUND AND BISON_FOUND)
++ IF(FLEX_FOUND AND BISON_FOUND AND FLEX_TARGET AND BISON_TARGET)
+ ADD_SUBDIRECTORY(panorama)
+- ENDIF(FLEX_FOUND AND BISON_FOUND)
++ ENDIF(FLEX_FOUND AND BISON_FOUND AND FLEX_TARGET AND BISON_TARGET)
+
+ IF(ImageMagick_FOUND AND QTGSTREAMER_FOUND)
+ ADD_SUBDIRECTORY(videoslideshow)
Modified: trunk/dports/kde/digikam/Portfile
===================================================================
--- trunk/dports/kde/digikam/Portfile 2013-03-21 16:46:37 UTC (rev 104233)
+++ trunk/dports/kde/digikam/Portfile 2013-03-21 18:00:02 UTC (rev 104234)
@@ -3,10 +3,11 @@
PortSystem 1.0
PortGroup kde4 1.1
+PortGroup compiler_blacklist_versions 1.0
name digikam
-version 2.9.0
-revision 3
+version 3.1.0
+revision 0
categories kde kde4
license GPL-2+
maintainers hyper-world.de:jan openmaintainer
@@ -16,13 +17,16 @@
long_description Digital photo management program to import, organize, enhance, search and export your digital images.
homepage http://www.digikam.org/
-master_sites sourceforge:project/digikam/digikam/${version}
+master_sites http://download.kde.org/stable/digikam
-checksums rmd160 59bd82cd68f2e061f7eddff017056a331e5d0066 \
- sha256 73dd0f3820fc44bba7b72c98cab73d0391e98687674da8be11ff07590c703ba0
+checksums \
+ rmd160 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e \
+ sha256 f70fc84f3a680a855642fcc4664710116406bbe4068b0ad4d2cfb4127684c2aa
use_bzip2 yes
+patchfiles extra_kipi-plugins_CMakeLists.txt.patch
+
# Dependencies of Digikam and kipi-plugins.
depends_lib-append port:kdelibs4 \
port:libkdcraw \
@@ -65,8 +69,12 @@
depends_run-append port:oxygen-icons port:qt4-mac-sqlite3-plugin
# gcc-4.0 is also blacklisted for opencv
-# clang stumbles over CV_XADD macro, see #37184
-compiler.blacklist gcc-4.0 clang
+compiler.blacklist gcc-4.0
+compiler.blacklist-append {clang < 318}
-configure.args-append -DCMAKE_C_FLAGS='-D__KDE_HAVE_GCC_VISIBILITY' -DCMAKE_CXX_FLAGS='-D__KDE_HAVE_GCC_VISIBILITY' -DOpenCV_DIR=${prefix}/lib/cmake ../${distname}
+configure.args-append \
+ -DOpenCV_DIR=${prefix}/lib/cmake \
+ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=off \
+ -DCMAKE_BUILD_TYPE=release \
+ ../${distname}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130321/256ecea9/attachment.html>
More information about the macports-changes
mailing list