From cb9c522b5cba80420a649f50d39d122ed61968e0cea83b627f446d376f91e1c7 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 5 Jul 2018 21:07:51 +0000 Subject: [PATCH 1/3] Accepting request 621184 from home:darix:branches:graphics - update to 2.10.4 bug fix release OBS-URL: https://build.opensuse.org/request/show/621184 OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=29 --- gimp-2.10.2.tar.bz2 | 3 -- gimp-2.10.4.tar.bz2 | 3 ++ gimp.changes | 88 +++++++++++++++++++++++++++++++++++++++++++++ gimp.spec | 4 ++- 4 files changed, 94 insertions(+), 4 deletions(-) delete mode 100644 gimp-2.10.2.tar.bz2 create mode 100644 gimp-2.10.4.tar.bz2 diff --git a/gimp-2.10.2.tar.bz2 b/gimp-2.10.2.tar.bz2 deleted file mode 100644 index 227a466..0000000 --- a/gimp-2.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb0baaecdefe44d371a15f2739a1bcbce4682336b4ccf8eb7b587ce52c333eb -size 30863771 diff --git a/gimp-2.10.4.tar.bz2 b/gimp-2.10.4.tar.bz2 new file mode 100644 index 0000000..78002bd --- /dev/null +++ b/gimp-2.10.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffb0768de14a2631b3d7ed71f283731441a1b48461766c23f0574dce0706f192 +size 31064613 diff --git a/gimp.changes b/gimp.changes index fa66bc6..073ce8e 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,91 @@ +------------------------------------------------------------------- +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 diff --git a/gimp.spec b/gimp.spec index 89132b5..f5d840a 100644 --- a/gimp.spec +++ b/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 @@ -279,6 +279,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 From 2b7fdb1ee925224401744fe9f880ba6b82aad09b4b68eac952e15a6d592e957a Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 6 Jul 2018 01:27:53 +0000 Subject: [PATCH 2/3] Accepting request 621228 from home:darix:branches:graphics - bump versions in BR according to the configure.ac - move library requires in libgimp to %requires_ge and also force the libgegl update OBS-URL: https://build.opensuse.org/request/show/621228 OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=30 --- gimp.changes | 7 +++++++ gimp.spec | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gimp.changes b/gimp.changes index 073ce8e..4befa18 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gimp.spec b/gimp.spec index f5d840a..6f6c732 100644 --- a/gimp.spec +++ b/gimp.spec @@ -34,7 +34,7 @@ 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 BuildRequires: gcc-c++ BuildRequires: gdk-pixbuf-loader-rsvg # For some odd reason build needs gegl executable. @@ -50,7 +50,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,28 +59,29 @@ 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) @@ -112,7 +113,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 From d2a5cfd206dd4ae1025681fdcfe7161c6b6d273a6db1b16185f876b089c6ee43 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Fri, 6 Jul 2018 19:12:04 +0000 Subject: [PATCH 3/3] Accepting request 621358 from home:ecsos - fix build error for Leap 42.3 - add missing requires OBS-URL: https://build.opensuse.org/request/show/621358 OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=31 --- gimp.changes | 6 ++++++ gimp.spec | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gimp.changes b/gimp.changes index 4befa18..5be5766 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/gimp.spec b/gimp.spec index 6f6c732..31aaa04 100644 --- a/gimp.spec +++ b/gimp.spec @@ -35,7 +35,12 @@ BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 BuildRequires: fdupes 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 @@ -87,6 +92,10 @@ 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} @@ -185,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 @@ -210,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"