[130177] trunk/dports/graphics/MyPaint
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 27 23:18:03 PST 2014
Revision: 130177
https://trac.macports.org/changeset/130177
Author: ryandesign at macports.org
Date: 2014-12-27 23:18:03 -0800 (Sat, 27 Dec 2014)
Log Message:
-----------
MyPaint-devel: update to 1.1.1.alpha.20141216+git.68f876fc; rename patchfiles to include subport name; add patch to no longer link with libgettextlib which was causing a crash on launch
Modified Paths:
--------------
trunk/dports/graphics/MyPaint/Portfile
Added 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-devel-brushlib-SConscript.diff
trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff
Removed Paths:
-------------
trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff
trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff
trunk/dports/graphics/MyPaint/files/patch-malloc.diff
Modified: trunk/dports/graphics/MyPaint/Portfile
===================================================================
--- trunk/dports/graphics/MyPaint/Portfile 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/Portfile 2014-12-28 07:18:03 UTC (rev 130177)
@@ -106,9 +106,9 @@
depends_lib-append port:py27-pygtk
- patchfiles-append patch-SConstruct.diff
- patchfiles-append patch-brushlib-SConscript.diff
- patchfiles-append patch-malloc.diff
+ 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} \
@@ -129,8 +129,8 @@
subport ${name}-devel {
PortGroup github 1.0
- github.setup mypaint mypaint 4fafd2ad68d52752cea0c7e18c87d55e144c96d6
- version 1.1.1.alpha.20140929+git.[string range ${git.branch} 0 7]
+ github.setup mypaint mypaint 68f876fc82f24f71bbe3c3d91ddf364d31fa5ff5
+ version 1.1.1.alpha.20141216+git.[string range ${git.branch} 0 7]
set libmypaint_branch 0a6ad9de9debb9786bcc23cef19446410ac042a5
conflicts ${name}
@@ -138,8 +138,8 @@
distfiles-append libmypaint-${libmypaint_branch}${extract.suffix}:libmypaint
checksums mypaint-${git.branch}${extract.suffix} \
- rmd160 7d5d9c4057021d9a90eb7478cd5acdd0bb4db49d \
- sha256 6b8dccbb50c8532e3824bcc828b3ca35f8c25ea840fa821330b66bc9f86a7920 \
+ rmd160 beec9b869bb0f5b3d67c98d8078a895fa327147e \
+ sha256 0c48292b8815b4f7d90268719b9594f24ddceda164569266e0956bf3cfbbbc94 \
libmypaint-${libmypaint_branch}${extract.suffix} \
rmd160 ffb71163b3c5959d08bbe252a3ab5c4a51037242 \
sha256 397487add31eef31ea725b997581c7a4a476a7a74adc28fb401db94edf44794c
@@ -154,6 +154,8 @@
eval move [glob ${workpath}/mypaint-libmypaint-*] ${workpath}/mypaint-${git.branch}/brushlib
}
+ patchfiles-append patch-${subport}-brushlib-SConscript.diff
+
post-destroot {
xinstall -m 644 -W ${worksrcpath} \
README.md \
Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff)
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-SConstruct.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -0,0 +1,11 @@
+--- 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)
Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff)
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-brushlib-SConscript.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -0,0 +1,12 @@
+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 = []
+
Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff)
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-devel-brushlib-SConscript.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -0,0 +1,12 @@
+https://github.com/mypaint/libmypaint/pull/13
+--- brushlib/SConscript.orig 2014-07-23 13:35:21.000000000 -0500
++++ brushlib/SConscript 2014-12-27 20:14:39.000000000 -0600
+@@ -93,7 +93,7 @@
+ if env['enable_i18n']:
+ env.Append(CPPDEFINES='HAVE_GETTEXT')
+ if sys.platform == "darwin":
+- libs += ['intl', 'gettextlib']
++ libs += ['intl']
+
+
+ config_defines = ''
Copied: trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff (from rev 130160, trunk/dports/graphics/MyPaint/files/patch-malloc.diff)
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-MyPaint-malloc.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -0,0 +1,23 @@
+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>
Deleted: trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -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-brushlib-SConscript.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/files/patch-brushlib-SConscript.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -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-malloc.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-malloc.diff 2014-12-28 06:38:52 UTC (rev 130176)
+++ trunk/dports/graphics/MyPaint/files/patch-malloc.diff 2014-12-28 07:18:03 UTC (rev 130177)
@@ -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/20141227/29bfa8d5/attachment.html>
More information about the macports-changes
mailing list