Accepting request 621364 from graphics

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

gimp-2.10.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1cb0baaecdefe44d371a15f2739a1bcbce4682336b4ccf8eb7b587ce52c333eb
-size 30863771

gimp-2.10.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffb0768de14a2631b3d7ed71f283731441a1b48461766c23f0574dce0706f192
+size 31064613

gimp.changes

@@ -1,3 +1,104 @@
+-------------------------------------------------------------------
+Fri Jul  6 17:47:11 UTC 2018 - ecsos@opensuse.org
+
+- fix build error for Leap 42.3
+- add missing requires
+
+-------------------------------------------------------------------
+Fri Jul  6 01:20:19 UTC 2018 - mrueckert@suse.de
+
+- bump versions in BR according to the configure.ac
+- move library requires in libgimp to %requires_ge and also force
+  the libgegl update
+
+-------------------------------------------------------------------
+Thu Jul  5 16:47:10 UTC 2018 - mrueckert@suse.de
+
+- update to 2.10.4 bug fix release
+  Core:
+  - Remove gimp_display_shell_draw_background() and all clipping
+    hacks for drawing the canvas background. This optimizes away
+    one entire step of drawing of image size, for each expose.
+  - Font loading does not block startup anymore. Only consequence
+    is that the Text tool may not be usable immediately if fonts
+    are not fully loaded yet (and will output an appropriate error
+    if you do so). All non-text related activities can be performed
+      right away.
+  - Change of the URL from bugzilla to gitlab where appropriate.
+  - New tool option manager to better keep track of user context
+    and paint options in a consistent manner.
+  User Interface:
+  - The Dashboard dockable dialog now has a 'Memory' group that
+    shows memory-usage information: the currently used memory size,
+    the available physical memory size, and the total physical
+    memory size.  It can also show the tile-cache size, for
+    comparison against the other memory stats. Note that the
+    upper-bound of the meter is the physical memory size, so the
+    memory usage may be over 100% when GIMP uses the swap.
+  - The Dashboard dockable dialog now has "read" and "written"
+    fields in the dashboard swap group, which report the total
+    amount of data read-from/written-to the tile swap, respetively.
+    Additionally, the swap busy indicator (used as the meter's LED)
+    has been improved, so that it's active whenever data has been
+    read-from/written-to the swap during the last sampling
+    interval, rather than at the point of sampling.
+  - Fonts can now be tagged. The user interface is the same as for
+    brushes, patterns etc.
+  - Some icons fixed: larger spacing between broken chains and
+    gimp-tool-ellipse-select made symmetrical.
+  Usability:
+  - When a plug-in cannot be applied to an image because of
+    mismatch in image types (e.g. layer has no alpha or image is
+    greyscale), GIMP now displays a message listing supported image
+    types for this plug-in.
+  Tools:
+  - The Measurement tool now has an "Auto straighten" option
+    allowing to rotate the active drawable (layer, channel…) so
+    that the measurement line is used as horizon. As other
+    transform tools, the feature will work on linked drawables as
+    well.
+  - The Smudge tool now paints correctly on images with a color
+    profile other than the GIMP's built-in one.
+  Build:
+  - Installer: set compatibility options to run Python plugins in
+    HiDPI-aware mode.
+  - Put back compatibility DLLs for really old plugins.
+  - Install binary tool `gimp-test-clipboard` on the system to
+    allow people to help us debug clipboard bugs.
+  - --enable-bundled-mypaint-brushes renamed
+    --enable-relocatable-bundle and also make WMF fonts looked up
+    on the runtime prefix of GIMP (instead of the build-time path)
+    when this build option was set.
+  Plug-ins:
+  - gimptool-2.0 binary now accepts source files with non-standard
+    extensions if it can try to guess appropriate language from the
+    compiler being used. It will also properly quote arguments for
+    shell usage.
+  - Run explicitly Python 2 as Python plug-in interpreter to
+    prevent breakage on systems where Python 3 is the default.
+  - raw_input()'s argument in Python console is now optional, and
+    input() support has been added.
+  File Formats:
+  - The PSD loader now provides an option to load "merged",
+    pre-composited version of the images that becomes available
+    when a PSD file was saved with "Maximize Compatibility" option
+    enabled in Photoshop. This is useful when loading PSD files
+    that use features that GIMP doesn't currently support, and
+    therefore can't render correctly, such as adjustment layers.
+    When loading the merged image version, we avoid loading certain
+    additional data from the file, such as channels, paths, and
+    guides, while still loading metadata. This option is currently
+    exposed as an additional file type ("Photoshop image
+    (merged)"), which has to be explicitly selected from the
+    file-type list when opening the image.
+  - Embedding GIMP's built-in sRGB color profile to exported files
+    is now optional. The default choice can be set in the
+    Preferences dialog.
+  Translations:
+  - Updated translations: Catalan, Czech, Danish, Dutch, Finnish,
+    Greek, Hungarian, Italian, Latvian, Polish, Romanian, Russian,
+    Spanish, Swedish, Ukrainian.
+
 -------------------------------------------------------------------
 Mon May 21 00:30:50 UTC 2018 - plinnell@opensuse.org
 

gimp.spec

@@ -19,7 +19,7 @@
 %global abiver 4
 %global apiver 2.0
 Name:           gimp
-Version:        2.10.2
+Version:        2.10.4
 Release:        0
 Summary:        The GNU Image Manipulation Program
 License:        GPL-3.0-or-later
@@ -34,8 +34,13 @@ Source99:       baselibs.conf
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel >= 1.0.0
 BuildRequires:  fdupes
-BuildRequires:  fontconfig-devel >= 2.2.0
+BuildRequires:  fontconfig-devel >= 2.12.4
+%if 0%{?suse_version} < 1500
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  gdk-pixbuf-loader-rsvg
 # For some odd reason build needs gegl executable.
 BuildRequires:  gegl
@@ -50,7 +55,7 @@ BuildRequires:  libbz2-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
-BuildRequires:  librsvg-devel >= 2.36.0
+BuildRequires:  librsvg-devel >= 2.40.6
 BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  libxslt-tools
@@ -59,33 +64,38 @@ BuildRequires:  python-gtk-devel >= 2.10.4
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(atk) >= 2.2.0
-BuildRequires:  pkgconfig(babl) >= 0.1.46
+BuildRequires:  pkgconfig(babl) >= 0.1.52
 BuildRequires:  pkgconfig(cairo) >= 1.12.2
 BuildRequires:  pkgconfig(cairo-pdf) >= 1.12.2
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.70
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.30.8
-BuildRequires:  pkgconfig(gegl-0.4) >= 0.4.0
+BuildRequires:  pkgconfig(gegl-0.4) >= 0.4.4
 BuildRequires:  pkgconfig(gexiv2) >= 0.10.6
 BuildRequires:  pkgconfig(glib-2.0) >= 2.54.2
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
 BuildRequires:  pkgconfig(gudev-1.0) >= 167
 BuildRequires:  pkgconfig(lcms2) >= 2.8
 BuildRequires:  pkgconfig(libexif) >= 0.6.15
+# TODO: BuildRequires:  pkgconfig(libheif) >= 1.1.0
 BuildRequires:  pkgconfig(liblzma) >= 5.0.0
 BuildRequires:  pkgconfig(libmypaint) >= 1.3.0
-BuildRequires:  pkgconfig(libopenjp2)
+BuildRequires:  pkgconfig(libopenjp2) >= 2.1.0
 BuildRequires:  pkgconfig(libpng) >= 1.6.25
 BuildRequires:  pkgconfig(libwebp) >= 0.6.0
 BuildRequires:  pkgconfig(mypaint-brushes-1.0)
-BuildRequires:  pkgconfig(OpenEXR)
+BuildRequires:  pkgconfig(OpenEXR) >= 1.6.1
 BuildRequires:  pkgconfig(pango) >= 1.29.4
 BuildRequires:  pkgconfig(poppler-data) >= 0.4.7
-BuildRequires:  pkgconfig(poppler-glib) >= 0.12.4
+BuildRequires:  pkgconfig(poppler-glib) >= 0.44.0
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  xdg-utils
+# obs does not automaticaly add this
+Requires:       libglib-2_0-0 >= 2.54.2
+Requires:       libgexiv2-2 >= 0.10.6
+Requires:       libbabl-0_1-0 >= 0.1.46
 # Explicitly declare the libgimp versions for upgrade purposes
 Requires:       libgimp-2_0-0 = %{version}
 Requires:       libgimpui-2_0-0 = %{version}
@@ -112,7 +122,8 @@ of the included scripts rely on fonts that we cannot distribute.
 %package -n libgimp-2_0-0
 Summary:        The GNU Image Manipulation Program - Libraries
 Group:          System/Libraries
-Requires:       libbabl-0_1-0 >= 0.1.46
+%requires_ge    libbabl-0_1-0
+%requires_ge    libgegl-0_4-0
 
 %description -n libgimp-2_0-0
 The GIMP is an image composition and editing program. GIMP offers
@@ -183,7 +194,6 @@ applications that want to make use of the GIMP libraries.
 %prep
 %setup -q
 
-
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 translation-update-upstream
@@ -208,6 +218,10 @@ if test "x${vapi}" != "x%{apiver}"; then
 fi
 
 %build
+%if 0%{?suse_version} < 1500
+test -x "$(type -p %{_bindir}/gcc-7)" && export CC="%{_bindir}/gcc-7"
+test -x "$(type -p %{_bindir}/g++-7)" && export CXX="%{_bindir}/g++-7"
+%endif
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -279,6 +293,8 @@ install -m 644 -c macros.gimp \
 %{_bindir}/gimp-2.*
 %{_bindir}/gimp-console
 %{_bindir}/gimp-console-2.*
+# should this maybe be in _libexecdir too?
+%{_bindir}/gimp-test-clipboard-2.0
 %{_libexecdir}/gimp-debug-tool-2.0
 %dir %{_datadir}/metainfo
 %{_datadir}/metainfo/gimp-data-extras.metainfo.xml