[gimp/gtk3-port-meson: 10/13] Merge branch 'meson' into gtk3-port-meson
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port-meson: 10/13] Merge branch 'meson' into gtk3-port-meson
- Date: Fri, 16 Feb 2018 14:14:18 +0000 (UTC)
commit 5668b2796f6ad641cf1ea0731e128791f0459ef7
Merge: 8b3a6bc e88bd87
Author: Félix Piédallu <felix piedallu me>
Date: Fri Feb 16 14:58:24 2018 +0100
Merge branch 'meson' into gtk3-port-meson
app/actions/meson.build | 107 ++
app/config/Makefile.am | 2 +-
app/config/meson.build | 75 ++
app/core/gimpviewable.c | 4 +
app/core/meson.build | 228 ++++
app/dialogs/meson.build | 67 ++
app/display/gimpdisplayshell-title.c | 4 +-
app/display/meson.build | 107 ++
app/file/meson.build | 18 +
app/gegl/meson.build | 35 +
app/git-version.h.in | 5 +
app/gui/meson.build | 37 +
app/menus/meson.build | 22 +
app/meson.build | 159 +++
app/operations/layer-modes-legacy/meson.build | 31 +
app/operations/layer-modes/meson.build | 29 +
app/operations/meson.build | 63 +
app/operations/tests/meson.build | 10 +
app/paint/meson.build | 58 +
app/pdb/meson.build | 92 ++
app/plug-in/meson.build | 51 +
app/propgui/meson.build | 27 +
app/tests/create_test_env.sh | 29 +
app/tests/meson.build | 92 ++
app/text/meson.build | 38 +
app/tools/meson.build | 125 ++
app/vectors/meson.build | 26 +
app/widgets/meson.build | 239 ++++
app/xcf/meson.build | 20 +
build/archlinux/.gitignore | 3 +
build/archlinux/PKGBUILD | 114 ++
build/archlinux/linux.gpl | 19 +
build/mingw/.gitignore | 3 +
build/mingw/PKGBUILD | 132 +++
build/mingw/linux.gpl | 19 +
build/windows/gimp-plug-ins.rc.in | 2 +-
build/windows/gimp.rc.in | 4 +-
build/windows/installer/lang/extractlang.sh | 11 +
build/windows/installer/lang/meson.build | 56 +
build/windows/installer/meson.build | 1 +
build/windows/meson.build | 13 +
cursors/meson.build | 135 +++
data/brushes/meson.build | 22 +
data/dynamics/meson.build | 16 +
data/environ/meson.build | 3 +
data/gradients/meson.build | 93 ++
data/images/meson.build | 11 +
data/interpreters/meson.build | 3 +
data/meson.build | 11 +
data/palettes/meson.build | 47 +
data/patterns/meson.build | 25 +
data/tags/meson.build | 33 +
data/tips/meson.build | 48 +
data/tool-presets/meson.build | 20 +
desktop/meson.build | 112 ++
devel-docs/app/meson.build | 42 +
devel-docs/libgimp/meson.build | 58 +
devel-docs/libgimpbase/meson.build | 45 +
devel-docs/libgimpcolor/meson.build | 38 +
devel-docs/libgimpconfig/meson.build | 41 +
devel-docs/libgimpmath/meson.build | 38 +
devel-docs/libgimpmodule/meson.build | 38 +
devel-docs/libgimpthumb/meson.build | 40 +
devel-docs/libgimpwidgets/meson.build | 61 +
devel-docs/meson.build | 12 +
devel-docs/tools/meson.build | 30 +
docs/meson.build | 62 +
etc/meson.build | 12 +
icons/Color/meson.build | 59 +
icons/Legacy/meson.build | 556 +++++++++
icons/Symbolic-Inverted/meson.build | 70 ++
icons/Symbolic/meson.build | 59 +
icons/meson.build | 1117 ++++++++++++++++++
libgimp/meson.build | 316 +++++
libgimpbase/Makefile.am | 4 +-
libgimpbase/gimpenv.c | 14 +-
libgimpbase/gimputils.c | 11 +-
libgimpbase/gimpversion.h.in | 65 +
libgimpbase/meson.build | 119 ++
libgimpcolor/meson.build | 71 ++
libgimpconfig/meson.build | 70 ++
libgimpmath/meson.build | 38 +
libgimpmodule/meson.build | 36 +
libgimpthumb/meson.build | 88 ++
libgimpwidgets/gimpicons.c | 4 +
libgimpwidgets/meson.build | 217 ++++
m4macros/meson.build | 5 +
menus/meson.build | 70 ++
meson.build | 1501 ++++++++++++++++++++++++
meson_options.txt | 34 +
modules/meson.build | 98 ++
pdb/meson.build | 151 +++
plug-ins/common/meson.build | 525 +++++++++
plug-ins/file-bmp/meson.build | 37 +
plug-ins/file-exr/meson.build | 40 +
plug-ins/file-faxg3/meson.build | 36 +
plug-ins/file-fits/meson.build | 36 +
plug-ins/file-fli/meson.build | 36 +
plug-ins/file-ico/meson.build | 38 +
plug-ins/file-jpeg/meson.build | 40 +
plug-ins/file-psd/meson.build | 41 +
plug-ins/file-raw/meson.build | 51 +
plug-ins/file-sgi/meson.build | 36 +
plug-ins/file-tiff/meson.build | 38 +
plug-ins/file-webp/meson.build | 42 +
plug-ins/flame/meson.build | 38 +
plug-ins/fractal-explorer/examples/meson.build | 37 +
plug-ins/fractal-explorer/meson.build | 38 +
plug-ins/gfig/gfig-examples/meson.build | 14 +
plug-ins/gfig/images/meson.build | 36 +
plug-ins/gfig/meson.build | 54 +
plug-ins/gimpressionist/Brushes/meson.build | 66 +
plug-ins/gimpressionist/Paper/meson.build | 16 +
plug-ins/gimpressionist/Presets/meson.build | 32 +
plug-ins/gimpressionist/meson.build | 61 +
plug-ins/gradient-flare/flares/meson.build | 11 +
plug-ins/gradient-flare/meson.build | 37 +
plug-ins/help-browser/meson.build | 43 +
plug-ins/help/Makefile.am | 2 +-
plug-ins/help/meson.build | 40 +
plug-ins/ifs-compose/meson.build | 37 +
plug-ins/imagemap/images/meson.build | 30 +
plug-ins/imagemap/meson.build | 159 +++
plug-ins/lighting/images/meson.build | 30 +
plug-ins/lighting/meson.build | 44 +
plug-ins/map-object/meson.build | 42 +
plug-ins/meson.build | 33 +
plug-ins/metadata/meson.build | 73 ++
plug-ins/pagecurl/meson.build | 69 ++
plug-ins/pagecurl/pagecurl.c | 5 +-
plug-ins/print/meson.build | 47 +
plug-ins/pygimp/doc/meson.build | 25 +
plug-ins/pygimp/meson.build | 128 ++
plug-ins/pygimp/plug-ins/meson.build | 20 +
plug-ins/pygimp/py-compile | 34 +-
plug-ins/screenshot/meson.build | 34 +
plug-ins/script-fu/ftx/meson.build | 12 +
plug-ins/script-fu/meson.build | 68 ++
plug-ins/script-fu/scripts/images/meson.build | 9 +
plug-ins/script-fu/scripts/meson.build | 67 ++
plug-ins/script-fu/tinyscheme/meson.build | 16 +
plug-ins/selection-to-path/meson.build | 47 +
plug-ins/twain/meson.build | 41 +
plug-ins/ui/meson.build | 13 +
po-libgimp/meson.build | 1 +
po-plug-ins/meson.build | 1 +
po-python/meson.build | 1 +
po-script-fu/meson.build | 1 +
po-tags/meson.build | 1 +
po-tips/meson.build | 2 +
po-windows-installer/meson.build | 2 +
po/meson.build | 2 +
themes/meson.build | 25 +
tools/Makefile.am | 2 +-
tools/generate_changelog.sh | 35 +
tools/gimptool.c | 2 +-
tools/meson.build | 45 +
157 files changed, 10728 insertions(+), 42 deletions(-)
---
diff --cc libgimpbase/gimpenv.c
index bf981ee,200e69a..c74356e
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@@ -485,7 -479,7 +479,7 @@@ gimp_data_directory (void
GIMP_DATA_VERSION,
NULL);
- gimp_data_dir = gimp_env_get_dir ("GIMP3_DATADIR", DATADIR, tmp);
- gimp_data_dir = gimp_env_get_dir ("GIMP2_DATADIR", GIMPDATADIR, tmp);
++ gimp_data_dir = gimp_env_get_dir ("GIMP3_DATADIR", GIMPDATADIR, tmp);
g_free (tmp);
}
@@@ -563,7 -557,7 +557,11 @@@ gimp_sysconf_directory (void
GIMP_SYSCONF_VERSION,
NULL);
++<<<<<<< HEAD
+ gimp_sysconf_dir = gimp_env_get_dir ("GIMP3_SYSCONFDIR", SYSCONFDIR, tmp);
++=======
+ gimp_sysconf_dir = gimp_env_get_dir ("GIMP2_SYSCONFDIR", GIMPSYSCONFDIR, tmp);
++>>>>>>> meson
g_free (tmp);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
