CVS commit: pkgsrc/graphics/gimp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed May 12 06:30:56 UTC 2021

Modified Files:
        pkgsrc/graphics/gimp: Makefile PLIST options.mk
Added Files:
        pkgsrc/graphics/gimp: PLIST.python

Log Message:
gimp: add support for python plugins

Implemented as default-on option.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/graphics/gimp/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gimp/PLIST.python
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/gimp/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.343 pkgsrc/graphics/gimp/Makefile:1.344
--- pkgsrc/graphics/gimp/Makefile:1.343 Sun May  2 11:06:13 2021
+++ pkgsrc/graphics/gimp/Makefile       Wed May 12 06:30:56 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.343 2021/05/02 11:06:13 nia Exp $
+# $NetBSD: Makefile,v 1.344 2021/05/12 06:30:56 wiz Exp $
 
 DISTNAME=      gimp-2.10.24
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.bz2
@@ -28,7 +28,6 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --disable-alsatest
 CONFIGURE_ARGS+=       --disable-glibtest
 CONFIGURE_ARGS+=       --disable-gtktest
-CONFIGURE_ARGS+=       --disable-python
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --without-linux-input
 

Index: pkgsrc/graphics/gimp/PLIST
diff -u pkgsrc/graphics/gimp/PLIST:1.74 pkgsrc/graphics/gimp/PLIST:1.75
--- pkgsrc/graphics/gimp/PLIST:1.74     Fri Apr  9 07:02:58 2021
+++ pkgsrc/graphics/gimp/PLIST  Wed May 12 06:30:56 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.74 2021/04/09 07:02:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.75 2021/05/12 06:30:56 wiz Exp $
 bin/gimp
 bin/gimp-2.10
 bin/gimp-console
@@ -5438,4 +5438,3 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-ti
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 share/metainfo/gimp-data-extras.metainfo.xml
 share/metainfo/org.gimp.GIMP.appdata.xml
-@pkgdir share/gimp/2.0/fonts

Index: pkgsrc/graphics/gimp/options.mk
diff -u pkgsrc/graphics/gimp/options.mk:1.9 pkgsrc/graphics/gimp/options.mk:1.10
--- pkgsrc/graphics/gimp/options.mk:1.9 Wed Apr  3 06:02:29 2019
+++ pkgsrc/graphics/gimp/options.mk     Wed May 12 06:30:56 2021
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2019/04/03 06:02:29 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2021/05/12 06:30:56 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gimp
-PKG_SUPPORTED_OPTIONS= aalib mng
-PKG_SUGGESTED_OPTIONS= mng
+PKG_SUPPORTED_OPTIONS= aalib mng python
+PKG_SUGGESTED_OPTIONS= mng python
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_SRC=             ${PLIST_SRC_DFLT}
 PLIST_VARS+=           aalib mng
 
 .if !empty(PKG_OPTIONS:Maalib)
@@ -17,3 +18,19 @@ PLIST.aalib=         yes
 .include "../../graphics/mng/buildlink3.mk"
 PLIST.mng=             yes
 .endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+PLIST_SRC+=            PLIST.python
+PYTHON_VERSIONS_ACCEPTED=      27
+CONFIGURE_ARGS+=               --enable-python
+REPLACE_PYTHON+=               plug-ins/pygimp/*.py
+REPLACE_PYTHON+=               plug-ins/pygimp/plug-ins/*.py
+REPLACE_PYTHON+=               plug-ins/pygimp/plug-ins/*/*.py
+REPLACE_PYTHON+=               tools/*.py
+.include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../graphics/py-cairo118/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
+.include "../../lang/python/application.mk"
+.else
+CONFIGURE_ARGS+=               --disable-python
+.endif

Added files:

Index: pkgsrc/graphics/gimp/PLIST.python
diff -u /dev/null pkgsrc/graphics/gimp/PLIST.python:1.1
--- /dev/null   Wed May 12 06:30:56 2021
+++ pkgsrc/graphics/gimp/PLIST.python   Wed May 12 06:30:56 2021
@@ -0,0 +1,37 @@
+@comment $NetBSD: PLIST.python,v 1.1 2021/05/12 06:30:56 wiz Exp $
+lib/gimp/2.0/environ/pygimp.env
+lib/gimp/2.0/interpreters/pygimp.interp
+lib/gimp/2.0/plug-ins/colorxhtml/colorxhtml.py
+lib/gimp/2.0/plug-ins/file-openraster/file-openraster.py
+lib/gimp/2.0/plug-ins/foggify/foggify.py
+lib/gimp/2.0/plug-ins/gradients-save-as-css/gradients-save-as-css.py
+lib/gimp/2.0/plug-ins/histogram-export/histogram-export.py
+lib/gimp/2.0/plug-ins/palette-offset/palette-offset.py
+lib/gimp/2.0/plug-ins/palette-sort/palette-sort.py
+lib/gimp/2.0/plug-ins/palette-to-gradient/palette-to-gradient.py
+lib/gimp/2.0/plug-ins/py-slice/py-slice.py
+lib/gimp/2.0/plug-ins/python-console/pyconsole.py
+lib/gimp/2.0/plug-ins/python-console/python-console.py
+lib/gimp/2.0/plug-ins/python-eval/python-eval.py
+lib/gimp/2.0/plug-ins/spyro_plus/spyro_plus.py
+lib/gimp/2.0/python/_gimpenums.la
+lib/gimp/2.0/python/_gimpui.la
+lib/gimp/2.0/python/gimp.la
+lib/gimp/2.0/python/gimpcolor.la
+lib/gimp/2.0/python/gimpenums.py
+lib/gimp/2.0/python/gimpenums.pyc
+lib/gimp/2.0/python/gimpenums.pyo
+lib/gimp/2.0/python/gimpfu.py
+lib/gimp/2.0/python/gimpfu.pyc
+lib/gimp/2.0/python/gimpfu.pyo
+lib/gimp/2.0/python/gimpplugin.py
+lib/gimp/2.0/python/gimpplugin.pyc
+lib/gimp/2.0/python/gimpplugin.pyo
+lib/gimp/2.0/python/gimpshelf.py
+lib/gimp/2.0/python/gimpshelf.pyc
+lib/gimp/2.0/python/gimpshelf.pyo
+lib/gimp/2.0/python/gimpthumb.la
+lib/gimp/2.0/python/gimpui.py
+lib/gimp/2.0/python/gimpui.pyc
+lib/gimp/2.0/python/gimpui.pyo
+lib/gimp/2.0/python/pygimp-logo.png