<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c7c14efc3a55a380f871bbed2e0952116fc981e2">https://github.com/macports/macports-ports/commit/c7c14efc3a55a380f871bbed2e0952116fc981e2</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 c7c14ef MyPaint: Update to 2.0.1
</span>c7c14ef is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c7c14efc3a55a380f871bbed2e0952116fc981e2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 3 14:58:42 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> MyPaint: Update to 2.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This now builds with python setuptools so all the strange workarounds
</span><span style='display:block; white-space:pre;color:#404040;'> for scons are no longer needed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/51685
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56432
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60574
</span>---
graphics/MyPaint/Portfile | 127 +++++----------------
graphics/MyPaint/files/MyPaint.in | 4 -
graphics/MyPaint/files/_DARWIN_C_SOURCE.patch | 24 ++++
.../MyPaint/files/library-and-include-order.patch | 27 -----
4 files changed, 54 insertions(+), 128 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/Portfile b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb130d0..4717b42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,54 +3,21 @@
</span> PortSystem 1.0
PortGroup app 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name MyPaint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup mypaint mypaint 1.2.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 fd57a9df4ad1900c52c0b4979231a0074a2f57be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 37897196
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mypaint mypaint 2.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 60718b6e9c4f26253f1887a527e0ba24554bcfac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7295048
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup mypaint mypaint 1fc6f4ccab6e421ef38004d481ceae95960c9f02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.3.0-alpha.20160514+git.[string range ${git.branch} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmypaint_branch 65ffae19bc152749d30e78593b7f78749b294718
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites-append https://github.com/${github.author}/libmypaint/tarball/${libmypaint_branch}:libmypaint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums mypaint-${git.branch}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9e59572660debb783819bbf1f74e041208a5a5f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 085e874d2cbe97473c7de2f82ac09cfa8ad3f4187e491c7a0310fdc30dae7c0c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38589643 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmypaint-${libmypaint_branch}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2abaf3bf42fbeddf135fc2a63bf1d7574463b400 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 964db80901b4a442f43095c84437cc1e0170c8559b9fdbd3387ebe43be1f213a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 862139
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${workpath}/mypaint-${git.branch}/brushlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
</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;'>-conflicts-append libmypaint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://mypaint.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name MyPaint
</span> categories graphics
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+ LGPL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span> platforms darwin
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span>
description a fast and easy graphics application for digital painters
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,71 +26,46 @@ long_description ${name} is ${description}. It lets you focus on the
</span> minimum distractions, bringing up the interface only \
when you need it.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://mypaint.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 38 doesn't work; see https://github.com/mypaint/mypaint/issues/1087
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:scons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span> port:swig-python
depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gtk3 \
port:json-c \
port:lcms2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmypaint \
</span> port:libpng \
port:librsvg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-protobuf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pyobjc-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mypaint-brushes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python.version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyobjc
</span>
depends_run-append port:hicolor-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append library-and-include-order.patch
</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;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles _DARWIN_C_SOURCE.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${prefix}/bin/scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args python_binary=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_config=${prefix}/bin/python2.7-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXX=${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "PKG_CONFIG_PATH=[join ${configure.pkg_config_path} :]"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args {*}${build.args} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=${prefix}
</span> destroot.env {*}${build.env}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Setting --install-sandbox to an absolute path to a subdirectory of ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# is supposed to work, but doesn't; see https://gna.org/bugs/?20399
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#destroot.destdir --install-sandbox=${worksrcpath}/destroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir --install-sandbox=pre-destroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# prefix must apparently be a nonexistent directory that MacPorts nevertheless has
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# permission to create during the build phase; see https://gna.org/bugs/?20399
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append prefix=${workpath}/nonexistent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append enable_openmp=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append enable_openmp=true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
set docdir ${prefix}/share/doc/${name}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Because we must set --install-sandbox to a relative path for now, multiple pre-destroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directories get created, which must now be combined; see https://gna.org/bugs/?20399
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse d ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file tail ${d}] eq "pre-destroot"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "merging ${d} with destroot"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot} "tar -C ${d} -c -f - .${prefix} | tar -x -p -v -f -"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> CODE_OF_CONDUCT.md \
CONTRIBUTING.md \
COPYING \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,18 +75,9 @@ post-destroot {
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable ${workpath}/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable ${frameworks_dir}/Python.framework/Versions/${python.branch}/bin/mypaint
</span> app.icon pixmaps/mypaint_logo.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform macosx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/${name}.in ${workpath}/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${name}
</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> post-activate {
system "${prefix}/bin/gtk-update-icon-cache-3.0 -tf ${prefix}/share/icons/hicolor"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/files/MyPaint.in b/graphics/MyPaint/files/MyPaint.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8c3aedd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/files/MyPaint.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-export PATH="@PREFIX@/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec "@PREFIX@/bin/mypaint"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/files/_DARWIN_C_SOURCE.patch b/graphics/MyPaint/files/_DARWIN_C_SOURCE.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..88247b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MyPaint/files/_DARWIN_C_SOURCE.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Since setup is already defining _POSIX_C_SOURCE, also define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+_DARWIN_C_SOURCE to avoid this error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/include/signal.h:69:42: error: use of undeclared identifier 'NSIG'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern __const char *__const sys_signame[NSIG];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/include/signal.h:70:42: error: use of undeclared identifier 'NSIG'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern __const char *__const sys_siglist[NSIG];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/mypaint/mypaint/issues/1086
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/mypaint/mypaint/commit/c1ff5f8ec1b428a663f578405d08180a5df31379
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2020-05-29 11:40:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2020-06-02 21:15:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -874,7 +874,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extra_compile_args.append('-D_DARWIN_C_SOURCE')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform == "win32":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform == "msys":
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/files/library-and-include-order.patch b/graphics/MyPaint/files/library-and-include-order.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 78641c7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/files/library-and-include-order.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Ensure we link with the just-built libmypaint, not a different version that might already be installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mypaint/libmypaint/pull/41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mypaint/mypaint/pull/566
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- brushlib/tests/SConscript.orig 2016-01-15 13:42:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ brushlib/tests/SConscript 2016-01-16 13:30:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testlib_env.Append(LIBS=['intl'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testlib_env.Append(LIBS=['intl'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--testlib_env.Append(CPPPATH=['../'], LIBPATH=['../'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+testlib_env.Prepend(CPPPATH=['../'], LIBPATH=['../'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if testlib_env['enable_gperftools']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parse_pkg_config(testlib_env, "libprofiler")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/SConscript.orig 2016-01-15 13:42:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/SConscript 2016-01-16 13:28:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,8 +21,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build against brushlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env.Prepend(LIBS=['mypaint-tests', "mypaint"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--env.Append(LIBPATH="../brushlib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--env.Append(CPPPATH=['../brushlib', '../brushlib/tests'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+env.Prepend(LIBPATH="../brushlib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+env.Prepend(CPPPATH=['../brushlib', '../brushlib/tests'])
</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;'>- def parse_pkg_config(env, libname):
</span></pre><pre style='margin:0'>
</pre>