[gimp/gimp-attributes-wip: 68/148] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 68/148] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Sat, 7 Feb 2015 13:21:42 +0000 (UTC)
commit e973b773acad5d860525af5936183d8b7e24c62d
Merge: 3ab7e95 7313cb5
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat Dec 6 17:36:10 2014 +0100
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
Conflicts:
app/pdb/internal-procs.c
plug-ins/common/Makefile.am
plug-ins/common/gimprc.common
plug-ins/common/plugin-defs.pl
app/actions/filters-actions.c | 26 +-
app/actions/tools-actions.c | 73 +
app/actions/tools-commands.c | 43 +
app/actions/tools-commands.h | 7 +
app/core/Makefile.am | 4 +
app/core/core-types.h | 10 +-
app/core/gimp-palettes.c | 134 +
app/{gui/color-history.h => core/gimp-palettes.h} | 24 +-
app/core/gimp.c | 9 +
app/core/gimpbrush.c | 15 +-
app/core/gimpbrush.h | 1 +
app/core/gimpbrushgenerated.c | 2 +-
app/core/gimpcoords-interpolate.c | 4 +-
app/core/gimppalettemru.c | 247 +
app/core/gimppalettemru.h | 62 +
app/dialogs/action-search-dialog.c | 42 +
app/display/display-enums.c | 2 +
app/display/display-enums.h | 3 +-
app/display/gimpcanvashandle.c | 19 +
app/display/gimpdisplayshell-tool-events.c | 8 +-
app/display/gimpdisplayshell-transform.c | 4 +
app/display/gimpmotionbuffer.c | 10 +-
app/display/gimpmotionbuffer.h | 2 -
app/gui/Makefile.am | 2 -
app/gui/color-history.c | 277 -
app/gui/gui.c | 5 -
app/paint/gimpbrushcore.c | 60 +-
app/paint/gimppaintbrush.c | 24 +-
app/paint/gimppaintoptions.c | 102 +-
app/paint/gimppaintoptions.h | 7 +
app/paint/gimpsmudge.c | 15 +-
app/pdb/context-cmds.c | 291 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/plug-in-compat-cmds.c | 678 ++
app/sanity.c | 7 +
app/tools/gimpbrushtool.c | 4 +-
app/tools/gimpcolorpickertool.c | 1 +
app/tools/gimpcolortool.c | 54 +-
app/tools/gimpdrawtool.c | 1 +
app/tools/gimpdrawtool.h | 9 +-
app/tools/gimpgegltool.c | 4 +
app/tools/gimppaintoptions-gui.c | 220 +-
app/tools/gimppainttool.c | 94 +-
app/tools/gimppainttool.h | 12 +-
app/tools/gimpseamlessclonetool.c | 2 +-
app/tools/gimptexttool.c | 7 +
app/tools/gimptransformtool.c | 12 +-
app/widgets/gimpcolordialog.c | 142 +-
app/widgets/gimpcolordialog.h | 5 +-
app/widgets/gimpgradienteditor.c | 11 +-
app/widgets/gimpoverlaybox.c | 21 -
app/widgets/gimppaletteeditor.c | 3 +-
app/widgets/gimpviewabledialog.c | 3 +-
app/widgets/widgets-enums.c | 6 +-
app/widgets/widgets-enums.h | 5 +-
app/xcf/xcf-load.c | 2 +-
build/windows/jhbuild/imglibs.moduleset | 6 +-
icons/16/gimp-tool-seamless-clone.png | Bin 0 -> 5109 bytes
icons/22/gimp-tool-seamless-clone.png | Bin 0 -> 13990 bytes
icons/Makefile.am | 2 +
libgimp/gimp.def | 8 +
libgimp/gimpcontext_pdb.c | 174 +-
libgimp/gimpcontext_pdb.h | 167 +-
libgimpwidgets/gimpcolorselection.c | 2 +-
menus/image-menu.xml.in | 7 +-
plug-ins/common/.gitignore | 10 -
plug-ins/common/Makefile.am | 90 -
plug-ins/common/gimprc.common | 5 -
plug-ins/common/illusion.c | 436 --
plug-ins/common/noise-solid.c | 686 --
plug-ins/common/nova.c | 994 ---
plug-ins/common/plugin-defs.pl | 5 -
plug-ins/common/sinus.c | 1060 ---
plug-ins/common/video.c | 2137 ------
plug-ins/script-fu/scheme-wrapper.c | 30 +-
plug-ins/script-fu/scripts/distress-selection.scm | 3 +
plug-ins/script-fu/scripts/line-nova.scm | 2 +
po-libgimp/fi.po | 4 +-
po-libgimp/pt.po | 179 +-
po-plug-ins/POTFILES.in | 5 -
po-plug-ins/pt.po | 8366 +++++++++++----------
po/POTFILES.in | 4 +-
po/es.po | 7449 +++++++++++--------
po/lv.po | 2 +-
po/pt.po | 8420 ++++++++++++---------
tools/pdbgen/pdb/context.pdb | 185 +-
tools/pdbgen/pdb/plug_in_compat.pdb | 352 +-
87 files changed, 16659 insertions(+), 16970 deletions(-)
---
diff --cc app/pdb/internal-procs.c
index bb09b21,626d734..1cf8186
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@@ -28,7 -28,7 +28,7 @@@
#include "internal-procs.h"
- /* 739 procedures registered total */
-/* 747 procedures registered total */
++/* 749 procedures registered total */
void
internal_procs_init (GimpPDB *pdb)
diff --cc plug-ins/common/Makefile.am
index 9103127,1e921e8..4c2995c
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@@ -120,17 -119,14 +120,14 @@@ libexec_PROGRAMS =
grid \
guillotine \
hot \
- illusion \
+ iptc \
jigsaw \
lcms \
lens-flare \
$(MAIL) \
max-rgb \
- metadata \
newsprint \
nl-filter \
- noise-solid \
- nova \
oilify \
photocopy \
plugin-browser \
@@@ -1531,43 -1507,6 +1526,26 @@@ hot_LDADD =
$(INTLLIBS) \
$(hot_RC)
- illusion_SOURCES = \
- illusion.c
-
- illusion_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS) \
- $(illusion_RC)
-
+iptc_CFLAGS = $(GEXIV2_CFLAGS)
+
+iptc_SOURCES = \
+ iptc.c
+
+iptc_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(GTK_LIBS) \
+ $(GEXIV2_LIBS) \
+ $(RT_LIBS) \
+ $(INTLLIBS) \
+ $(iptc_RC)
+
jigsaw_SOURCES = \
jigsaw.c
diff --cc plug-ins/common/gimprc.common
index 8253c3e,9dcf4e7..fb30d1c
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@@ -74,17 -73,14 +74,14 @@@ gradient_map_RC = gradient-map.rc.
grid_RC = grid.rc.o
guillotine_RC = guillotine.rc.o
hot_RC = hot.rc.o
- illusion_RC = illusion.rc.o
+iptc_RC = iptc.rc.o
jigsaw_RC = jigsaw.rc.o
lcms_RC = lcms.rc.o
lens_flare_RC = lens-flare.rc.o
mail_RC = mail.rc.o
max_rgb_RC = max-rgb.rc.o
-metadata_RC = metadata.rc.o
newsprint_RC = newsprint.rc.o
nl_filter_RC = nl-filter.rc.o
- noise_solid_RC = noise-solid.rc.o
- nova_RC = nova.rc.o
oilify_RC = oilify.rc.o
photocopy_RC = photocopy.rc.o
plugin_browser_RC = plugin-browser.rc.o
diff --cc plug-ins/common/plugin-defs.pl
index 7934a5a,8f4c4c3..419b1f8
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@@ -75,17 -74,14 +75,14 @@@
'grid' => { ui => 1 },
'guillotine' => {},
'hot' => { ui => 1 },
- 'illusion' => { ui => 1 },
+ 'iptc' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'jigsaw' => { ui => 1 },
'lcms' => { ui => 1, gegl => 1, libs => 'LCMS_LIBS', cflags => 'LCMS_CFLAGS' },
'lens-flare' => { ui => 1 },
'mail' => { ui => 1, optional => 1 },
'max-rgb' => { ui => 1 },
- 'metadata' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'newsprint' => { ui => 1 },
'nl-filter' => { ui => 1 },
- 'noise-solid' => { ui => 1 },
- 'nova' => { ui => 1 },
'oilify' => { ui => 1 },
'photocopy' => { ui => 1 },
'plugin-browser' => { ui => 1 },
diff --cc po-plug-ins/POTFILES.in
index 793d4c2,6709517..ea39761
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@@ -85,10 -83,9 +84,8 @@@ plug-ins/common/lcms.
plug-ins/common/lens-flare.c
plug-ins/common/mail.c
plug-ins/common/max-rgb.c
-plug-ins/common/metadata.c
plug-ins/common/newsprint.c
plug-ins/common/nl-filter.c
- plug-ins/common/noise-solid.c
- plug-ins/common/nova.c
plug-ins/common/oilify.c
plug-ins/common/photocopy.c
plug-ins/common/plugin-browser.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
