pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/mypaint Update to 1.1.0

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c843c1734a42
branches:  trunk
changeset: 648483:c843c1734a42
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun Mar 15 04:51:31 2015 +0000

description:
Update to 1.1.0

* Newer GCC requires swig2.

Changelog:
Version 1.1.0:
- geometry tools: sequence of lines, curved lines, ellipses
- new brush and layer blending modes; different layer merging
- new color dialog: palette and gamut mapping
- improved document frame, can be resized on canvas
- symmetric drawing mode
- old color changer ("washed") from 0.6 is available again
- toolbar improvements, e.g. move layer mode, pan/zoom
- revised cursor and on-canvas color picker
- better separation of mypaint's brush library; json brush file format
- translations, performance improvements, bugfixes, and more

diffstat:

 graphics/mypaint/Makefile                          |   30 +-
 graphics/mypaint/PLIST                             |  383 +++++++++++++++++---
 graphics/mypaint/distinfo                          |   14 +-
 graphics/mypaint/patches/patch-SConscript          |   13 +
 graphics/mypaint/patches/patch-SConstruct          |   43 +-
 graphics/mypaint/patches/patch-brushlib_SConscript |   13 +
 graphics/mypaint/patches/patch-lib_SConscript      |   21 +-
 7 files changed, 403 insertions(+), 114 deletions(-)

diffs (truncated from 800 to 300 lines):

diff -r bdbd6e47b49d -r c843c1734a42 graphics/mypaint/Makefile
--- a/graphics/mypaint/Makefile Sun Mar 15 01:21:35 2015 +0000
+++ b/graphics/mypaint/Makefile Sun Mar 15 04:51:31 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2014/10/17 22:01:25 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2015/03/15 04:51:31 ryoon Exp $
 
-DISTNAME=      mypaint-1.0.0
-PKGREVISION=   6
+DISTNAME=      mypaint-1.1.0
 CATEGORIES=    graphics
 MASTER_SITES=  http://download.gna.org/mypaint/
 EXTRACT_SUFX=  .tar.bz2
@@ -14,7 +13,7 @@
 BUILD_DEPENDS+=        scons-[0-9]*:../../devel/scons
 DEPENDS+=      ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
-USE_LANGUAGES= c++
+USE_LANGUAGES= c c++
 
 USE_TOOLS+=    bash:run msgfmt pkg-config
 
@@ -24,25 +23,21 @@
 FIND_PREFIX:=  SCONSDIR=scons
 .include "../../mk/find-prefix.mk"
 
-SUBST_CLASSES+=                        locale-dir
-SUBST_STAGE.locale-dir=                pre-configure
-SUBST_FILES.locale-dir=                SConstruct
-SUBST_SED.locale-dir=          -e 's,share/locale,${PKGLOCALEDIR}/locale,'
 USE_PKGLOCALEDIR=      yes
 
 SUBST_CLASSES+=                        python
 SUBST_STAGE.python=            pre-configure
-SUBST_FILES.python=            brushlib/generate.py \
-                               SConstruct
-SUBST_SED.python=              -e 's,/usr/bin/env python,${PYTHONBIN},'
-SUBST_SED.python+=             -e 's,%PYTHONBIN%,${PYTHONBIN},'
+SUBST_FILES.python=            SConscript
+SUBST_VARS.python=             PYTHONBIN
+
+LDFLAGS+=      -lintl
 
 REPLACE_BASH=                  brushes/label-brush-mypaint.sh
 
 do-build:
        cd ${WRKSRC} && cd ${BUILD_DIRS} && \
                ${SETENV} ${MAKE_ENV} \
-               ${SCONSDIR}/bin/scons prefix=${PREFIX}
+               ${SCONSDIR}/bin/scons prefix=${DESTDIR}${PREFIX}
 
 do-install:
        cd ${WRKSRC} && cd ${INSTALL_DIRS} && \
@@ -51,10 +46,13 @@
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/swig2/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/py-gobject/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/pyversion.mk"
-.include "../../devel/swig/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bdbd6e47b49d -r c843c1734a42 graphics/mypaint/PLIST
--- a/graphics/mypaint/PLIST    Sun Mar 15 01:21:35 2015 +0000
+++ b/graphics/mypaint/PLIST    Sun Mar 15 04:51:31 2015 +0000
@@ -1,107 +1,304 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/23 11:00:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/03/15 04:51:31 ryoon Exp $
 bin/mypaint
+include/libmypaint/glib/mypaint-brush.h
+include/libmypaint/mypaint-brush-settings-gen.h
+include/libmypaint/mypaint-brush-settings.h
+include/libmypaint/mypaint-brush.h
+include/libmypaint/mypaint-config.h
+include/libmypaint/mypaint-fixed-tiled-surface.h
+include/libmypaint/mypaint-glib-compat.h
+include/libmypaint/mypaint-surface.h
+include/libmypaint/mypaint-tiled-surface.h
+lib/libmypaint.a
 lib/mypaint/_mypaintlib.so
