Accepting request 562264 from home:mrdocs:branches:graphics

- Don't build with webkit1, as it is no longer maintained and has
  plenty of security bugs.  This disables the GIMP's built-in help
  browser; it will use an external browser when configured this way.
  This works around a number of security vulnerabilities in Webkit1:
  https://bugzilla.suse.com/show_bug.cgi?id=923223
  https://bugzilla.suse.com/show_bug.cgi?id=906375
  https://bugzilla.suse.com/show_bug.cgi?id=906374
  https://bugzilla.suse.com/show_bug.cgi?id=906373
  https://bugzilla.suse.com/show_bug.cgi?id=1034856
  https://bugzilla.suse.com/show_bug.cgi?id=871792
  https://bugzilla.suse.com/show_bug.cgi?id=879607
  https://bugzilla.suse.com/show_bug.cgi?id=892084

OBS-URL: https://build.opensuse.org/request/show/562264
OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=19

gimp.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sat Jan  6 04:13:05 UTC 2018 - plinnell@opensuse.org
+
+- Don't build with webkit1, as it is no longer maintained and has
+  plenty of security bugs.  This disables the GIMP's built-in help
+  browser; it will use an external browser when configured this way.
+
+  This works around a number of security vulnerabilities in Webkit1:
+
+  https://bugzilla.suse.com/show_bug.cgi?id=923223
+  https://bugzilla.suse.com/show_bug.cgi?id=906375
+  https://bugzilla.suse.com/show_bug.cgi?id=906374
+  https://bugzilla.suse.com/show_bug.cgi?id=906373
+  https://bugzilla.suse.com/show_bug.cgi?id=1034856
+  https://bugzilla.suse.com/show_bug.cgi?id=871792
+  https://bugzilla.suse.com/show_bug.cgi?id=879607
+  https://bugzilla.suse.com/show_bug.cgi?id=892084
+
 -------------------------------------------------------------------
 Wed May 31 04:59:00 UTC 2017 - plinnell@opensuse.org
 

gimp.spec

@@ -47,9 +47,6 @@ BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 BuildRequires:  libtiff-devel
-%if 0%{?suse_version} < 1330
-BuildRequires:  libwebkit-devel >= 1.6.1
-%endif
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  pkgconfig
 BuildRequires:  python-gtk-devel >= 2.10.4
@@ -81,12 +78,7 @@ BuildRequires:  pkgconfig(zlib)
 # Explicitly declare the libgimp versions for upgrade purposes
 Requires:       libgimp-2_0-0 = %{version}
 Requires:       libgimpui-2_0-0 = %{version}
-%if 0%{?suse_version} < 1330
-Recommends:     %{name}-help-browser
-%else
-# Obsolete gimp-help browser for versions newer than 1330
 Obsoletes:      %{name}-help-browser
-%endif
 Recommends:     %{name}-lang
 Recommends:     %{name}-plugins-python = %{version}
 Recommends:     iso-codes
@@ -235,6 +227,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 	--disable-static\
 %if 0%{?suse_version} >= 1330
 	--without-webkit\
+    --with-lcms=lcms2\
 %endif
 	--libexecdir=%{_prefix}/lib\
 	--enable-default-binary\
@@ -293,9 +286,7 @@ install -m 644 -c macros.gimp \
 %files -f plugins.list
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog LICENSE NEWS* README
-%if 0%{?suse_version} < 1330
 %exclude %{_libdir}/gimp/2.0/plug-ins/help-browser
-%endif
 %{_bindir}/gimp
 %{_bindir}/gimp-2.?
 %{_bindir}/gimp-console
@@ -358,12 +349,6 @@ install -m 644 -c macros.gimp \
 %{_libdir}/libgimpui-2.0.so.*
 %{_libdir}/libgimpwidgets-2.0.so.*
 
-%if 0%{?suse_version} < 1330
-%files help-browser
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog LICENSE NEWS* README
-%{_libdir}/gimp/2.0/plug-ins/help-browser
-%endif
 
 %files plugins-python -f plugins-python.list
 %defattr(-,root,root)