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

gimp-help-fallback-en.patch

@@ -0,0 +1,28 @@
+revision 27500
+2008-10-31  Sven Neumann  <sven@gimp.org>
+
+	Bug 558660 – help behavior for locales without manual translation
+	
+	* app/widgets/gimphelp.c (gimp_help_user_manual_is_installed):
+	as a fallback check for the english user manual.
+
+Index: app/widgets/gimphelp.c
+===================================================================
+--- app/widgets/gimphelp.c	(revision 27499)
++++ app/widgets/gimphelp.c	(revision 27500)
+@@ -171,6 +171,15 @@
+         }
+ 
+       g_free (locales);
++
++      if (! found)
++        {
++          gchar *path = g_build_filename (basedir, "en", "gimp-help.xml", NULL);
++
++          found = g_file_test (path, G_FILE_TEST_IS_REGULAR);
++
++          g_free (path);
++        }
+     }
+ 
+   g_free (basedir);

gimp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  3 15:43:04 CET 2008 - sbrabec@suse.cz
+
+- If help translation does not exist, fallback to English
+  (bgo#558660).
+
 -------------------------------------------------------------------
 Fri Oct 31 13:13:16 CET 2008 - sbrabec@suse.cz
 

gimp.spec

@@ -23,7 +23,7 @@ Name:           gimp
 BuildRequires:  aalib-devel alsa-devel cups cups-devel curl-devel dbus-1-glib-devel gegl-devel gnome-common gnutls-devel gtk-doc hal-devel intltool iso-codes-devel libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel liblcms-devel libmng-devel libpoppler-glib-devel librsvg-devel libtiff-devel libwebkit-devel libwmf-devel libwnck-devel perl-XML-Parser postfix python-devel python-gtk-devel slang-devel update-desktop-files
 Url:            http://www.gimp.org/
 Version:        2.6.2
-Release:        1
+Release:        2
 License:        GPL v2 or later
 Group:          Productivity/Graphics/Bitmap Editors
 Suggests:       AdobeICCProfiles
@@ -33,6 +33,8 @@ Requires:       %{name}-lang = %{version}
 Requires:       gtk2 >= 2.12.1
 Summary:        The GNU Image Manipulation Program
 Source:         ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gimp-help-fallback-en.patch bgo558660 - sbrabec@suse.cz If help translation does not exist, fallback to English.
+Patch:          gimp-help-fallback-en.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-branding >= 2.4
 Recommends:     %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin
@@ -1050,6 +1052,7 @@ Authors:
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22197
 # spline.c: 47
 # fit.c: 1310
+%patch
 
 %build
 #aclocal
@@ -1143,6 +1146,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Nov 03 2008 sbrabec@suse.cz
+- If help translation does not exist, fallback to English
+  (bgo#558660).
 * Fri Oct 31 2008 sbrabec@suse.cz
 - Updated to version 2.6.2:
   * scaling speed improved