<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4606c62b254f469098fe72805b99c13e81ec1839">https://github.com/macports/macports-ports/commit/4606c62b254f469098fe72805b99c13e81ec1839</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4606c62 darktable: update to 2.2.3
</span>4606c62 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4606c62b254f469098fe72805b99c13e81ec1839
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Thu Feb 23 11:42:25 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> darktable: update to 2.2.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Major reworking of darktable port. Project is now hosted on github, significant
</span><span style='display:block; white-space:pre;color:#404040;'> changes to deps (including update to gtk3), only builds with quartz.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Minor functional testing so far other than to launch and display jpegs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/43286
</span><span style='display:block; white-space:pre;color:#404040;'> Believed to:
</span><span style='display:block; white-space:pre;color:#404040;'> Fix https://trac.macports.org/ticket/43199
</span><span style='display:block; white-space:pre;color:#404040;'> Fix https://trac.macports.org/ticket/47226
</span><span style='display:block; white-space:pre;color:#404040;'> Fix https://trac.macports.org/ticket/51447
</span>---
graphics/darktable/Portfile | 120 ++++++++-------------------
graphics/darktable/files/patch-build.sh.diff | 10 ---
2 files changed, 36 insertions(+), 94 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/Portfile b/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b0f8cb..3e50e64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/darktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup darktable-org darktable 2.2.3 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# distfile is actually gzip but has xz extension?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${name}-${version}.tar.xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 05afa3d4b7778ee1d7d2a04cf2fb87487f5650d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 60fb250bd78ea45f57476807bb31d141240292e03b73cb8b3417a8148cc16d7c
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name darktable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,105 +27,51 @@ long_description Darktable is a virtual lighttable and darkroom for \
</span> and enhance them.
homepage http://www.darktable.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/darktable/darktable/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8c4594334f884866b789fedf87093f232c3fb4b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:adwaita-icon-theme \
</span> port:curl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dbus-glib \
</span> port:exiv2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-engines2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flickcurl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:GraphicsMagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-osx-application-gtk3 \
</span> port:jpeg \
port:json-glib \
port:lcms2 \
port:lensfun \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libglade2 \
</span> port:libgphoto2 \
port:libpng \
port:librsvg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsecret \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsoup \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lua52 \
</span> port:libxml2 \
port:openexr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:osm-gps-map \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml \
</span> port:sqlite3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:webp \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-build.sh.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./build.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args --prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --jobs ${build.jobs} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-flickr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-kwallet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gnome-keyring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-opencl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-unity \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tethering \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-experimental \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-geo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:tr1/::" ${worksrcpath}/src/common/imageio_exr.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/tr1:://" ${worksrcpath}/src/common/imageio_exr.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant quartz conflicts gcc44 gcc45 {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gcc44 conflicts gcc45 gcc46 gcc47 quartz universal description {Build with GCC 4.4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gcc45 conflicts gcc44 gcc46 gcc47 quartz universal description {Build with GCC 4.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants gdk-pixbuf2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants gtk3 quartz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gcc46 conflicts gcc44 gcc45 gcc47 universal description {Build with GCC 4.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# To have working OpenMP (at least partly, only for C source files) you will also need gcc5:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# $ sudo port install gcc5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles patch-build.sh.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gcc47 conflicts gcc44 gcc45 gcc46 universal description {Build with GCC 4.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gnome_keyring description {Build with gnome-keyring} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-gnome-keyring
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-gnome-keyring
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libgnome-keyring
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_CMSTEST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTESTBUILD_OPENCL_PROGRAMS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_COLORD=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_KWALLET=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_OPENMP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_UNITY=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://sourceforge.net/api/file/index/project-id/258690/rss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {darktable-([0-9.]+?).tar}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#livecheck.regex release-(${branch}.\[0-9.\]?).tar
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/darktable/files/patch-build.sh.diff b/graphics/darktable/files/patch-build.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 602e202..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/darktable/files/patch-build.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.sh.orig 2013-01-11 17:40:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.sh 2013-01-17 04:08:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,6 +238,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_MORE_OPTIONS} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$DT_SRC_DIR" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+&& exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $MAKE -j $MAKE_TASKS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? = 0 ]; then
</span></pre><pre style='margin:0'>
</pre>