+lib/pkgconfig/libmypaint.pc
 share/applications/mypaint.desktop
 share/icons/hicolor/16x16/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/16x16/actions/brush-blend-mode-normal.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/16x16/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/16x16/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/16x16/actions/mypaint-frame.png
+share/icons/hicolor/16x16/actions/mypaint-layer-duplicate.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode.png
+share/icons/hicolor/16x16/actions/mypaint-move.png
+share/icons/hicolor/16x16/actions/mypaint-symmetry.png
 share/icons/hicolor/16x16/actions/mypaint-tool-brush.png
+share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/16x16/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-layers.png
+share/icons/hicolor/16x16/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/16x16/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/16x16/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/16x16/actions/mypaint-view-100.png
+share/icons/hicolor/16x16/actions/mypaint-view-fit.png
+share/icons/hicolor/16x16/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/16x16/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/16x16/actions/mypaint-view-pan.png
+share/icons/hicolor/16x16/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/16x16/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/16x16/actions/mypaint-view-rotate.png
+share/icons/hicolor/16x16/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/16x16/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/16x16/actions/mypaint-view-zoom.png
 share/icons/hicolor/16x16/apps/mypaint.png
 share/icons/hicolor/22x22/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/22x22/actions/brush-blend-mode-normal.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/22x22/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/22x22/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/22x22/actions/mypaint-frame.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode.png
+share/icons/hicolor/22x22/actions/mypaint-move.png
+share/icons/hicolor/22x22/actions/mypaint-symmetry.png
 share/icons/hicolor/22x22/actions/mypaint-tool-brush.png
+share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/22x22/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-layers.png
+share/icons/hicolor/22x22/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/22x22/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/22x22/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/22x22/actions/mypaint-view-100.png
+share/icons/hicolor/22x22/actions/mypaint-view-fit.png
+share/icons/hicolor/22x22/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/22x22/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/22x22/actions/mypaint-view-pan.png
+share/icons/hicolor/22x22/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/22x22/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/22x22/actions/mypaint-view-rotate.png
+share/icons/hicolor/22x22/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/22x22/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/22x22/actions/mypaint-view-zoom.png
 share/icons/hicolor/22x22/apps/mypaint.png
 share/icons/hicolor/24x24/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/24x24/actions/brush-blend-mode-normal.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/24x24/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/24x24/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/24x24/actions/mypaint-frame.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode.png
+share/icons/hicolor/24x24/actions/mypaint-move.png
+share/icons/hicolor/24x24/actions/mypaint-symmetry.png
 share/icons/hicolor/24x24/actions/mypaint-tool-brush.png
+share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/24x24/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-layers.png
+share/icons/hicolor/24x24/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/24x24/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/24x24/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/24x24/actions/mypaint-view-100.png
+share/icons/hicolor/24x24/actions/mypaint-view-fit.png
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/24x24/actions/mypaint-view-pan.png
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/24x24/actions/mypaint-view-rotate.png
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/24x24/actions/mypaint-view-zoom.png
 share/icons/hicolor/24x24/apps/mypaint.png
 share/icons/hicolor/32x32/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/32x32/actions/brush-blend-mode-normal.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/32x32/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/32x32/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/32x32/actions/mypaint-frame.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode.png
+share/icons/hicolor/32x32/actions/mypaint-move.png
+share/icons/hicolor/32x32/actions/mypaint-symmetry.png
 share/icons/hicolor/32x32/actions/mypaint-tool-brush.png
+share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/32x32/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-layers.png
+share/icons/hicolor/32x32/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/32x32/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/32x32/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/32x32/actions/mypaint-view-100.png
+share/icons/hicolor/32x32/actions/mypaint-view-fit.png
+share/icons/hicolor/32x32/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/32x32/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/32x32/actions/mypaint-view-pan.png
+share/icons/hicolor/32x32/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/32x32/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/32x32/actions/mypaint-view-rotate.png
+share/icons/hicolor/32x32/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/32x32/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/32x32/actions/mypaint-view-zoom.png
 share/icons/hicolor/32x32/apps/mypaint.png
 share/icons/hicolor/48x48/actions/brush-blend-mode-normal.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/48x48/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/48x48/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/48x48/actions/mypaint-frame.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode.png
+share/icons/hicolor/48x48/actions/mypaint-move.png
+share/icons/hicolor/48x48/actions/mypaint-symmetry.png
 share/icons/hicolor/48x48/actions/mypaint-tool-brush.png
+share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/48x48/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-layers.png
+share/icons/hicolor/48x48/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/48x48/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/48x48/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/48x48/actions/mypaint-view-100.png
+share/icons/hicolor/48x48/actions/mypaint-view-fit.png
+share/icons/hicolor/48x48/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/48x48/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/48x48/actions/mypaint-view-pan.png
+share/icons/hicolor/48x48/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/48x48/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/48x48/actions/mypaint-view-rotate.png
+share/icons/hicolor/48x48/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/48x48/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/48x48/actions/mypaint-view-zoom.png
 share/icons/hicolor/48x48/apps/mypaint.png
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-alpha-lock.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-colorize.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-eraser.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-normal.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes.svg
Home | Main Index | Thread Index | Old Index