[144729] trunk/dports/graphics/MyPaint
ryandesign at macports.org
ryandesign at macports.org
Sat Jan 16 12:09:51 PST 2016
Revision: 144729
https://trac.macports.org/changeset/144729
Author: ryandesign at macports.org
Date: 2016-01-16 12:09:51 -0800 (Sat, 16 Jan 2016)
Log Message:
-----------
MyPaint: update to 1.2.0
MyPaint-devel: update to 1.3.0-alpha.20160115+git.6ba6c251
Fix possible wrong build or build failure due to library and include order
Modified Paths:
--------------
trunk/dports/graphics/MyPaint/Portfile
Added Paths:
-----------
trunk/dports/graphics/MyPaint/files/library-and-include-order.patch
Removed Paths:
-------------
trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff
trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff
trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff
Modified: trunk/dports/graphics/MyPaint/Portfile
===================================================================
--- trunk/dports/graphics/MyPaint/Portfile 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/Portfile 2016-01-16 20:09:51 UTC (rev 144729)
@@ -3,9 +3,43 @@
PortSystem 1.0
PortGroup app 1.0
+PortGroup github 1.0
name MyPaint
-set my_name mypaint
+
+if {${name} eq ${subport}} {
+ conflicts ${name}-devel
+ github.setup mypaint mypaint 1.2.0 v
+
+ github.tarball_from releases
+ use_xz yes
+
+ checksums rmd160 89c0960d1e38f71623225221ef109b1ed0ea217c \
+ sha256 cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2
+}
+
+subport ${name}-devel {
+ conflicts ${name}
+ github.setup mypaint mypaint 6ba6c251207d6efa629b8a1d3a3d70dc688fac55
+ version 1.3.0-alpha.20160115+git.[string range ${git.branch} 0 7]
+ set libmypaint_branch f6278c97aa5af443e30069099c6461b056cdfe63
+
+ master_sites-append https://github.com/${github.author}/libmypaint/tarball/${libmypaint_branch}:libmypaint
+ distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
+
+ checksums mypaint-${git.branch}${extract.suffix} \
+ rmd160 12d69eb0c22bf179e436c4160864878d2089df41 \
+ sha256 e83f8822aa0e2f6c9ef53002103c87569f7b4d14c5789ba881da931f9cbf57cb \
+ libmypaint-${libmypaint_branch}${extract.suffix} \
+ rmd160 67cd7cb49c817a6216eb8dabdb87e0d8648fa1fe \
+ sha256 7eb0e28cb74d2c5c3f8dbdf67a084b58f135ac145c562dd46ac71f7bfcd38df6
+
+ post-extract {
+ delete ${workpath}/mypaint-${git.branch}/brushlib
+ move {*}[glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
+ }
+}
+
homepage http://mypaint.info/
categories graphics
maintainers ryandesign
@@ -20,19 +54,26 @@
minimum distractions, bringing up the interface only \
when you need it.
-depends_build port:pkgconfig \
+depends_build-append port:pkgconfig \
port:scons \
port:swig-python
-depends_lib port:json-c \
+depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:gtk3 \
+ port:json-c \
port:lcms2 \
port:libpng \
+ port:librsvg \
port:python27 \
+ port:py27-cairo \
+ port:py27-gobject3 \
port:py27-numpy \
port:py27-protobuf
-depends_run port:hicolor-icon-theme
+depends_run-append port:hicolor-icon-theme
+patchfiles library-and-include-order.patch
+
use_configure no
variant universal {}
@@ -63,7 +104,7 @@
build.args-append enable_openmp=true
}
-set docdir ${destroot}${prefix}/share/doc/${name}
+set docdir ${prefix}/share/doc/${name}
post-destroot {
# Because we must set --install-sandbox to a relative path for now, multiple pre-destroot
# directories get created, which must now be combined; see https://gna.org/bugs/?20399
@@ -73,11 +114,15 @@
system -W ${destroot} "tar -C ${d} -c -f - .${prefix} | tar -x -p -v -f -"
}
}
- xinstall -d ${docdir}
+ xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} \
+ CODE_OF_CONDUCT.md \
+ CONTRIBUTING.md \
COPYING \
- LICENSE \
- ${docdir}
+ DEBUGGING.md \
+ Licenses.md \
+ README.md \
+ ${destroot}${docdir}
}
app.executable ${workpath}/${name}
@@ -92,75 +137,6 @@
}
}
-if {${name} eq ${subport}} {
- conflicts ${name}-devel
- version 1.1.0
- revision 3
-
- master_sites http://download.gna.org/mypaint/
- distname ${my_name}-${version}
- use_xz yes
-
- checksums rmd160 a102688793e2392f70bd625d65cd5b4ea763adec \
- sha256 58fd90b08fa3142b6dddc2a656c0e406fc3ebcf9086b84e83815780ab7698036
-
- depends_lib-append port:py27-pygtk
-
- patchfiles-append patch-${subport}-SConstruct.diff
- patchfiles-append patch-${subport}-brushlib-SConscript.diff
- patchfiles-append patch-${subport}-malloc.diff
-
- post-destroot {
- xinstall -m 644 -W ${worksrcpath} \
- README \
- ${docdir}
- }
-
- post-activate {
- system "${prefix}/bin/gtk-update-icon-cache -tf ${prefix}/share/icons/hicolor"
- }
-
- livecheck.type regex
- livecheck.url [lindex ${master_sites} 0]
- livecheck.regex ${my_name}-(\[0-9.\]+)${extract.suffix}
-} else {
- livecheck.type none
+post-activate {
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -tf ${prefix}/share/icons/hicolor"
}
-
-subport ${name}-devel {
- PortGroup github 1.0
- github.setup mypaint mypaint 64730e8c63c10ee466a9da72a4ddf431ca966277
- version 1.2.0-beta.20160109+git.[string range ${git.branch} 0 7]
- set libmypaint_branch 6f482bd6fdc462bb06df15a157edee7035b3ccf9
- conflicts ${name}
-
- master_sites-append https://github.com/${github.author}/libmypaint/tarball/${libmypaint_branch}:libmypaint
- distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
-
- checksums mypaint-${git.branch}${extract.suffix} \
- rmd160 97a25fbbb7b951392559346209449768a02c9f80 \
- sha256 dbc70dd33cc90c3fb05d96bed7bce3195f5c5081337e44409b6760c88692c459 \
- libmypaint-${libmypaint_branch}${extract.suffix} \
- rmd160 e390600cd6aad15d1b55ea5d4c23fda59ce901b7 \
- sha256 19baeb7570b5eceef8b0dd49de1ff60f86f0a357cbc82344fad2d7f5520627df
-
- depends_lib-append port:gtk3 \
- port:librsvg \
- port:py27-cairo \
- port:py27-gobject3
-
- post-extract {
- delete ${workpath}/mypaint-${git.branch}/brushlib
- move {*}[glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
- }
-
- post-destroot {
- xinstall -m 644 -W ${worksrcpath} \
- README.md \
- ${docdir}
- }
-
- post-activate {
- system "${prefix}/bin/gtk-update-icon-cache-3.0 -tf ${prefix}/share/icons/hicolor"
- }
-}
Added: trunk/dports/graphics/MyPaint/files/library-and-include-order.patch
===================================================================
--- trunk/dports/graphics/MyPaint/files/library-and-include-order.patch (rev 0)
+++ trunk/dports/graphics/MyPaint/files/library-and-include-order.patch 2016-01-16 20:09:51 UTC (rev 144729)
@@ -0,0 +1,27 @@
+Ensure we link with the just-built libmypaint, not a different version that might already be installed.
+https://github.com/mypaint/libmypaint/pull/41
+https://github.com/mypaint/mypaint/pull/566
+--- brushlib/tests/SConscript.orig 2016-01-15 13:42:55.000000000 -0600
++++ brushlib/tests/SConscript 2016-01-16 13:30:24.000000000 -0600
+@@ -19,7 +19,7 @@
+ testlib_env.Append(LIBS=['intl'])
+ elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS":
+ testlib_env.Append(LIBS=['intl'])
+-testlib_env.Append(CPPPATH=['../'], LIBPATH=['../'])
++testlib_env.Prepend(CPPPATH=['../'], LIBPATH=['../'])
+
+ if testlib_env['enable_gperftools']:
+ parse_pkg_config(testlib_env, "libprofiler")
+--- lib/SConscript.orig 2016-01-15 13:42:55.000000000 -0600
++++ lib/SConscript 2016-01-16 13:28:23.000000000 -0600
+@@ -21,8 +21,8 @@
+
+ # Build against brushlib
+ env.Prepend(LIBS=['mypaint-tests', "mypaint"])
+-env.Append(LIBPATH="../brushlib")
+-env.Append(CPPPATH=['../brushlib', '../brushlib/tests'])
++env.Prepend(LIBPATH="../brushlib")
++env.Prepend(CPPPATH=['../brushlib', '../brushlib/tests'])
+
+
+ def parse_pkg_config(env, libname):
Deleted: trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff 2016-01-16 20:09:51 UTC (rev 144729)
@@ -1,11 +0,0 @@
---- SConstruct.orig 2012-12-31 11:03:38.000000000 -0600
-+++ SConstruct 2013-01-02 11:20:08.000000000 -0600
-@@ -116,6 +113,8 @@
-
- return install_targs
-
-+env['CC'] = os.environ.get('CC', 'gcc')
-+env['CXX'] = os.environ.get('CXX', 'g++')
-
- def install_tree(env, dest, path, perms=0644, dirperms=0755):
- assert os.path.isdir(path)
Deleted: trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff 2016-01-16 20:09:51 UTC (rev 144729)
@@ -1,12 +0,0 @@
-https://gna.org/bugs/?20817
---- brushlib/SConscript.orig 2012-12-31 11:03:38.000000000 -0600
-+++ brushlib/SConscript 2014-06-01 03:52:55.000000000 -0500
-@@ -73,7 +73,7 @@
-
- env.Append(CPPPATH='./')
-
--pkg_deps = ['json']
-+pkg_deps = ['json-c']
- libs = ['m']
- linkflags = []
-
Deleted: trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff 2016-01-16 19:13:53 UTC (rev 144728)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff 2016-01-16 20:09:51 UTC (rev 144729)
@@ -1,23 +0,0 @@
-https://gna.org/bugs/?20398
---- brushlib/fifo.c.orig 2012-12-31 11:03:38.000000000 -0600
-+++ brushlib/fifo.c 2013-01-02 11:28:48.000000000 -0600
-@@ -15,7 +15,7 @@
- *
- */
-
--#include <malloc.h>
-+#include <stdlib.h>
- #include "fifo.h"
-
- struct fifo_item
---- brushlib/operationqueue.c.orig 2012-12-31 11:03:38.000000000 -0600
-+++ brushlib/operationqueue.c 2013-01-02 11:29:53.000000000 -0600
-@@ -15,7 +15,7 @@
- */
-
-
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
-
- #include <mypaint-glib-compat.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160116/95b560fe/attachment.html>
More information about the macports-changes
mailing list