[gimp] Bug 757687 - Screenshot functionality broken under Wayland

[Michael Natterer <mitch src gnome org>]

commit e1c4314a8ef524a2e2f03ac83c7f647b756f739e
Author: Michael Natterer <mitch gimp org>
Date:   Sat Nov 7 15:52:44 2015 +0100

    Bug 757687 - Screenshot functionality broken under Wayland
    
    Move the screenshot plug-in to its own directory, it's about to be
    split up into multiple files.

 configure.ac                                 |    3 +-
 plug-ins/Makefile.am                         |    3 ++
 plug-ins/common/.gitignore                   |    2 -
 plug-ins/common/Makefile.am                  |   23 ------------
 plug-ins/common/gimprc.common                |    1 -
 plug-ins/common/plugin-defs.pl               |    1 -
 plug-ins/screenshot/.gitignore               |    6 +++
 plug-ins/screenshot/Makefile.am              |   51 ++++++++++++++++++++++++++
 plug-ins/{common => screenshot}/screenshot.c |    0
 9 files changed, 61 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 55a779b..5cca7c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1906,11 +1906,9 @@ AM_CONDITIONAL(BUILD_SCRIPT_FU, test "x$with_script_fu" != "xno")
 
 if test "x$os_win32" = xno; then
   MAIL='mail$(EXEEXT)'
-  SCREENSHOT='screenshot$(EXEEXT)'
 fi
 
 AC_SUBST(MAIL)
-AC_SUBST(SCREENSHOT)
 
 
 ####################
@@ -2333,6 +2331,7 @@ plug-ins/pagecurl/Makefile
 plug-ins/print/Makefile
 plug-ins/pygimp/Makefile
 plug-ins/pygimp/plug-ins/Makefile
+plug-ins/screenshot/Makefile
 plug-ins/script-fu/Makefile
 plug-ins/script-fu/ftx/Makefile
 plug-ins/script-fu/scripts/Makefile
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index cc017bd..ab304d0 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -27,6 +27,8 @@ endif
 if OS_WIN32
 twain = twain
 win_snap = win-snap
+else
+screenshot = screenshot
 endif
 
 SUBDIRS = \
@@ -54,6 +56,7 @@ SUBDIRS = \
        map-object              \
        pagecurl                \
        $(print)                \
+       $(screenshot)           \
        selection-to-path       \
        $(twain)                \
        ui                      \
diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore
index 043dffc..c7dc24b 100644
--- a/plug-ins/common/.gitignore
+++ b/plug-ins/common/.gitignore
@@ -168,8 +168,6 @@
 /ripple.exe
 /sample-colorize
 /sample-colorize.exe
-/screenshot
-/screenshot.exe
 /sharpen
 /sharpen.exe
 /smooth-palette
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 1b98f1a..0995134 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -127,7 +127,6 @@ libexec_PROGRAMS = \
        qbist \
        ripple \
        sample-colorize \
-       $(SCREENSHOT) \
        sharpen \
        smooth-palette \
        softglow \
@@ -156,7 +155,6 @@ EXTRA_PROGRAMS = \
        file-xmc \
        file-xpm \
        mail \
-       screenshot \
        web-page
 
 install-%: %
@@ -1637,27 +1635,6 @@ sample_colorize_LDADD = \
        $(INTLLIBS)             \
        $(sample_colorize_RC)
 
-screenshot_CFLAGS = $(XFIXES_CFLAGS)
-
-screenshot_SOURCES = \
-       screenshot.c
-
-screenshot_LDADD = \
-       $(libgimpui)            \
-       $(libgimpwidgets)       \
-       $(libgimpmodule)        \
-       $(libgimp)              \
-       $(libgimpmath)          \
-       $(libgimpconfig)        \
-       $(libgimpcolor)         \
-       $(libgimpbase)          \
-       $(GTK_LIBS)             \
-       $(GEGL_LIBS)            \
-       $(SCREENSHOT_LIBS)              \
-       $(RT_LIBS)              \
-       $(INTLLIBS)             \
-       $(screenshot_RC)
-
 sharpen_SOURCES = \
        sharpen.c
 
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index c8fdbbf..afe68b9 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -81,7 +81,6 @@ procedure_browser_RC = procedure-browser.rc.o
 qbist_RC = qbist.rc.o
 ripple_RC = ripple.rc.o
 sample_colorize_RC = sample-colorize.rc.o
-screenshot_RC = screenshot.rc.o
 sharpen_RC = sharpen.rc.o
 smooth_palette_RC = smooth-palette.rc.o
 softglow_RC = softglow.rc.o
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 233b1ae..a3356a3 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -82,7 +82,6 @@
     'qbist' => { ui => 1 },
     'ripple' => { ui => 1 },
     'sample-colorize' => { ui => 1 },
-    'screenshot' => { ui => 1, optional => 1, libs => 'SCREENSHOT_LIBS', cflags => 'XFIXES_CFLAGS', gegl => 
1 },
     'sharpen' => { ui => 1 },
     'smooth-palette' => { ui => 1 },
     'softglow' => { ui => 1 },
diff --git a/plug-ins/screenshot/.gitignore b/plug-ins/screenshot/.gitignore
new file mode 100644
index 0000000..9d553d1
--- /dev/null
+++ b/plug-ins/screenshot/.gitignore
@@ -0,0 +1,6 @@
+/Makefile.in
+/Makefile
+/screenshot
+/screenshot.exe
+/.libs
+/.deps
diff --git a/plug-ins/screenshot/Makefile.am b/plug-ins/screenshot/Makefile.am
new file mode 100644
index 0000000..301c131
--- /dev/null
+++ b/plug-ins/screenshot/Makefile.am
@@ -0,0 +1,51 @@
+## Process this file with automake to produce Makefile.in
+
+libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+
+if OS_WIN32
+mwindows = -mwindows
+endif
+
+if HAVE_WINDRES
+include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
+screenshot_RC = screenshot.rc.o
+endif
+
+AM_LDFLAGS = $(mwindows)
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)         \
+       $(GTK_CFLAGS)           \
+       $(GEGL_CFLAGS)          \
+       $(XFIXES_CFLAGS)        \
+       -I$(includedir)
+
+LDADD = \
+       $(libgimpui)            \
+       $(libgimpwidgets)       \
+       $(libgimpconfig)        \
+       $(libgimp)              \
+       $(libgimpcolor)         \
+       $(libgimpmath)          \
+       $(libgimpbase)          \
+       $(GTK_LIBS)             \
+       $(GEGL_LIBS)            \
+       $(SCREENSHOT_LIBS)      \
+       $(RT_LIBS)              \
+       $(INTLLIBS)             \
+       $(screenshot_RC)
+
+libexecdir = $(gimpplugindir)/plug-ins
+
+libexec_PROGRAMS = screenshot
+
+EXTRA_PROGRAMS = screenshot
+
+screenshot_SOURCES = \
+       screenshot.c
diff --git a/plug-ins/common/screenshot.c b/plug-ins/screenshot/screenshot.c
similarity index 100%
rename from plug-ins/common/screenshot.c
rename to plug-ins/screenshot/screenshot.c