pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/gimp-devel
Module Name: pkgsrc
Committed By: wiz
Date: Sat Sep 10 09:24:48 UTC 2022
Modified Files:
pkgsrc/graphics/gimp-devel: Makefile PLIST distinfo
Added Files:
pkgsrc/graphics/gimp-devel/patches: patch-meson.build
patch-plug-ins_common_file-heif.c
patch-tools_extract-vector-icon.sh
Removed Files:
pkgsrc/graphics/gimp-devel/patches: patch-aa patch-ab
Log Message:
gimp-devel: update to 2.99.12.
Switch built to use meson.
Overview of Changes from GIMP 2.99.10 to GIMP 2.99.12
=====================================================
Core:
- Added concept of "hidden item" to a GimpImage. This would allow to
process non attached items for internal processing more easily.
- Do not show a crosshair anymore when "Show brush outline" is
checked and "Show pointer for paint tools" is unchecked, if the
brush outline cannot be drawn (in which case a fallback 4-arcs
generic outline showing the size is displayed), for instance because
using a dynamic changing the size.
- When both "Show brush outline" and "Show pointer for paint tools"
are unchecked, show a minimal visual feedback of a few pixels only,
as inconspicuous as possible, instead of a crosshair.
- Move and reorganize pointer-related settings in Preferences from
"Image Windows" to "Input Devices" tabs.
- On macOS, delay opening new images dropped on the application icon
in the dock to after GIMP is fully initialized.
- Some code reorganization and factorization of image colormap and
palette handling.
- Language changes will trigger plug-in query() call at next GIMP
restart. This allows to have strings in query() and stored in GIMP
config being re-localized. This implies both explicit language
changes in Preferences or system language changes when GIMP is set
to follow system language.
- Keyboard grab removed from the canvas display, hence getting rid of
annoying grab permission warnings on Wayland.
- Preferences > Display > Transparency > Check style has now a new
option "Custom checks" allowing to select any RGB colors.
- Full migration from intltool to gettext only.
- The soft-proof profile, soft-proofing rendering intent and whether
black point compensation is used when soft-proofing are now image
data. These have also been moved to the Image menu (out of View).
These 3 simulation data are also stored in the XCF file now.
- Hacks on canvas rulers and statusbar added in GIMP 2.99.10 for macOS
triggering too big redraws were removed. This depends on patches
added to upcoming GTK+ 3.24.35.
- CMYK color picking and sample point now use babl and the space
specified by the soft-proof profile set on the image, if any.
- The "Create New Image" dialog now has settings for the simulation
profile, intent and black point compensation. This is also shown in
templates and the "Default Image" tab in Preferences, and has been
removed from the "Color Management" tab, because these are now first
and foremost image data.
- GimpColorFrame is now current image's simulation profile/intent/bpc
aware. In other words, CMYK shown by the color picker or in sample
point shows values in the correct simulation space (not in some
default CMYK space).
- A new default action to change the current brush size was mapped to
Alt + right button click.
- Some Preferences settings have been moved to a new Preferences >
Canvas Interaction tab.
- All on-canvas interactions (panning, canvas rotation, etc.) are now
customizable in Preferences > Canvas Interaction > Modifiers tab. It
allows to switch/change the modifiers used for an action, or even
just remove some modifiers mapping (when you never use an action,
e.g. some people say the canvas rotation is not useful to them).
- GtkAction-s can also be mapped to modifiers now through the same
settings.
- GIMP themes can now have a "gimp-dark.css" file which will be used
if the "Use dark theme variant if available" option was checked.
- The FG/BG editor area in the toolbox is now sized relatively to
toolbox icon size, allowing for it to be much bigger when using big
icons, or smaller when using small icons (which can e.g. be aligned
on a very narrow single column for people who appreciate this
organization).
Tools:
- The "Fill by line art detection" mode of the Bucket Fill tool got
the following improvements:
* New "Stroke borders" option where you can select a paint tool
(except source tools) to stroke the fill mask before filling with
the color. The settings will be the ones as set on the
corresponding tool (except for the color).
* The options got reorganized in 3 sections (Line Art Detection,
Line Art Closure and Fill Borders) and some options were reworded.
This should hopefully make the now many options more
understandable.
- Full text layer's text size will now be changed when changing font
size in the text editor window, when no text is selected.
- Raise tool options before blinking specific settings widgets when
some tools fail to work because of various tool options settings
(e.g. selection tool cannot remove from an empty selection; warp
tool cannot stroke; move tool cannot move because of the types of
object to move isn't selected; and so on).
Graphical User Interface:
- New "Drag to Zoom" mode and speed settings in Preferences. Existing
drag-to-zoom behavior was linear depending only on pointer direction
(which makes it more or less time-based if we consider that pointer
events are regular). The new mode will take the actual distance
moved into account allowing to go faster or slower by dragging
further or not. The "speed" settings allows a finer zoom speed
control for both the old and new modes.
- Touchpad gesture rotation (2-finger pinch) on canvas now
implemented. Note that rotation or scaling by pinch are exclusive so
GIMP will detect the expected behavior through the initial movement
and will therefore lock on either rotation or scaling for the whole
duration of the pinch.
- Slight tweak of the "You will have to restart GIMP" popup: the list
now uses nicer "bullet point" characters and the nick (short
description) is shown rather than the internal property name.
- New soft-proof toggle in status bar to see the soft-proofing status
and enable/disable it. It is only active when a soft-proof profile
was set.
- GimpContainerTreeView (e.g. Layers/Channels/Vectors dockables) now
have zooming through ctrl+mouse wheel (for preview size).
- GimpContainerTreeView (e.g. Layers/Channels/Vectors dockables) now
have zooming with touchpad pinch (touchscreen pinch now kinda exists
but is not so usable in our tests, at least on Linux through
libinput) for preview size.
- Gradient editor now has zooming with touchpad pinch (touchscreen
pinch not so fancy either, at least on Linux through libinput,
similar to GimpContainerTreeView case).
- A new soft-proofing pop-over dialog appears when right-clicking the
new soft-proof toggle in the status bar. It allows to view or change
all soft-proofing related settings (whether they are associated to
the image, such as the profile, intent or black-point compensation;
or to the view, such as the out-of-gamut check) very easily.
- New "Default" theme containing a dark and light variant. As the name
implies, this theme is now made the default theme on new
installations.
- New "Compact" theme containing a dark and light variant.
Command Line Interface:
- Unless only one batch interpreter is available, there is no default
interpreter anymore (it used to be script-fu). Therefore if you set
`--batch` but not `--batch-interpreter`, GIMP will output an error
message and will list the available interpreters.
- GIMP will stop running the batch commands as soon as one command
fails (it won't try the following ones).
- A new `--quit` option allows you to quit GIMP immediately after
running the batch commands.
- If `--quit` is set and batch commands are run, the GIMP binary exit
code will propagate errors from any batch failure. Exit codes are
taken from command Linux error codes: 0 for success, 69 for service
unavailable (e.g. setting a non-existing interpreter name), 64 for
usage (e.g. not specifying any interpreter or calling errors), 70
for execution errors (bugs in the interpreter plug-in) and 130 for
canceling the call.
Plug-ins:
- BigTIFF: our TIFF plug-in now officially supports BigTIFF import and
export.
* Import was actually already working transparently if you had
a recent enough libtiff. Now the recent libtiff is enforced by
dependency requirements.
* Export support was added with a checkbox in the interactive dialog
and a new "bigtiff" argument in the "file-tiff-save" PDB
procedure.
* When an interactive export of ClassicTIFF fails for the explicit
reason of "Maximum TIFF file size exceeded", the export dialog is
raised again with a message proposing to try again as BigTIFF or
trying another compression algorithm.
This allows because discoverability and understandibility of the
issue, while not forcing BigTIFF export (since it might not be
supported everywhere).
- GIF: new option to specify a number of repeat for animated GIF
(rather than single run vs. infinite loop only).
- help-browser: rewritten to use GtkAction and GtkApplication, even
though it's now a deprecated plug-in (though it's a good example for
porting other plug-ins the same way).
- PNG:
* the format does not have any flag for linear RGB, but it can
simply include a linear profile (or a 1.0 gAMA chunk). Therefore
since we always attach the profile when importing (or transform
the gAMA chunk into a profile), we now always load PNG images as
non-linear backend.
* Add toggle to choose PNG bit depth behavior.
- python-fu-eval and plug-in-script-fu-eval ported to new
GimpBatchProcedure class.
- JPEG:
* CMYK export is now possible. It uses the "Soft-proofing"
profile set on the image.
* CMYK import ported to GEGL/babl conversion. The CMYK profile in
the JPEG image will be stored as soft-proof profile on the image.
- WebP:
* new option "Use Sharp YUV" available in non-lossless export.
It renders sharper edges at the cost of a slower export.
* On export, the "bad image dimensions" error message is now more
accurate and tells the max dimension possible for WebP images
(16383 as it's stored on 14 bits).
- DDS:
* 16-bit masks now supported.
* DDS images with single 16-bit channel support added.
* DDS images with 2 16-bit channels correctly converted to 16-bit
RGB images.
* More robust DDS loading.
* New "Flip image" option: some game engine require a flipped image.
Rather than flipping, exporting, unflipping process, let's have an
option to flip the result at export time.
- script-fu:
* Various updates to get the API back in shape.
* Porting doc updated.
* "script-fu-server" was now extracted into its own separate
plug-in so that it doesn't need to run permanently with the
script-fu extension (could be seen as security hazard too) and it
also makes each of these plug-ins more robust by being on their
own process each.
* A new `gimp-script-fu-interpreter-3.0` binary is installed
globally to be used to create Scheme plug-ins, similarly to other
plug-ins, in particular in the plug-ins/ directory, not the
scripts/ directory anymore. Moreover it makes the whole script-fu
infrastructure much more robust as script-fu individual scripts
won't crash the whole script-fu extension any longer (they only
crash themselves).
Note: this is not a GObject Introspected Scheme binding, just our
own binding based on script-fu interpreter. Script-fu plug-ins
still don't have access to the whole of libgimp.
* New function 'script-fu-register-filter' to declare a multi-layer
capable script.
* Many script-fu scripts were ported to newer API.
- FLI:
* Internal type usage improvements, mnemonics added, etc.
* 1-frame animation now loaded correctly (it's not really an
animation then, yet it should still open!).
* Better error handling.
* Layer names now include the delay in ms.
* More robust FLI/FLC loading, double-checking data rather than
assuming that the file writer properly followed the specs.
- Several plug-ins now follow the user-set checkboard color
preferences, when relevant.
- RAW data:
* Improved export dialog with better labels and ported to new dialog
generation API.
* Improved import dialog, ported to new dialog generation API, with
factorized code to more easily handle more cases.
* All the exportable formats can now be loaded back.
* "file-raw-load" and "file-raw-save" procedures API are now much
better with all relevant arguments.
* "file-hgt-load" doesn't show a dialog anymore when sample spacing
detection worked correctly since we already have all the necessary
information.
- WBMP: new plug-in to load WBPM image files. It is still limited
support and doesn't support all types of WBMP images.
- TIFF:
* 8 and 16-bit CMYK(A) TIFF files can be exported, using the
image soft-proof profile.
* Imported CMYK TIFF profiles are now set as soft-proof profile
on the image.
- SVG: on import, when parsing fails, GIMP will propose to disable
size parsing limitations, while explaining this has security
implications and should only be done on SVG files from trusted
sources.
- PSD:
* Import now uses babl conversion inconditionally, even for CMYK
images, using the soft-proof profile set on the image.
* Improved error logging during load.
* CMYK profile on a CMYK PSD file is now stored as soft-proof
profile in the image.
* Added support for extra layer mask: According to the specs the
extra mask (which they call real user supplied layer mask) is used
"when both a user mask and a vector mask are present".
We haven't seen an example that has the extra mask, so not sure
which of the masks would appear first.
For now assuming that the extra mask will be first. The advantage
of adding this here now, is that we won't try to add a mask
channel as a normal channel.
* Minimal support of duotone data: on import, a duotone image will
be imported as grayscale image with an alert and the color
information will be stored in a parasite; on export, a dialog will
propose you to re-include the duotone data if the image is still
grayscale. This allows for a roundtrip in GIMP without losing the
duotone information.
- ANI: new import/export support.
API:
- Changes in libgimpbase:
* gimp_checks_get_colors() added.
* gimp_checks_get_shades() removed (replaced by gimp_checks_get_colors())
- Changes in libgimpcolor:
* New functions:
+ gimp_color_managed_get_simulation_profile()
+ gimp_color_managed_simulation_profile_changed()
+ gimp_color_managed_get_simulation_bpc()
+ gimp_color_managed_get_simulation_intent()
+ gimp_color_managed_simulation_bpc_changed()
+ gimp_color_managed_simulation_intent_changed()
- Changes in libgimp:
* New functions:
+ gimp_image_metadata_save_filter()
+ gimp_check_custom_color1()
+ gimp_check_custom_color2()
+ gimp_procedure_dialog_get_int_radio()
+ gimp_procedure_dialog_get_file_chooser()
+ gimp_image_get_simulation_profile()
+ gimp_image_set_simulation_profile()
+ gimp_image_set_simulation_profile_from_file()
+ gimp_image_get_selected_drawables()
+ gimp_image_get_simulation_bpc()
+ gimp_image_get_simulation_intent()
+ gimp_image_set_simulation_bpc()
+ gimp_image_set_simulation_intent()
* Removed functions:
+ gimp_plug_in_set_translation_domain()
+ image_get_active_drawable()
+ image_get_active_layer()
+ image_set_active_layer()
+ image_get_active_channel()
+ image_set_active_channel()
+ image_get_active_vectors()
+ image_set_active_vectors()
* Updated functions:
+ gimp_procedure_dialog_get_widget() now supports
%G_TYPE_PARAM_FILE and %G_TYPE_PARAM_ENUM properties.
+ gimp_prop_file_chooser_button_new() now works with
G_PARAM_SPEC_OBJECT having a value_type == G_TYPE_FILE
(additionally to GIMP_PARAM_SPEC_CONFIG_PATH properties).
* Functions skipped by bindings:
+ gimp_get_images() (in favor of gimp_list_*() variant)
+ gimp_image_get_layers() (in favor of gimp_image_list_*() variant)
+ gimp_image_get_channels() (in favor of gimp_image_list_*() variant)
+ gimp_image_get_vectors() (in favor of gimp_image_list_*() variant)
+ gimp_image_get_selected_layers() (in favor of gimp_image_list_*()
variant)
+ gimp_item_get_children() (in favor of gimp_item_list_*() variant)
* New class:
+ GimpBatchProcedure: procedure usable as a batch interpreter on
command line.
* Protocol bumped to handle the check colors passed at call time on
the wire.
* Plug-ins are now expected to have their localization in a Gettext
catalog folder locale/ under their main directory, named the same
way as this directory (i.e. usually the plug-in name). If the
catalog is absent, a message will be outputted on stderr. To
override this behavior, a GimpPlugIn is encouraged to override the
new set_i18n() method. If it returns FALSE, localization is
disabled (or it may be implemented in a different way, for
instance with another system than Gettext); if it returns TRUE,
you can set a different subfolder and catalog name.
* The core does not localize menu items from plug-ins anymore. All
plug-ins are now expected to handle their localization within
their code. In particular gimp_procedure_set_menu_label() and
gimp_procedure_set_documentation() should now pass the localized
text. With gettext, it usually means passing arguments through
gettext() and not just marking them with N_().
- Changes in libgimpwidgets:
* Freedesktop portal implementation of GimpPickButton now checks the
version of the XDG portal since `PickColor()` API only got added
in version 2.
* New classes:
+ GimpIntRadioFrame
* New functions:
+ gimp_color_notebook_set_simulation()
+ gimp_color_selection_set_simulation()
+ gimp_color_selector_set_simulation()
* Removed functions:
+ gimp_prop_int_radio_box_new()
* Updated functions:
+ GimpColorNotebook, GimpColorSelection and GimpColorSelector are
now ported to babl code and are simulation space aware.
+ GimpPickButton will now use the X11 color picking API as a
default when GIMP is running on X11 (instead of trying the
portals first), because it has color space information of the
display (so we can convert back the color from display space to
image space); and also on some desktop, the portal looks
available while it's actually not implemented (hence picking
fails).
This fixes or improves the color picking in the Colors dockable,
in Change Foreground/Background Color dialogs, etc.
- Changes in PDB:
* gimp-plug-in-domain-register removed.
Modules:
- The CMYK color selector is now simulation space aware, i.e. that it
shows CMYK values in the soft-proof profile space if a soft-proof
profile has been set.
Translations:
- New Galician and Georgian translations for the installer.
Build:
- libtiff dependency's minimum required version bumped to 4.0.0.
- gexiv2 dependency's minimum required version bumped to 0.14.0.
- Our meson/Debian CI now runs `meson dist` too.
- gvfs is marked as an expected dependency for GIMP (as a GIO module)
on Linux, since it seems we wouldn't have HTTP support without. This
is only written in the INSTALL file though, no tests are run on
configure time.
- The distribution stage now has a new `dev-docs` job containing both
the C API reference (gi-docgen) and the Python and Javascript (gjs)
ones (g-ir-doc).
- The `pdbgen` (generation of PDB source files) build step is finally
ported to meson too, which is a major step to one day consider this
build system out of the "experimental" zone.
- Windows installer's gettext files (.po) will now also contain
extracted comments from the source to give more context to
translators.
- Flatpak manifest upgraded with new version constraints so that the
flatpak-external-data-checker does not warn wrongly on major update
when we don't want to or can't update immediately.
- meson is now recommended for Windows and macOS builds and our
official installer and DMG respectively are now built (still from
CI) with meson.
- Flatpak manifest improved with version constraints for dependencies
where we should not update just yet (hence don't want new version
notifications).
- appstream-util replaced by appstreamcli for AppStream file testing
(requires appstreamcli 0.15.3 or over).
- gi-docgen API documentation will now properly link to other API
namespaces thanks to a new urlmap file.
- Separate libgimp-scriptfu-3.0 library for a future where it will be
shared by several binaries.
- GEGL dependency's minimum required version bumped to 0.4.38.
- "flatpak" job now uses a gnome-runtime-images migrated to Quay.
- "win*-nightly" jobs removed.
- Improved meson infrastructure to support Windows installer languages
which don't have base language files provided by upstream InnoSetup.
We started using it for Kabyle (which was showing up as "English"
otherwise!).
- After various fixes and implementations of missing build features to
the meson scripts, we are going to start advising packagers (for all
platforms) to build GIMP 2.99.12 with meson as a trial by fire to
make it the new default build system.
- New "sources-meson" CI job to distribute a tarball built with the
meson scripts.
- INSTALL now targets meson build as a test recommendation. We'll see
if any issue arises from packagers!
- Improved support for homebrew build on macOS.
Documentation:
- Draft devel doc for scriptfu v3 script authors.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/gimp-devel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gimp-devel/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/gimp-devel/patches/patch-aa \
pkgsrc/graphics/gimp-devel/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gimp-devel/patches/patch-meson.build \
pkgsrc/graphics/gimp-devel/patches/patch-plug-ins_common_file-heif.c \
pkgsrc/graphics/gimp-devel/patches/patch-tools_extract-vector-icon.sh
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-devel/Makefile
diff -u pkgsrc/graphics/gimp-devel/Makefile:1.4 pkgsrc/graphics/gimp-devel/Makefile:1.5
--- pkgsrc/graphics/gimp-devel/Makefile:1.4 Thu Aug 11 05:08:41 2022
+++ pkgsrc/graphics/gimp-devel/Makefile Sat Sep 10 09:24:48 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2022/08/11 05:08:41 gutteridge Exp $
+# $NetBSD: Makefile,v 1.5 2022/09/10 09:24:48 wiz Exp $
-DISTNAME= gimp-2.99.10
+DISTNAME= gimp-2.99.12
PKGNAME= ${DISTNAME:S/gimp/gimp-devel/}
-PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= adam%NetBSD.org@localhost
HOMEPAGE= https://www.gimp.org/
@@ -18,33 +17,24 @@ TOOL_DEPENDS+= libxslt-[0-9]*:../../text
DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking
DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+#DEPENDS+= gjs-[0-9]*:../../lang/gjs
CONFLICTS+= gimp-[0-9]*
USE_LANGUAGES+= c c++14
-USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config perl
+USE_TOOLS+= pkg-config perl
USE_TOOLS+= intltool msgfmt msgmerge xgettext
USE_TOOLS+= gdbus-codegen
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --disable-alsatest
-CONFIGURE_ARGS+= --disable-glibtest
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --without-linux-input
-
-PKG_SYSCONFSUBDIR= gimp/2.99
PKGCONFIG_OVERRIDE= gimp.pc.in
UNLIMIT_RESOURCES+= datasize
-# https://gitlab.gnome.org/GNOME/gimp/-/issues/8377
-PKGSRC_USE_STACK_CHECK= no
-
# example files
CHECK_INTERPRETER_SKIP+= lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/*
+CHECK_INTERPRETER_SKIP+= lib/gimp/2.99/plug-ins/test-sphere-v3/test-sphere-v3.scm
+CHECK_INTERPRETER_SKIP+= lib/gimp/2.99/plug-ins/ts-helloworld/ts-helloworld.scm
REPLACE_PYTHON+= plug-ins/python/*.py
REPLACE_PYTHON+= plug-ins/python/*/*.py
@@ -54,25 +44,38 @@ REPLACE_PYTHON+= extensions/goat-exercis
# GCC 4.x C++14 support is not new enough.
GCC_REQD+= 5
-.include "../../mk/bsd.prefs.mk"
-
-EGDIR= ${PREFIX}/share/examples/gimp-2.99
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/gimp/2.99
+EGDIR= ${PREFIX}/share/examples/gimp
.for f in controllerrc gimp.css gimprc menurc sessionrc templaterc toolrc unitrc
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/gimp/2.99/${f}
.endfor
# checking for xgettext version (>= 0.19)... no
_TOOLS_USE_PKGSRC.xgettext= yes
-# Ensure we export symbols in the linked shared object.
-#LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
+.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+= GIMP_DEBUG_TOOL_DIR="bin"
-.else
-PLIST_SUBST+= GIMP_DEBUG_TOOL_DIR="libexec"
+.if ${OPSYS} != "Linux"
+# https://gitlab.gnome.org/GNOME/gimp/-/issues/8604
+MESON_ARGS+= -Dlinux-input=disabled
.endif
+# msgfmt: unknown option -- desktop
+.if ${OPSYS} == "NetBSD"
+TOOLS_PLATFORM.msgfmt=
+.endif
+
+INSTALLATION_DIRS= share/examples
+
+SUBST_CLASSES+= python
+SUBST_FILES.python+= output/plug-ins/python/pygimp.interp
+SUBST_STAGE.python= post-build
+SUBST_MESSAGE.python= Fixing interpreter paths.
+SUBST_SED.python+= -e "s,${BUILDLINK_DIR}/bin/python3,${PYTHONBIN},"
+
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/etc/gimp/2.99 ${DESTDIR}${PREFIX}/share/examples/gimp
+
.include "options.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../archivers/libarchive/buildlink3.mk"
@@ -85,12 +88,13 @@ BUILDLINK_API_DEPENDS.freetype2+= freety
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.12.4
.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
BUILDLINK_API_DEPENDS.babl+= babl>=0.1.92nb1
.include "../../graphics/babl/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gegl+= gegl>=0.4.36nb4
+BUILDLINK_API_DEPENDS.gegl+= gegl>=0.4.38
.include "../../graphics/gegl/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
+BUILDLINK_API_DEPENDS.gexiv2+= gexiv2>=0.14
.include "../../graphics/gexiv2/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/libart/buildlink3.mk"
@@ -104,6 +108,7 @@ BUILDLINK_API_DEPENDS.gegl+= gegl>=0.4.
.include "../../graphics/openjpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
+BUILDLINK_API_DEPENDS.tiff+= tiff>=4.0
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/libwmf/buildlink3.mk"
.include "../../lang/vala/buildlink3.mk"
@@ -116,4 +121,6 @@ BUILDLINK_API_DEPENDS.gegl+= gegl>=0.4.
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/gimp-devel/PLIST
diff -u pkgsrc/graphics/gimp-devel/PLIST:1.2 pkgsrc/graphics/gimp-devel/PLIST:1.3
--- pkgsrc/graphics/gimp-devel/PLIST:1.2 Sat Jul 23 09:31:57 2022
+++ pkgsrc/graphics/gimp-devel/PLIST Sat Sep 10 09:24:48 2022
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2022/07/23 09:31:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/09/10 09:24:48 wiz Exp $
bin/gimp-2.99
bin/gimp-console-2.99
+bin/gimp-script-fu-interpreter-3.0
bin/gimp-test-clipboard-2.99
bin/gimptool-2.99
include/gimp-3.0/libgimp/gimp.h
include/gimp-3.0/libgimp/gimp_pdb.h
include/gimp-3.0/libgimp/gimp_pdb_headers.h
include/gimp-3.0/libgimp/gimpaspectpreview.h
+include/gimp-3.0/libgimp/gimpbatchprocedure.h
include/gimp-3.0/libgimp/gimpbrush_pdb.h
include/gimp-3.0/libgimp/gimpbrushes_pdb.h
include/gimp-3.0/libgimp/gimpbrushselect.h
@@ -197,6 +199,7 @@ include/gimp-3.0/libgimpwidgets/gimphelp
include/gimp-3.0/libgimpwidgets/gimphintbox.h
include/gimp-3.0/libgimpwidgets/gimpicons.h
include/gimp-3.0/libgimpwidgets/gimpintcombobox.h
+include/gimp-3.0/libgimpwidgets/gimpintradioframe.h
include/gimp-3.0/libgimpwidgets/gimpintstore.h
include/gimp-3.0/libgimpwidgets/gimplabelcolor.h
include/gimp-3.0/libgimpwidgets/gimplabeled.h
@@ -237,18 +240,84 @@ lib/gimp/2.99/extensions/org.gimp.extens
lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/goat-exercise-py3.py
lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/goat-exercise-vala
lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/goat-exercise-vala.vala
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ar/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/be/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/bg/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/br/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/bs/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ca/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ca@valencia/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/cs/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/da/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/de/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/dz/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/el/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/en_CA/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/en_GB/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/eo/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/es/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/et/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/eu/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/fa/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/fi/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/fr/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ga/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/gl/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/gu/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/he/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/hr/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/hu/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/id/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/is/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/it/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ja/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ka/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/km/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/kn/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ko/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/lt/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/lv/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/mk/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/mr/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ms/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/my/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/nb/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ne/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/nl/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/nn/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/oc/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/pa/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/pl/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/pt/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/pt_BR/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ro/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/ru/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/rw/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/sk/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/sl/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/sr/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/sr@latin/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/sv/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/tr/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/uk/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/vi/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/xh/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/yi/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/zh_CN/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/zh_HK/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
+lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/locale/zh_TW/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
lib/gimp/2.99/extensions/org.gimp.extension.goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml
lib/gimp/2.99/interpreters/default.interp
lib/gimp/2.99/interpreters/pygimp.interp
-lib/gimp/2.99/modules/libcolor-selector-cmyk.la
-lib/gimp/2.99/modules/libcolor-selector-water.la
-lib/gimp/2.99/modules/libcolor-selector-wheel.la
-lib/gimp/2.99/modules/libcontroller-midi.la
-lib/gimp/2.99/modules/libdisplay-filter-aces-rrt.la
-lib/gimp/2.99/modules/libdisplay-filter-clip-warning.la
-lib/gimp/2.99/modules/libdisplay-filter-color-blind.la
-lib/gimp/2.99/modules/libdisplay-filter-gamma.la
-lib/gimp/2.99/modules/libdisplay-filter-high-contrast.la
+lib/gimp/2.99/modules/libcolor-selector-cmyk.so
+lib/gimp/2.99/modules/libcolor-selector-water.so
+lib/gimp/2.99/modules/libcolor-selector-wheel.so
+lib/gimp/2.99/modules/libcontroller-midi.so
+lib/gimp/2.99/modules/libdisplay-filter-aces-rrt.so
+lib/gimp/2.99/modules/libdisplay-filter-clip-warning.so
+lib/gimp/2.99/modules/libdisplay-filter-color-blind.so
+lib/gimp/2.99/modules/libdisplay-filter-gamma.so
+lib/gimp/2.99/modules/libdisplay-filter-high-contrast.so
lib/gimp/2.99/plug-ins/align-layers/align-layers
lib/gimp/2.99/plug-ins/animation-optimize/animation-optimize
lib/gimp/2.99/plug-ins/animation-play/animation-play
@@ -312,6 +381,7 @@ lib/gimp/2.99/plug-ins/file-sunras/file-
lib/gimp/2.99/plug-ins/file-svg/file-svg
lib/gimp/2.99/plug-ins/file-tga/file-tga
lib/gimp/2.99/plug-ins/file-tiff/file-tiff
+lib/gimp/2.99/plug-ins/file-wbmp/file-wbmp
lib/gimp/2.99/plug-ins/file-webp/file-webp
lib/gimp/2.99/plug-ins/file-wmf/file-wmf
lib/gimp/2.99/plug-ins/file-xbm/file-xbm
@@ -354,14 +424,17 @@ lib/gimp/2.99/plug-ins/python-eval/pytho
lib/gimp/2.99/plug-ins/qbist/qbist
lib/gimp/2.99/plug-ins/sample-colorize/sample-colorize
lib/gimp/2.99/plug-ins/screenshot/screenshot
+lib/gimp/2.99/plug-ins/script-fu-server/script-fu-server
lib/gimp/2.99/plug-ins/script-fu/script-fu
lib/gimp/2.99/plug-ins/selection-to-path/selection-to-path
lib/gimp/2.99/plug-ins/smooth-palette/smooth-palette
lib/gimp/2.99/plug-ins/sparkle/sparkle
lib/gimp/2.99/plug-ins/sphere-designer/sphere-designer
lib/gimp/2.99/plug-ins/spyro-plus/spyro-plus.py
+lib/gimp/2.99/plug-ins/test-sphere-v3/test-sphere-v3.scm
lib/gimp/2.99/plug-ins/tile-small/tile-small
lib/gimp/2.99/plug-ins/tile/tile
+lib/gimp/2.99/plug-ins/ts-helloworld/ts-helloworld.scm
lib/gimp/2.99/plug-ins/unit-editor/unit-editor
lib/gimp/2.99/plug-ins/van-gogh-lic/van-gogh-lic
lib/gimp/2.99/plug-ins/warp/warp
@@ -369,33 +442,58 @@ lib/gimp/2.99/plug-ins/wavelet-decompose
lib/gimp/2.99/plug-ins/web-browser/web-browser
lib/girepository-1.0/Gimp-3.0.typelib
lib/girepository-1.0/GimpUi-3.0.typelib
-lib/libgimp-3.0.la
-lib/libgimpbase-3.0.la
-lib/libgimpcolor-3.0.la
-lib/libgimpconfig-3.0.la
-lib/libgimpmath-3.0.la
-lib/libgimpmodule-3.0.la
-lib/libgimpthumb-3.0.la
-lib/libgimpui-3.0.la
-lib/libgimpwidgets-3.0.la
+lib/libgimp-3.0.so
+lib/libgimp-3.0.so.0
+lib/libgimp-3.0.so.0.0.12
+lib/libgimp-scriptfu-3.0.so
+lib/libgimp-scriptfu-3.0.so.0
+lib/libgimp-scriptfu-3.0.so.0.0.12
+lib/libgimpbase-3.0.so
+lib/libgimpbase-3.0.so.0
+lib/libgimpbase-3.0.so.0.0.12
+lib/libgimpcolor-3.0.so
+lib/libgimpcolor-3.0.so.0
+lib/libgimpcolor-3.0.so.0.0.12
+lib/libgimpconfig-3.0.so
+lib/libgimpconfig-3.0.so.0
+lib/libgimpconfig-3.0.so.0.0.12
+lib/libgimpmath-3.0.so
+lib/libgimpmath-3.0.so.0
+lib/libgimpmath-3.0.so.0.0.12
+lib/libgimpmodule-3.0.so
+lib/libgimpmodule-3.0.so.0
+lib/libgimpmodule-3.0.so.0.0.12
+lib/libgimpthumb-3.0.so
+lib/libgimpthumb-3.0.so.0
+lib/libgimpthumb-3.0.so.0.0.12
+lib/libgimpui-3.0.so
+lib/libgimpui-3.0.so.0
+lib/libgimpui-3.0.so.0.0.12
+lib/libgimpwidgets-3.0.so
+lib/libgimpwidgets-3.0.so.0
+lib/libgimpwidgets-3.0.so.0.0.12
lib/pkgconfig/gimp-3.0.pc
lib/pkgconfig/gimpthumb-3.0.pc
lib/pkgconfig/gimpui-3.0.pc
-${GIMP_DEBUG_TOOL_DIR}/gimp-debug-tool-2.99
+libexec/gimp-debug-tool-2.99
man/man1/gimp-2.99.1
man/man1/gimp-console-2.99.1
+man/man1/gimp-console.1
+man/man1/gimp.1
man/man1/gimptool-2.99.1
+man/man1/gimptool.1
man/man5/gimprc-2.99.5
+man/man5/gimprc.5
share/aclocal/gimp-3.0.m4
share/applications/gimp.desktop
-share/examples/gimp-2.99/controllerrc
-share/examples/gimp-2.99/gimp.css
-share/examples/gimp-2.99/gimprc
-share/examples/gimp-2.99/menurc
-share/examples/gimp-2.99/sessionrc
-share/examples/gimp-2.99/templaterc
-share/examples/gimp-2.99/toolrc
-share/examples/gimp-2.99/unitrc
+share/examples/gimp/controllerrc
+share/examples/gimp/gimp.css
+share/examples/gimp/gimprc
+share/examples/gimp/menurc
+share/examples/gimp/sessionrc
+share/examples/gimp/templaterc
+share/examples/gimp/toolrc
+share/examples/gimp/unitrc
share/gimp/2.99/brushes/Basic/1-pixel.vbr
share/gimp/2.99/brushes/Basic/Block-01.vbr
share/gimp/2.99/brushes/Basic/Block-02.vbr
@@ -1397,10 +1495,6 @@ share/gimp/2.99/icons/Legacy/24x24/apps/
share/gimp/2.99/icons/Legacy/24x24/apps/gimp-print-resolution.png
share/gimp/2.99/icons/Legacy/24x24/apps/gimp-sample-point.png
share/gimp/2.99/icons/Legacy/24x24/apps/gimp-template.png
-share/gimp/2.99/icons/Legacy/24x24/apps/gimp-text-dir-ttb-ltr-upright.png
-share/gimp/2.99/icons/Legacy/24x24/apps/gimp-text-dir-ttb-ltr.png
-share/gimp/2.99/icons/Legacy/24x24/apps/gimp-text-dir-ttb-rtl-upright.png
-share/gimp/2.99/icons/Legacy/24x24/apps/gimp-text-dir-ttb-rtl.png
share/gimp/2.99/icons/Legacy/24x24/apps/gimp-text-layer.png
share/gimp/2.99/icons/Legacy/24x24/apps/gimp-toilet-paper.png
share/gimp/2.99/icons/Legacy/24x24/apps/gimp-tool-options.png
@@ -1989,6 +2083,7 @@ share/gimp/2.99/scripts/burn-in-anim.scm
share/gimp/2.99/scripts/carve-it.scm
share/gimp/2.99/scripts/chrome-it.scm
share/gimp/2.99/scripts/circuit.scm
+share/gimp/2.99/scripts/clothify-v3.scm
share/gimp/2.99/scripts/clothify.scm
share/gimp/2.99/scripts/coffee.scm
share/gimp/2.99/scripts/contactsheet.scm
@@ -2036,12 +2131,16 @@ share/gimp/2.99/scripts/slide.scm
share/gimp/2.99/scripts/spinning-globe.scm
share/gimp/2.99/scripts/test-sphere.scm
share/gimp/2.99/scripts/tileblur.scm
-share/gimp/2.99/scripts/ts-helloworld.scm
share/gimp/2.99/scripts/unsharp-mask.scm
share/gimp/2.99/scripts/waves-anim.scm
share/gimp/2.99/scripts/weave.scm
share/gimp/2.99/scripts/xach-effect.scm
share/gimp/2.99/tags/gimp-tags-default.xml
+share/gimp/2.99/themes/Compact/gimp-dark.css
+share/gimp/2.99/themes/Compact/gimp.css
+share/gimp/2.99/themes/Default/common.css
+share/gimp/2.99/themes/Default/gimp-dark.css
+share/gimp/2.99/themes/Default/gimp.css
share/gimp/2.99/themes/System/gimp.css
share/gimp/2.99/tips/gimp-tips.xml
share/gimp/2.99/tool-presets/Crop/16_10.gtp
@@ -2261,6 +2360,9 @@ share/locale/ja/LC_MESSAGES/gimp30-pytho
share/locale/ja/LC_MESSAGES/gimp30-script-fu.mo
share/locale/ja/LC_MESSAGES/gimp30-std-plug-ins.mo
share/locale/ja/LC_MESSAGES/gimp30.mo
+share/locale/ka/LC_MESSAGES/gimp30-libgimp.mo
+share/locale/ka/LC_MESSAGES/gimp30-python.mo
+share/locale/ka/LC_MESSAGES/gimp30-std-plug-ins.mo
share/locale/ka/LC_MESSAGES/gimp30.mo
share/locale/kab/LC_MESSAGES/gimp30-libgimp.mo
share/locale/kab/LC_MESSAGES/gimp30-python.mo
@@ -2447,7 +2549,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp30-py
share/locale/zh_TW/LC_MESSAGES/gimp30-script-fu.mo
share/locale/zh_TW/LC_MESSAGES/gimp30-std-plug-ins.mo
share/locale/zh_TW/LC_MESSAGES/gimp30.mo
-share/metainfo/gimp-data-extras.metainfo.xml
share/metainfo/org.gimp.GIMP.appdata.xml
share/vala/vapi/gimp-3.0.deps
share/vala/vapi/gimp-3.0.vapi
Index: pkgsrc/graphics/gimp-devel/distinfo
diff -u pkgsrc/graphics/gimp-devel/distinfo:1.1 pkgsrc/graphics/gimp-devel/distinfo:1.2
--- pkgsrc/graphics/gimp-devel/distinfo:1.1 Fri Jul 22 20:18:54 2022
+++ pkgsrc/graphics/gimp-devel/distinfo Sat Sep 10 09:24:48 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2022/07/22 20:18:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2022/09/10 09:24:48 wiz Exp $
-BLAKE2s (gimp-2.99.10.tar.bz2) = b345397b433f687c477f41d4946af93de60f90d582af26e5cf8d6b9073d82d3c
-SHA512 (gimp-2.99.10.tar.bz2) = 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
-Size (gimp-2.99.10.tar.bz2) = 26782056 bytes
-SHA1 (patch-aa) = e2b91db783beb4baa7d6344ac0b7d126ef3c3b19
-SHA1 (patch-ab) = 79a42760bdc9362861d9c11b363d21766b8c6412
+BLAKE2s (gimp-2.99.12.tar.xz) = 6ecf4138713bf0c514463a644a54a7a39c69c9d99931cf9af991ef78d4b6809a
+SHA512 (gimp-2.99.12.tar.xz) = 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
+Size (gimp-2.99.12.tar.xz) = 24282140 bytes
+SHA1 (patch-meson.build) = 810951c12a848b5b304552445d2130650c818a5f
+SHA1 (patch-plug-ins_common_file-heif.c) = cf4beb68136aefe460c7cabf53a2c40d602ec682
+SHA1 (patch-tools_extract-vector-icon.sh) = e460c42656bf2611a3735e2f7b4fe1d927a47044
Added files:
Index: pkgsrc/graphics/gimp-devel/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/gimp-devel/patches/patch-meson.build:1.1
--- /dev/null Sat Sep 10 09:24:48 2022
+++ pkgsrc/graphics/gimp-devel/patches/patch-meson.build Sat Sep 10 09:24:48 2022
@@ -0,0 +1,27 @@
+$NetBSD: patch-meson.build,v 1.1 2022/09/10 09:24:48 wiz Exp $
+
+Avoid libdl dependency on NetBSD.
+https://gitlab.gnome.org/GNOME/gimp/-/issues/8604
+
+--- meson.build.orig 2022-08-21 19:21:38.000000000 +0000
++++ meson.build
+@@ -127,6 +127,10 @@ platform_linux = (
+ host_os.contains('linux')
+ )
+
++platform_netbsd = (
++ host_os.contains('netbsd')
++)
++
+ platform_windows = (
+ host_os.contains('mingw') or
+ host_os.contains('cygwin') or
+@@ -321,7 +325,7 @@ conf.set('ENABLE_RELOCATABLE_RESOURCES',
+
+
+ math = cc.find_library('m')
+-dl = platform_windows ? no_dep : cc.find_library('dl')
++dl = (platform_windows or platform_netbsd) ? no_dep : cc.find_library('dl')
+ rpc = platform_windows ? cc.find_library('rpcrt4') : no_dep
+ dbghelp = platform_windows ? cc.find_library('dbghelp') : no_dep
+ winsock = platform_windows ? cc.find_library('ws2_32') : no_dep
Index: pkgsrc/graphics/gimp-devel/patches/patch-plug-ins_common_file-heif.c
diff -u /dev/null pkgsrc/graphics/gimp-devel/patches/patch-plug-ins_common_file-heif.c:1.1
--- /dev/null Sat Sep 10 09:24:48 2022
+++ pkgsrc/graphics/gimp-devel/patches/patch-plug-ins_common_file-heif.c Sat Sep 10 09:24:48 2022
@@ -0,0 +1,66 @@
+$NetBSD: patch-plug-ins_common_file-heif.c,v 1.1 2022/09/10 09:24:48 wiz Exp $
+
+Fix build with heif 1.13.0
+https://gitlab.gnome.org/GNOME/gimp/-/commit/a61299ddb184babca015a846c72bf3e1a57faf2a
+
+--- plug-ins/common/file-heif.c.orig 2022-08-21 19:21:38.000000000 +0000
++++ plug-ins/common/file-heif.c
+@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat
+ HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3
+ } HeifpluginExportFormat;
+
+-typedef struct _Heif Heif;
+-typedef struct _HeifClass HeifClass;
++typedef struct _GimpHeif GimpHeif;
++typedef struct _GimpHeifClass GimpHeifClass;
+
+-struct _Heif
++struct _GimpHeif
+ {
+ GimpPlugIn parent_instance;
+ };
+
+-struct _HeifClass
++struct _GimpHeifClass
+ {
+ GimpPlugInClass parent_class;
+ };
+
+
+-#define HEIF_TYPE (heif_get_type ())
+-#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif))
++#define GIMP_HEIF_TYPE (gimp_heif_get_type ())
++#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif))
+
+-GType heif_get_type (void) G_GNUC_CONST;
++GType gimp_heif_get_type (void) G_GNUC_CONST;
+
+ static GList * heif_init_procedures (GimpPlugIn *plug_in);
+ static GimpProcedure * heif_create_procedure (GimpPlugIn *plug_in,
+@@ -123,14 +123,14 @@ static gboolean save_dialog
+ GimpImage *image);
+
+
+-G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN)
++G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN)
+
+-GIMP_MAIN (HEIF_TYPE)
++GIMP_MAIN (GIMP_HEIF_TYPE)
+ DEFINE_STD_SET_I18N
+
+
+ static void
+-heif_class_init (HeifClass *klass)
++gimp_heif_class_init (GimpHeifClass *klass)
+ {
+ GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
+
+@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass)
+ }
+
+ static void
+-heif_init (Heif *heif)
++gimp_heif_init (GimpHeif *heif)
+ {
+ }
+
Index: pkgsrc/graphics/gimp-devel/patches/patch-tools_extract-vector-icon.sh
diff -u /dev/null pkgsrc/graphics/gimp-devel/patches/patch-tools_extract-vector-icon.sh:1.1
--- /dev/null Sat Sep 10 09:24:48 2022
+++ pkgsrc/graphics/gimp-devel/patches/patch-tools_extract-vector-icon.sh Sat Sep 10 09:24:48 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-tools_extract-vector-icon.sh,v 1.1 2022/09/10 09:24:48 wiz Exp $
+
+Fix unportable test(1) operator.
+https://gitlab.gnome.org/GNOME/gimp/-/issues/8605
+
+--- tools/extract-vector-icon.sh.orig 2022-08-21 19:21:38.000000000 +0000
++++ tools/extract-vector-icon.sh
+@@ -35,7 +35,7 @@ fi
+ compute_viewbox="$(pwd)/../../tools/compute-svg-viewbox"
+ source="$1"
+ id="$2"
+-if [ "$#" == 4 ]; then
++if [ "$#" = 4 ]; then
+ # The expected display width/height for the image.
+ width="$3"
+ height="$4"
+@@ -107,7 +107,7 @@ rm -f $svg_temp
+
+ # The finale SVG file with properly set viewBox.
+ svg="$svg_start $viewBox"
+-if [ "$#" == 5 ]; then
++if [ "$#" = 5 ]; then
+ svg="$svg
+ width=\"$width\"
+ height=\"$height\""
Home |
Main Index |
Thread Index |
Old Index