Accepting request 455390 from graphics

1

OBS-URL: https://build.opensuse.org/request/show/455390
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=96
This commit is contained in:
Dominique Leuenberger 2017-02-08 09:53:38 +00:00 committed by Git OBS Bridge
commit e1aa36f7a3
4 changed files with 170 additions and 109 deletions

View File

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

3
gimp-2.8.20.tar.bz2 Normal file
View File

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

View File

@ -1,10 +1,96 @@
-------------------------------------------------------------------
Wed Feb 8 00:51:20 UTC 2017 - jengelh@inai.de
- Remove --with-pic, this is only for static libs.
- Trim description on non-main subpackages.
-------------------------------------------------------------------
Fri Feb 3 21:15:06 UTC 2017 - plinnell@opensuse.org
- update to 2.8.20
- Core:
- Avoid D-Bus error message when built without D-Bus support
- fix OS X min required conditional in gimpimagewindow.c
- Saving to existing .xcf.bz and .xcf.gz files didn't truncate them
and could lead to unnecessarily large files
- Text layer created by gimp-text-fontname doesn't respect border
when resized
- avoid seeking when saving XCF files to prevent corruption with
file network shares (fixed since 2014, but not mentioned in NEWS yet)
GUI:
- Flow on Paint Dynamics editor dialog: the 'y' axis is indicating
'Rate' instead 'Flow'
- Vertical ruler shows artifacts if the status bar isn't showing
- Tablet stylus misbehaves when crossing the edge of a dock in
multi-window-mode
- Disable the new "automatic window tabbing" feature introduced on macOS
Sierra
- Improve the visiblity of slider handles with dark themes
- Make it harder to switch to renaming if selecting already selected
items in resource lists
Tools:
- make toggling to color picker mode of paint tools more robust
Libgimp:
- call gimp_file_entry_set_filename() with filename encoding
Plug-ins:
- Prevent the Python console from closing by the Escape key
- Help browser does not launch on OS X
- Filter 'Edge Detect/Difference of Gaussians' returns empty image
- only use -xobjective-c for compile commands
- mkgen.pl: fix calls to write_file() routine to write to current
directory
- When printing, the images are composed onto a white background to
prevent printing a black box instead of a transaprent image
- Fix color visison deficiency display filters to apply gamma
correction directly
Updated Translations:
- Catalan - Czech - Danish - Finnish - French - German
- Greek - Hungarian - Icelandic - Italian - Polish
- Portuguese - Slovak - Slovenian - Scottish Gaelic
- Spanish - Swedish
General:
- Bug fixes
-------------------------------------------------------------------
Sun Jan 15 15:44:05 UTC 2017 - zaitor@opensuse.org
- Replace -devel BuildRequires for their pkgconfig version aligned
with what configure looks for:
- babl-devel for pkgconfig(babl).
- gegl-devel for pkgconfig(gegl-0.2).
- libpng-devel for pkgconfig(libpng).
- libpoppler-glib-devel for pkgconfig(poppler-glib).
- xorg-x11-libXfixes-devel for pkgconfig(xfixes).
- xorg-x11-libXpm-devel for pkgconfig(xpm).
- zlib-devel for pkgconfig(zlib).
- Add an explicit pkgconfig(cairo-pdf) BuildRequires: configure
checks for it (full pdf support).
- Run spec-cleaner: drop obsolete clean, modernise macros.
- No longer depend on libwebkit-devel for Tumbleweed and pass
--disable-webkit to configure for Tumbleweed.
-------------------------------------------------------------------
Sun Jul 31 04:04:52 UTC 2016 - plinnell@opensuse.org
- update to 2.8.18
- Drop gimp-Multiple-Use-After-Free.patch - upstreamed
+Core:
- Initialize fontconfig cache in separate thread to keep GUI
+Core: - Initialize fontconfig cache in separate thread to keep GUI
responsive on first startup
- Properly recognize layer masks as deactivated, e.g. for moving layers
- Create $XDG_DATA_HOME if it doesn't exist

