diff --git a/.gitignore b/.gitignore index e0f978f..ed613ac 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2 /gimp-2.10.28.tar.bz2 /gimp-2.10.30.tar.bz2 /gimp-2.10.32.tar.bz2 +/gimp-2.10.34.tar.bz2 diff --git a/gimp-2.10.0-cm-system-monitor-profile-by-default.patch b/gimp-2.10.0-cm-system-monitor-profile-by-default.patch index 35493af..96a875d 100644 --- a/gimp-2.10.0-cm-system-monitor-profile-by-default.patch +++ b/gimp-2.10.0-cm-system-monitor-profile-by-default.patch @@ -1,6 +1,7 @@ -diff -up gimp-2.10.14/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2.10.14/etc/gimprc.in ---- gimp-2.10.14/etc/gimprc.in.cm-system-monitor-profile-by-default 2019-10-26 21:46:48.000000000 +0200 -+++ gimp-2.10.14/etc/gimprc.in 2019-11-04 13:17:23.322750636 +0100 +diff --git a/etc/gimprc.in b/etc/gimprc.in +index bdf8f0c..e6757e8 100644 +--- a/etc/gimprc.in ++++ b/etc/gimprc.in @@ -317,9 +317,9 @@ # Defines the color management behavior. This is a parameter list. @@ -13,10 +14,12 @@ diff -up gimp-2.10.14/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2. # (display-rendering-intent relative-colorimetric) # (display-use-black-point-compensation yes) # (display-optimize yes) -@@ -328,7 +328,8 @@ +@@ -328,9 +328,8 @@ # (simulation-optimize yes) # (simulation-gamut-check no) # (out-of-gamut-color (color-rgb 1 0 1)) +-# (show-rgb-u8 no) +-# (show-hsv no) -# (display-module "CdisplayLcms")) +# (display-module "CdisplayLcms") +) diff --git a/gimp.spec b/gimp.spec index 5a288be..f22cfb1 100644 --- a/gimp.spec +++ b/gimp.spec @@ -58,7 +58,7 @@ find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $pyth Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 -Version: 2.10.32 +Version: 2.10.34 Release: %autorelease # Compute some version related macros. @@ -101,6 +101,7 @@ BuildRequires: iso-codes-devel BuildRequires: jasper-devel BuildRequires: lcms2-devel >= 2.8 BuildRequires: libappstream-glib +BuildRequires: libheif-devel BuildRequires: libgexiv2-devel >= 0.10.6 BuildRequires: libgudev1-devel >= 167 BuildRequires: libjpeg-devel @@ -176,6 +177,9 @@ Conflicts: %{name}-help-browser < %{epoch}:%{version}-%{release} Obsoletes: %{name} < %{epoch}:%{version}-%{release} Conflicts: %{name} < %{epoch}:%{version}-%{release} +#Remove dependency on RPM Fusion repository +Obsoletes: gimp-heif-plugin < 1.1.0-13 + Source0: http://download.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2 # Try using the system monitor profile for color management by default. @@ -329,7 +333,7 @@ export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 %else --enable-default-binary=no \ %endif - --with-libmng --with-libxpm --with-alsa --with-cairo-pdf \ + --with-libmng --with-libxpm --with-alsa --with-cairo-pdf --with-libheif \ %if 0%{?flatpak} --with-icc-directory=/run/host/usr/share/color/icc/ \ %endif diff --git a/sources b/sources index fe53631..3deefe1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimp-2.10.32.tar.bz2) = aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1 +SHA512 (gimp-2.10.34.tar.bz2) = 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a