[gimp/meson: 288/291] Merge branch 'master' into meson
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 288/291] Merge branch 'master' into meson
- Date: Thu, 29 Mar 2018 11:34:05 +0000 (UTC)
commit 6bcde8332c8d7a04f5e17ff1874a94eb332cd3a6
Merge: f508df5 3265797
Author: Salamandar <felix piedallu me>
Date: Thu Mar 29 10:22:23 2018 +0200
Merge branch 'master' into meson
Makefile.am | 8 +-
NEWS | 78 +-
app-tools/.gitignore | 6 +
app-tools/Makefile.am | 71 +
{tools => app-tools}/gimp-debug-tool.c | 2 +-
app/actions/channels-commands.c | 36 +-
app/actions/edit-commands.c | 10 +-
app/actions/layers-actions.c | 58 +-
app/actions/layers-commands.c | 61 +-
app/app.c | 76 +-
app/config/config-types.h | 7 +
app/config/gimpcoreconfig.c | 8 +-
app/config/gimpdialogconfig.c | 2 +-
app/core/Makefile.am | 4 +
app/core/core-enums.c | 8 +
app/core/core-enums.h | 10 +-
app/core/core-types.h | 1 +
app/core/gimp-cairo.c | 87 +-
app/core/gimp-cairo.h | 12 +-
app/core/gimp-edit.c | 44 +-
app/core/gimp-gui.c | 9 +-
app/core/gimp-gui.h | 6 +-
app/core/gimp-internal-data.c | 2 +-
app/core/gimp-palettes.c | 4 +-
app/core/gimp-palettes.h | 12 +-
app/core/gimp-spawn.c | 250 +
app/core/gimp-spawn.h | 34 +
app/core/gimp-utils.c | 2 +-
app/core/gimp.c | 4 +-
app/core/gimpbrushcache.c | 2 +-
app/core/gimpbrushclipboard.c | 2 +-
app/core/gimpchannelpropundo.c | 2 +-
app/core/gimpchannelundo.c | 2 +-
app/core/gimpcontext.c | 5 +-
app/core/gimpdatafactory.c | 5 +-
app/core/gimpdrawable-blend.c | 61 +-
app/core/gimpdrawable-blend.h | 39 +-
app/core/gimpdrawable-filters.c | 2 +-
app/core/gimpdrawable-operation.c | 2 +-
app/core/gimpdrawable.c | 29 +-
app/core/gimpdrawable.h | 3 +
app/core/gimpdrawablemodundo.c | 2 +-
app/core/gimpdrawablestack.c | 4 +-
app/core/gimpdrawableundo.c | 4 +-
app/core/gimpfilteredcontainer.c | 2 +-
app/core/gimpfilterstack.c | 4 +-
app/core/gimpfloatingselectionundo.c | 2 +-
app/core/gimpgradient-load.c | 34 +
app/core/gimpgrouplayer.c | 148 +-
app/core/gimpgrouplayer.h | 5 +
app/core/gimpgrouplayerundo.c | 21 +
app/core/gimpguideundo.c | 2 +-
app/core/gimpimage-color-profile.c | 41 +-
app/core/gimpimage-colormap.c | 4 +-
app/core/gimpimage-convert-indexed.c | 94 +-
app/core/gimpimage-convert-precision.c | 174 +-
app/core/gimpimage-convert-type.c | 37 +-
app/core/gimpimage-flip.c | 66 +-
app/core/gimpimage-item-list.c | 27 +-
app/core/gimpimage-resize.c | 102 +-
app/core/gimpimage-rotate.c | 127 +-
app/core/gimpimage-scale.c | 103 +-
app/core/gimpimage-undo-push.c | 32 +
app/core/gimpimage-undo-push.h | 8 +
app/core/gimpimage.c | 2 +-
app/core/gimpimageundo.c | 4 +-
app/core/gimpitem.c | 103 +-
app/core/gimpitem.h | 10 +
app/core/gimpitempropundo.c | 2 +-
app/core/gimpitemstack.c | 4 +-
app/core/gimpitemtree.c | 8 +-
app/core/gimpitemundo.c | 2 +-
app/core/gimplayer.c | 135 +-
app/core/gimplayermaskpropundo.c | 2 +-
app/core/gimplayermaskundo.c | 4 +-
app/core/gimplayerpropundo.c | 2 +-
app/core/gimplayerstack.c | 4 +-
app/core/gimplayerundo.c | 2 +-
app/core/gimpmaskundo.c | 2 +-
app/core/gimpobjectqueue.c | 198 +
app/core/gimpobjectqueue.h | 66 +
app/core/gimppatternclipboard.c | 2 +-
app/core/gimppdbprogress.c | 4 +-
app/core/gimpsamplepointundo.c | 2 +-
app/core/gimpsubprogress.c | 74 +-
app/core/gimptoolpreset.c | 4 +-
app/core/gimpundo.c | 2 +-
app/core/gimpunit.c | 12 +-
app/dialogs/action-search-dialog.c | 65 +-
app/dialogs/preferences-dialog.c | 108 +-
app/dialogs/tips-parser.c | 4 +-
app/display/gimpcanvas-style.c | 18 +-
app/display/gimpcanvasarc.c | 4 +-
app/display/gimpcanvasboundary.c | 2 +-
app/display/gimpcanvashandle.c | 14 +-
app/display/gimpcanvasitem.c | 2 +-
app/display/gimpcanvasprogress.c | 91 +-
app/display/gimpdisplay.c | 6 -
app/display/gimpdisplayshell-draw.c | 2 +-
app/display/gimpdisplayshell-layer-select.c | 11 +-
app/display/gimpdisplayshell-progress.c | 2 +
app/display/gimpdisplayshell-render.c | 19 +-
app/display/gimpdisplayshell-selection.c | 6 +-
app/display/gimpdisplayshell-tool-events.c | 118 +-
app/display/gimpdisplayshell.c | 4 +-
app/display/gimpdisplayshell.h | 1 -
app/display/gimpdisplayxfer.c | 10 +-
app/display/gimpimagewindow.c | 6 +-
app/display/gimpnavigationeditor.c | 2 +-
app/display/gimptoolgui.c | 21 +-
app/display/gimptoolline.c | 8 +-
app/display/gimptoolrectangle.c | 27 +-
app/display/gimptooltransformgrid.c | 12 +-
app/display/gimptoolwidget.c | 2 +-
app/errors.c | 275 +-
app/errors.h | 20 +-
app/file/file-remote.c | 4 +-
app/gegl/gimp-gegl-apply-operation.c | 66 +-
app/gegl/gimp-gegl-apply-operation.h | 4 +-
app/gui/gimpuiconfigurer.c | 2 +-
app/gui/gui-message.c | 256 +-
app/gui/gui-message.h | 3 +-
app/gui/gui.c | 57 +-
app/gui/gui.h | 1 +
app/gui/splash.c | 4 +-
app/operations/Makefile.am | 2 -
app/operations/gimp-operations.c | 2 -
app/operations/gimpoperationbuffersourcevalidate.c | 123 +-
app/operations/gimpoperationcagetransform.c | 18 +-
app/operations/gimpoperationshapeburst.c | 322 -
app/operations/gimpoperationshapeburst.h | 55 -
app/operations/layer-modes/gimp-layer-modes.c | 286 +-
.../layer-modes/gimpoperationantierase.c | 8 +-
app/operations/layer-modes/gimpoperationbehind.c | 8 +-
app/operations/layer-modes/gimpoperationdissolve.c | 8 +-
app/operations/layer-modes/gimpoperationerase.c | 8 +-
.../gimpoperationlayermode-composite-sse2.c | 20 +-
.../layer-modes/gimpoperationlayermode-composite.c | 112 +-
.../layer-modes/gimpoperationlayermode-composite.h | 126 +-
.../layer-modes/gimpoperationlayermode.c | 94 +-
app/operations/layer-modes/gimpoperationmerge.c | 8 +-
.../layer-modes/gimpoperationnormal-sse2.c | 8 +-
.../layer-modes/gimpoperationnormal-sse4.c | 8 +-
app/operations/layer-modes/gimpoperationnormal.c | 8 +-
app/operations/layer-modes/gimpoperationreplace.c | 8 +-
app/operations/layer-modes/gimpoperationsplit.c | 8 +-
app/operations/operations-enums.c | 16 +-
app/operations/operations-enums.h | 10 +-
app/paint/gimpbrushcore.c | 125 +-
app/paint/gimpheal.c | 11 +-
app/paint/gimpink.c | 2 +-
app/paint/gimpinkundo.c | 2 +-
app/paint/gimppaintcore-loops.c | 2 +-
app/paint/gimppaintcoreundo.c | 2 +-
app/pdb/context-cmds.c | 93 +
app/pdb/drawable-cmds.c | 2 +-
app/pdb/edit-cmds.c | 3 +-
app/pdb/gimppdbcontext.c | 27 +-
app/pdb/gimppdbcontext.h | 2 +
app/pdb/gimpprocedure.c | 2 +-
app/pdb/image-cmds.c | 2 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/message-cmds.c | 2 +-
app/plug-in/gimpplugin.c | 52 +-
app/propgui/Makefile.am | 2 +
app/propgui/gimppropgui-color-to-alpha.c | 85 +-
app/propgui/gimppropgui-eval.c | 2 +-
app/propgui/gimppropgui-generic.c | 11 +
app/propgui/gimppropgui-recursive-transform.c | 144 +
app/propgui/gimppropgui-recursive-transform.h | 35 +
app/propgui/gimppropgui.c | 15 +-
app/propgui/propgui-types.h | 80 +-
app/sanity.c | 4 +-
app/signals.c | 3 -
app/tests/gimpdir/sessionrc-expected-2-6 | 14 +-
app/text/gimptextlayer-xcf.c | 3 +-
app/text/gimptextundo.c | 8 +-
app/tools/gimpblendoptions.c | 73 +-
app/tools/gimpblendoptions.h | 23 +-
app/tools/gimpblendtool-editor.c | 38 +-
app/tools/gimpblendtool.c | 56 +-
app/tools/gimpbrushtool.c | 2 +-
app/tools/gimpcroptool.c | 242 +-
app/tools/gimpcroptool.h | 1 +
app/tools/gimpeditselectiontool.c | 2 +
app/tools/gimpfiltertool-widgets.c | 228 +-
app/tools/gimpfiltertool-widgets.h | 3 +
app/tools/gimpfiltertool.c | 8 +-
app/tools/gimpforegroundselecttoolundo.c | 2 +-
app/tools/gimpguidetool.c | 2 +-
app/tools/gimpnpointdeformationtool.c | 2 +-
app/tools/gimpoperationtool.c | 97 +
app/tools/gimppaintoptions-gui.c | 1 +
app/tools/gimppainttool.c | 6 +-
app/tools/gimprectangleoptions.c | 3 +-
app/tools/gimprectangleselecttool.c | 14 +-
app/tools/gimptexttool.c | 19 +
app/tools/gimptool.c | 2 +-
app/tools/gimptransformtoolundo.c | 2 +-
app/tools/gimpwarptool.c | 4 +-
app/tools/tool_manager.c | 9 +-
app/vectors/gimpvectorsmodundo.c | 2 +-
app/vectors/gimpvectorspropundo.c | 6 +-
app/vectors/gimpvectorsundo.c | 2 +-
app/widgets/Makefile.am | 2 +
app/widgets/gimpaction-history.c | 310 +-
app/widgets/gimpaction-history.h | 19 +-
app/widgets/gimpaction.c | 2 +-
app/widgets/gimpactiongroup.c | 2 +-
app/widgets/gimpcoloreditor.c | 2 +-
app/widgets/gimpcontainereditor.c | 6 +-
app/widgets/gimpcontainertreestore.c | 30 +-
app/widgets/gimpcontainerview.c | 4 +
app/widgets/gimpcontrollereditor.c | 2 +-
app/widgets/gimpcontrollerlist.c | 2 +-
app/widgets/gimpcriticaldialog.c | 12 +-
app/widgets/gimpdataeditor.c | 4 +-
app/widgets/gimpdatafactoryview.c | 4 +-
app/widgets/gimpdeviceeditor.c | 2 +-
app/widgets/gimpdeviceinfo.c | 4 +-
app/widgets/gimpdeviceinfoeditor.c | 2 +-
app/widgets/gimpdevicemanager.c | 2 +-
app/widgets/gimpdevicestatus.c | 2 +-
app/widgets/gimpdial.c | 4 +-
app/widgets/gimpdynamicsoutputeditor.c | 2 +-
app/widgets/gimpeditor.c | 5 +-
app/widgets/gimpfilleditor.c | 2 +-
app/widgets/gimpgrideditor.c | 2 +-
app/widgets/gimphighlightablebutton.c | 372 +
app/widgets/gimphighlightablebutton.h | 63 +
app/widgets/gimphistogrameditor.c | 20 +-
app/widgets/gimphistogrameditor.h | 2 +-
app/widgets/gimpiconpicker.c | 2 +-
app/widgets/gimpimageparasiteview.c | 4 +-
app/widgets/gimpimagepropview.c | 2 +-
app/widgets/gimpitemtreeview.c | 8 +
app/widgets/gimpitemtreeview.h | 51 +-
app/widgets/gimplanguagestore-parser.c | 3 +-
app/widgets/gimplayertreeview.c | 76 +-
app/widgets/gimpoverlayframe.c | 47 +-
app/widgets/gimppdbdialog.c | 6 +-
app/widgets/gimppickablebutton.c | 2 +-
app/widgets/gimppickablepopup.c | 2 +-
app/widgets/gimpsearchpopup.c | 2 +
app/widgets/gimpselectiondata.c | 2 +-
app/widgets/gimpsettingsbox.c | 6 +-
app/widgets/gimpsettingseditor.c | 6 +-
app/widgets/gimpstrokeeditor.c | 2 +-
app/widgets/gimptemplateeditor.c | 4 +-
app/widgets/gimptextbuffer-serialize.c | 28 +-
app/widgets/gimptextbuffer.c | 39 +-
app/widgets/gimptextbuffer.h | 3 +
app/widgets/gimptextstyleeditor.c | 10 +-
app/widgets/gimptexttag.c | 24 +-
app/widgets/gimptexttag.h | 18 +-
app/widgets/gimptoolbox.c | 2 +-
app/widgets/gimpwidgets-utils.c | 4 +
app/widgets/widgets-types.h | 1 +
app/xcf/xcf-load.c | 8 +-
app/xcf/xcf-seek.c | 2 +-
autogen.sh | 3 +
build/flatpak/flathub | 2 +-
build/flatpak/org.gimp.GIMP-dev.json | 2 +-
build/flatpak/org.gimp.GIMP-nightly.json | 18 +-
build/windows/gimprc-plug-ins.rule | 1 +
build/windows/gimprc.rule | 1 +
build/windows/installer/gimp3264.iss | 1 +
build/windows/installer/installsplash.bmp | Bin 2064982 -> 2064982 bytes
build/windows/installer/installsplash_small.bmp | Bin 537174 -> 537174 bytes
build/windows/installer/lang/Makefile.am | 1 +
configure.ac | 100 +-
data/brushes/Legacy/Makefile.am | 3 -
data/brushes/Legacy/dunes.gbr | Bin 1100 -> 0 bytes
data/brushes/Legacy/galaxy-big.gbr | Bin 10040 -> 0 bytes
data/brushes/Legacy/galaxy.gbr | Bin 2637 -> 0 bytes
data/images/gimp-splash.png | Bin 588365 -> 129666 bytes
data/images/gimp-splash.xcf | Bin 0 -> 13439283 bytes
data/tips/gimp-tips.xml.in | 6 +-
desktop/org.gimp.GIMP.appdata.xml.in.in | 45 +-
devel-docs/debugging-tips.txt | 15 +
devel-docs/os-support.txt | 20 +
devel-docs/release-howto.txt | 25 +-
docs/gimprc.5.in | 46 +-
etc/gimprc | 42 +-
icons/Color/12/gimp-attach.png | Bin 0 -> 394 bytes
icons/Color/12/gimp-detach.png | Bin 0 -> 354 bytes
icons/Color/24/gimp-attach.png | Bin 0 -> 403 bytes
icons/Color/24/gimp-detach.png | Bin 0 -> 413 bytes
icons/Color/color-scalable.svg | 89 +-
icons/Color/scalable/gimp-attach.svg | 96 +
icons/Color/scalable/gimp-detach.svg | 99 +
icons/Symbolic/12/gimp-attach.png | Bin 0 -> 425 bytes
icons/Symbolic/12/gimp-detach.png | Bin 0 -> 409 bytes
icons/Symbolic/24/gimp-attach.png | Bin 0 -> 496 bytes
icons/Symbolic/24/gimp-detach.png | Bin 0 -> 500 bytes
icons/Symbolic/scalable/gimp-attach.svg | 106 +
icons/Symbolic/scalable/gimp-detach.svg | 99 +
icons/Symbolic/symbolic-scalable.svg | 104 +-
icons/icon-list.mk | 48 +-
libgimp/Makefile.am | 2 +-
libgimp/gimp.c | 40 +-
libgimp/gimp.def | 2 +
libgimp/gimpcontext_pdb.c | 65 +
libgimp/gimpcontext_pdb.h | 2 +
libgimp/gimpedit_pdb.c | 4 +-
libgimp/gimpenums.c.tail | 2 +
libgimp/gimpenums.h | 8 +-
libgimpbase/gimpbase.def | 5 +-
libgimpbase/gimpbaseenums.h | 1 -
libgimpbase/gimputils.c | 310 +-
libgimpbase/gimputils.h | 7 +-
libgimpcolor/gimpcolorprofile.c | 230 +-
libgimpwidgets/gimpcolornotebook.c | 64 +-
libgimpwidgets/gimpcolorscales.c | 209 +-
libgimpwidgets/gimpcolorselect.c | 190 +-
libgimpwidgets/gimpcolorselection.c | 2 +-
libgimpwidgets/gimpcolorselector.c | 190 +-
libgimpwidgets/gimpcolorselector.h | 23 +-
libgimpwidgets/gimpicons.h | 7 +-
libgimpwidgets/gimpnumberpairentry.c | 44 +-
libgimpwidgets/gimppickbutton-quartz.c | 64 +-
libgimpwidgets/gimpruler.c | 117 +-
libgimpwidgets/gimpwidgets.def | 5 +-
libgimpwidgets/gimpwidgetsenums.c | 12 +-
libgimpwidgets/gimpwidgetsenums.h | 8 +-
libgimpwidgets/gimpwidgetsmarshal.list | 3 +-
menus/layers-menu.xml | 8 +-
pdb/Makefile.am | 3 +-
pdb/README_NEW_PDB_PROC | 8 +-
pdb/app.pl | 1 +
pdb/enumcode.pl | 14 +-
pdb/enumgen.pl | 14 +-
pdb/enums-external.pl | 10 +
pdb/enums.pl | 26 +-
pdb/groups/context.pdb | 56 +-
pdb/groups/drawable.pdb | 2 +-
pdb/groups/edit.pdb | 3 +
pdb/groups/image.pdb | 2 +-
pdb/groups/message.pdb | 2 +-
pdb/stddefs.pdb | 4 +
plug-ins/common/Makefile.am | 4 +-
plug-ins/common/emboss.c | 2 +-
plug-ins/common/file-cel.c | 8 +-
plug-ins/common/file-jp2-load.c | 1312 +-
plug-ins/common/file-pdf-load.c | 2 +-
plug-ins/common/file-png.c | 14 +
plug-ins/common/file-xpm.c | 3 +
plug-ins/common/grid.c | 2 +-
plug-ins/common/newsprint.c | 2 +-
plug-ins/common/nl-filter.c | 2 +-
plug-ins/common/oilify.c | 2 +-
plug-ins/common/plugin-defs.pl | 2 +-
plug-ins/common/sparkle.c | 4 +-
plug-ins/file-psd/psd-util.c | 6 +-
plug-ins/metadata/metadata-editor.c | 22 +-
plug-ins/screenshot/screenshot-gnome-shell.c | 1 +
plug-ins/screenshot/screenshot-win32.c | 37 +-
po-libgimp/POTFILES.skip | 1 +
po-libgimp/de.po | 113 +-
po-libgimp/el.po | 389 +-
po-libgimp/is.po | 194 +-
po-libgimp/it.po | 109 +-
po-libgimp/lv.po | 1935 +-
po-libgimp/ru.po | 8 +-
po-plug-ins/POTFILES.skip | 1 +
po-plug-ins/da.po |12704 ++++++-----
po-plug-ins/de.po | 1329 +-
po-plug-ins/el.po | 1102 +-
po-plug-ins/it.po | 268 +-
po-plug-ins/lv.po | 6400 +++---
po-plug-ins/pl.po | 245 +-
po-plug-ins/ru.po | 998 +-
po-plug-ins/sv.po | 238 +-
po-python/POTFILES.skip | 1 +
po-script-fu/POTFILES.skip | 1 +
po-script-fu/ca.po | 4 +-
po-script-fu/da.po | 408 +-
po-script-fu/el.po | 36 +-
po-script-fu/hu.po | 899 +-
po-script-fu/ja.po | 234 +-
po-script-fu/lv.po | 296 +-
po-tags/POTFILES.skip | 1 +
po-tips/POTFILES.skip | 1 +
po-tips/de.po | 391 +-
po-tips/el.po | 33 +-
po-tips/hu.po | 35 +-
po-tips/it.po | 403 +-
po-tips/lv.po | 368 +-
po-tips/pl.po | 28 +-
po-tips/sv.po | 29 +-
po-windows-installer/LINGUAS | 1 +
po-windows-installer/POTFILES.skip | 1 +
po-windows-installer/de.po | 91 +-
po-windows-installer/hu.po | 64 +-
po-windows-installer/it.po | 26 +-
po-windows-installer/lv.po | 394 +
po/POTFILES.in | 4 +-
po/ar.po |12541 ++++++++----
po/ca.po | 2232 ++-
po/ca valencia po |22376 ++++++++++++++------
po/da.po | 5369 +++--
po/el.po | 4188 +++--
po/es.po | 2295 ++-
po/hu.po |12514 ++++++++----
po/is.po | 4306 ++--
po/it.po | 2971 ++--
po/ja.po |21636 ++++++++++++++-----
po/lv.po |20504 ++++++++++--------
po/pl.po | 1789 +-
po/ru.po | 1980 +-
tools/.gitignore | 2 -
tools/Makefile.am | 32 +-
412 files changed, 99230 insertions(+), 57571 deletions(-)
---
diff --cc libgimpbase/gimputils.c
index 7929ef0,4b7c14f..24e4863
--- a/libgimpbase/gimputils.c
+++ b/libgimpbase/gimputils.c
@@@ -42,9 -38,23 +38,10 @@@
#include <glib/gprintf.h>
#if defined(G_OS_WIN32)
-/* This is a hack for Windows known directory support.
- * DATADIR (autotools-generated constant) is a type defined in objidl.h
- * so we must #undef it before including shlobj.h in order to avoid a
- * name clash. */
-#undef DATADIR
-#include <windows.h>
-#include <shlobj.h>
-#else /* G_OS_WIN32 */
-/* For waitpid() */
-#include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
-
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
+# include <windows.h>
+# include <shlobj.h>
#endif
+ #endif /* G_OS_WIN32 */
#include "gimpbasetypes.h"
#include "gimputils.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
