From 4086b8a5827636a24a873fd181e3d114db2191e0 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 4 Aug 2011 12:15:02 +0200
Subject: [PATCH] fix goption warning on startup, patch by Mikael Magnusson

---
 gimp-2.6.11-startup-warning.patch | 38 +++++++++++++++++++++++++++++++
 gimp.spec                         |  7 +++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 gimp-2.6.11-startup-warning.patch

diff --git a/gimp-2.6.11-startup-warning.patch b/gimp-2.6.11-startup-warning.patch
new file mode 100644
index 0000000..253f5ae
--- /dev/null
+++ b/gimp-2.6.11-startup-warning.patch
@@ -0,0 +1,38 @@
+From 7c21fa97815ac19c77a01db82c2e30834155c1b6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Thu, 4 Aug 2011 12:10:04 +0200
+Subject: [PATCH] patch: startup-warning
+
+Squashed commit of the following:
+
+commit 083d5fc4211421f900a2ee3ba9967be4ef9bb5eb
+Author: Mikael Magnusson <mikachu@src.gnome.org>
+Date:   Wed Mar 9 15:35:52 2011 +0100
+
+    app: fix goption warning
+
+    Using G_OPTION_FLAG_NO_ARG with G_OPTION_ARG_NONE is not a valid combination,
+    glib 2.28.2 warns about it.
+
+    (gimp:20379): GLib-WARNING **: goption.c:2132: ignoring no-arg, optional-arg or filename flags (8) on option "debug-handlers" of type 0
+    (cherry picked from commit b81276ca83e6ec4c7df32c8f611f441d1dfc59ad)
+---
+ app/main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/app/main.c b/app/main.c
+index e1d5f02..34c9f74 100644
+--- a/app/main.c
++++ b/app/main.c
+@@ -240,7 +240,7 @@ static const GOptionEntry main_entries[] =
+     N_("Debug in case of a crash (never|query|always)"), "<mode>"
+   },
+   {
+-    "debug-handlers", 0, G_OPTION_FLAG_NO_ARG,
++    "debug-handlers", 0, 0,
+     G_OPTION_ARG_NONE, &use_debug_handler,
+     N_("Enable non-fatal debugging signal handlers"), NULL
+   },
+-- 
+1.7.6
+
diff --git a/gimp.spec b/gimp.spec
index c4a42d1..8b26c41 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -36,7 +36,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.11
-Release:        19%{?dist}
+Release:        20%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -151,6 +151,8 @@ Patch9:         gimp-2.6.11-CVE-2010-4540,4541,4542.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=652280
 # guard against crash due to quitting while DND is processed, upstreamed
 Patch10:        gimp-2.6.11-shell-dnd-quit-crash.patch
+# backport: fix goption warning on startup
+Patch11:        gimp-2.6.11-startup-warning.patch
 # files changed by autoreconf after applying the above
 Patch100:       gimp-2.6.11-11-autoreconf.patch.bz2
 
@@ -509,6 +511,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Thu Aug 04 2011 Nils Philippsen <nils@redhat.com> - 2:2.6.11-20
+- fix goption warning on startup, patch by Mikael Magnusson
+
 * Wed Aug 03 2011 Nils Philippsen <nils@redhat.com> - 2:2.6.11-19
 - remove obsolete gtkhtml2-devel build requirement