183
gimp.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gimp
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%global apiver 2.0
Name: gimp
Version: 2.8.18
Version: 2.8.20
Release: 0
Summary: The GNU Image Manipulation Program
License: GPL-3.0+
@ -33,10 +33,8 @@ Source2: openSUSE.gpl
Source99: baselibs.conf
BuildRequires: aalib-devel
BuildRequires: alsa-devel >= 1.0.0
BuildRequires: babl-devel >= 0.1.10
BuildRequires: fdupes
BuildRequires: fontconfig-devel >= 2.2.0
BuildRequires: gegl-devel >= 0.2.0
BuildRequires: ghostscript-devel
# Explicitly needed, otherwise ghostscript-mini is used during the
# build, and it's not enough for gimp.
@ -47,48 +45,47 @@ BuildRequires: libbz2-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
BuildRequires: libpng-devel >= 1.2.37
BuildRequires: libpoppler-glib-devel >= 0.12.4
BuildRequires: pkgconfig(cairo) >= 1.10.2
BuildRequires: pkgconfig(dbus-glib-1) >= 0.70
BuildRequires: pkgconfig(glib-2.0) >= 2.30.2
BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10
BuildRequires: pkgconfig(lcms2) >= 2.2
BuildRequires: pkgconfig(libexif) >= 0.6.15
%if 0%{?suse_version} < 1220
# best-effort attempt to use librsvg (file-svg plugin will be built
# if recent-enough version of librsvg is there)
BuildRequires: librsvg-devel
%else
BuildRequires: librsvg-devel >= 2.36.0
%endif
BuildRequires: libtiff-devel
%if 0%{?suse_version} < 1330
BuildRequires: libwebkit-devel >= 1.6.1
BuildRequires: libwmf-devel >= 0.2.8
%if 0%{?suse_version} < 1220
BuildRequires: libxslt-devel
%else
BuildRequires: libxslt-tools
%endif
BuildRequires: libwmf-devel >= 0.2.8
BuildRequires: pkgconfig
BuildRequires: python-gtk-devel >= 2.10.4
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXfixes-devel
BuildRequires: xorg-x11-libXpm-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(atk) >= 2.2.0
BuildRequires: pkgconfig(babl) >= 0.1.10
BuildRequires: pkgconfig(cairo) >= 1.10.2
BuildRequires: pkgconfig(cairo-pdf) >= 1.10.2
BuildRequires: pkgconfig(dbus-glib-1) >= 0.70
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.1
BuildRequires: pkgconfig(gegl-0.2) >= 0.2.0
BuildRequires: pkgconfig(glib-2.0) >= 2.30.2
BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10
BuildRequires: pkgconfig(gudev-1.0) >= 167
BuildRequires: pkgconfig(lcms2) >= 2.2
BuildRequires: pkgconfig(libexif) >= 0.6.15
BuildRequires: pkgconfig(libpng) >= 1.2.37
BuildRequires: pkgconfig(pango) >= 1.29.4
BuildRequires: pkgconfig(poppler-glib) >= 0.12.4
BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xpm)
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
%endif
Recommends: %{name}-lang
Recommends: %{name}-plugins-python = %{version}
Recommends: iso-codes
# With openSUSE 13.1, we started shipping gimp unbranded
Obsoletes: %{name}-branding
Suggests: AdobeICCProfiles
Suggests: gimp-2.0-scanner-plugin
# With openSUSE 13.1, we started shipping gimp unbranded
Obsoletes: %{name}-branding
Provides: gimp-2.0 = %{version}
Provides: gimp(abi) = %{abiver}
Provides: gimp(api) = %{apiver}
@ -96,37 +93,36 @@ Obsoletes: gimp-unstable < 2.6.0
# Obsolete hal subpackage which we had until 11.4.
Obsoletes: %{name}-module-hal < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Explicitly declare the libgimp versions for upgrade purposes
Requires: libgimp-2_0-0 = %{version}
Requires: libgimpui-2_0-0 = %{version}
%if 0%{?suse_version} < 1220
# best-effort attempt to use librsvg (file-svg plugin will be built
# if recent-enough version of librsvg is there)
BuildRequires: librsvg-devel
%else
BuildRequires: librsvg-devel >= 2.36.0
%endif
%if 0%{?suse_version} < 1220
BuildRequires: libxslt-devel
%else
BuildRequires: libxslt-tools
%endif
%description
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
creating logos and other graphics for Web pages. The GIMP offers many
of the tools and filters you would expect to find in similar commercial
offerings and contains some interesting extras as well. The GIMP
provides a large image manipulation toolbox, including channel
operations and layers, effects, subpixel imaging and antialiasing, and
conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
The GIMP is an image composition and editing program, which can be
used for creating logos and other graphics for Web pages. The GIMP
offers many tools and filters, and provides a large image
manipulation toolbox, including channel operations and layers,
effects, subpixel imaging and antialiasing, and conversions, together
with multilevel undo. The GIMP offers a scripting facility, but many
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
%description -n libgimp-2_0-0
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
creating logos and other graphics for Web pages. The GIMP offers many
of the tools and filters you would expect to find in similar commercial
offerings and contains some interesting extras as well. The GIMP
provides a large image manipulation toolbox, including channel
operations and layers, effects, subpixel imaging and antialiasing, and
conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
The GIMP is an image composition and editing program. GIMP offers
many tools and filters, and provides a large image manipulation
toolbox and scripting.
This package provides GIMP libraries.
@ -135,16 +131,9 @@ Summary: The GNU Image Manipulation Program - UI Libraries
Group: System/Libraries
%description -n libgimpui-2_0-0
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
creating logos and other graphics for Web pages. The GIMP offers many
of the tools and filters you would expect to find in similar commercial
offerings and contains some interesting extras as well. The GIMP
provides a large image manipulation toolbox, including channel
operations and layers, effects, subpixel imaging and antialiasing, and
conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
The GIMP is an image composition and editing program. GIMP offers
many tools and filters, and provides a large image manipulation
toolbox and scripting.
This package provides GIMP UI libraries.
@ -161,16 +150,9 @@ Provides: %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version}
%py_requires
%description plugins-python
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
creating logos and other graphics for Web pages. The GIMP offers many
of the tools and filters you would expect to find in similar commercial
offerings and contains some interesting extras as well. The GIMP
provides a large image manipulation toolbox, including channel
operations and layers, effects, subpixel imaging and antialiasing, and
conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
The GIMP is an image composition and editing program. GIMP offers
many tools and filters, and provides a large image manipulation
toolbox and scripting.
%package plugin-aa
Summary: The GNU Image Manipulation Program -- ASCII-Art output plugin
@ -180,20 +162,13 @@ Requires: %{name} = %{version}
Supplements: packageand(%{name}:libaa1)
%description plugin-aa
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
creating logos and other graphics for Web pages. The GIMP offers many
of the tools and filters you would expect to find in similar commercial
offerings and contains some interesting extras as well. The GIMP
provides a large image manipulation toolbox, including channel
operations and layers, effects, subpixel imaging and antialiasing, and
conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
The GIMP is an image composition and editing program. GIMP offers
many tools and filters, and provides a large image manipulation
toolbox and scripting.
%package devel
Summary: The GNU Image Manipulation Program
Group: Development/Libraries
Group: Development/Libraries/Other
Requires: libgimp-2_0-0 = %{version}
Requires: libgimpui-2_0-0 = %{version}
Provides: gimp-2.0-devel = %{version}
@ -202,17 +177,14 @@ Obsoletes: gimp-doc < 2.6.4
Obsoletes: gimp-unstable-devel < 2.6.0
%description devel
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
creating logos and other graphics for Web pages. The GIMP offers many
of the tools and filters you would expect to find in similar commercial
offerings and contains some interesting extras as well. The GIMP
provides a large image manipulation toolbox, including channel
operations and layers, effects, subpixel imaging and antialiasing, and
conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
The GIMP is an image composition and editing program. GIMP offers
many tools and filters, and provides a large image manipulation
toolbox and scripting.
This subpackage contains libraries and header files for developing
applications that want to make use of the GIMP libraries.
%if 0%{?suse_version} < 1330
%package help-browser
Summary: The GNU Image Manipulation Program - Help Browser
Group: Productivity/Graphics/Bitmap Editors
@ -220,9 +192,11 @@ Requires: %{name} = %{version}
Supplements: packageand(%{name}:gimp-help)
%description help-browser
This package contains the help browser for the GIMP. This package is optional.
This package contains the help browser for the GIMP.
%endif
%lang_package
%prep
%setup -q
translation-update-upstream
@ -248,11 +222,15 @@ fi
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
%configure --with-pic\
%configure \
--disable-static\
%if 0%{?suse_version} >= 1330
--without-webkit\
%endif
--libexecdir=%{_prefix}/lib\
--enable-default-binary\
--enable-mp
make %{?_smp_mflags}
%install
@ -275,7 +253,7 @@ for PLUGIN in %{buildroot}%{_libdir}/gimp/2.0/plug-ins/* ; do
echo "${PLUGIN#%{buildroot}}" >>plugins.list
fi
done
rm %{buildroot}%{_libdir}/*.la
find %{buildroot} -type f -name "*.la" -delete -print
# Install the macros file:
install -d %{buildroot}%{_sysconfdir}/rpm
sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \
@ -287,34 +265,28 @@ install -m 644 -c macros.gimp \
%fdupes %{buildroot}%{_datadir}/gimp/2.0/
%if 0%{?suse_version} > 1130
%post
%desktop_database_post
%icon_theme_cache_post
%endif
%if 0%{?suse_version} > 1130
%postun
%desktop_database_postun
%icon_theme_cache_postun
%endif
%post -n libgimp-2_0-0 -p /sbin/ldconfig
%postun -n libgimp-2_0-0 -p /sbin/ldconfig
%post -n libgimpui-2_0-0 -p /sbin/ldconfig
%postun -n libgimpui-2_0-0 -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%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
@ -377,10 +349,12 @@ rm -rf %{buildroot}
%{_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)
@ -390,6 +364,7 @@ rm -rf %{buildroot}
# FIXME: Maybe split gimp-lang and gimp-plugins-python-lang
%files lang -f gimp20.lang
%defattr(-,root,root)
%files devel
%defattr(-,root,root)