Accepting request 124030 from GNOME:Apps

Fix build against gimp 2.8 (forwarded request 123946 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/124030
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-gap?expand=0&rev=20

gimp-gap-gimp28.patch

@@ -0,0 +1,26 @@
+Index: gimp-gap-2.6.0/libgapbase/gap_base.c
+===================================================================
+--- gimp-gap-2.6.0.orig/libgapbase/gap_base.c
++++ gimp-gap-2.6.0/libgapbase/gap_base.c
+@@ -51,7 +51,7 @@
+ #include "gtk/gtk.h"
+ #include "libgimp/gimp.h"
+ #include <libgimpwidgets/gimpwidgetstypes.h>
+-#include <libgimpwidgets/gimphelpui.h>
++#include <libgimpwidgets/gimpwidgets.h>
+ 
+ #ifdef G_OS_WIN32
+ #include <io.h>
+Index: gimp-gap-2.6.0/libgapvidapi/gap_vid_api_util.c
+===================================================================
+--- gimp-gap-2.6.0.orig/libgapvidapi/gap_vid_api_util.c
++++ gimp-gap-2.6.0/libgapvidapi/gap_vid_api_util.c
+@@ -7,7 +7,7 @@
+  */
+ 
+ #include <glib/gstdio.h>
+-#include <libgimpmath/gimpmd5.h>
++#include <libgimpmath/gimpmath.h>
+ 
+ 
+ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX END fcache procedures */

gimp-gap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  6 18:48:30 UTC 2012 - dimstar@opensuse.org
+
+- Add gimp-gap-gimp28.patch: Fix build with gimp 2.8.
+
 -------------------------------------------------------------------
 Fri Dec  2 06:32:06 UTC 2011 - coolo@suse.com
 

gimp-gap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gimp-gap
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -57,6 +57,8 @@ Patch2:         %{name}-warnings.patch
 Patch3:         %{name}-warnings-orig-addon.patch
 # PATCH-FIX-UPSTREAM gimp-gap-link-lm.patch bgo#660443 idoenmez@suse.de -- Link to -lm where needed
 Patch4:         %{name}-link-lm.patch
+# PATCH-FIX-UPSTREAM gimp-gap-gimp28.patch dimstar@opensuse.org -- Fix build with gimp 2.8. Patch not upstreamed, as there are a bunch of commits addressing the same.
+Patch5:         gimp-gap-gimp28.patch
 Source1:        %{name}-patch-source.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{?gimp_api_version:1}0
@@ -76,6 +78,7 @@ sequences of single frames.
 
 %package orig
 Summary:        GIMP Animation Package
+Group:          Productivity/Multimedia/Video/Editors and Convertors
 Provides:       %{name} = %{version}-%{release}
 Obsoletes:      %{name} < %{version}-%{release}
 
@@ -103,6 +106,7 @@ translation-update-upstream
 %patch3
 %endif
 %patch4
+%patch5 -p1
 sed -i -e "s,sr@Latn,sr@latin," po/LINGUAS
 mv po/sr@Latn.po po/sr@latin.po