diff --git a/gimp-2.10.0.tar.bz2 b/gimp-2.10.0.tar.bz2 new file mode 100644 index 0000000..ca14957 --- /dev/null +++ b/gimp-2.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2 +size 30694779 diff --git a/gimp-2.8.22.tar.bz2 b/gimp-2.8.22.tar.bz2 deleted file mode 100644 index ad53cba..0000000 --- a/gimp-2.8.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a -size 20873278 diff --git a/gimp-gegl03-buildfix.patch b/gimp-gegl03-buildfix.patch deleted file mode 100644 index 9d10040..0000000 --- a/gimp-gegl03-buildfix.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- ./app/core/gimpparamspecs-duplicate.c 2016-07-04 10:33:22.449542700 +0200 -+++ ./app/core/gimpparamspecs-duplicate.c 2016-07-04 10:34:54.505304400 +0200 -@@ -67,7 +67,7 @@ - spec->default_value, - pspec->flags); - -- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) -+ if (gegl_param_spec_get_property_key(pspec, "multiline")) - { - g_param_spec_set_qdata (new, multiline_quark, - GINT_TO_POINTER (TRUE)); - -diff --git a/app/sanity.c b/app/sanity.c -index febddfb..85fea55 100644 ---- a/app/sanity.c -+++ b/app/sanity.c -@@ -351,7 +351,7 @@ sanity_check_babl (void) - - #define BABL_REQUIRED_MAJOR 0 - #define BABL_REQUIRED_MINOR 1 --#define BABL_REQUIRED_MICRO 10 -+#define BABL_REQUIRED_MICRO 12 - - babl_get_version (&babl_major_version, - &babl_minor_version, -@@ -388,7 +388,7 @@ sanity_check_gegl (void) - gint gegl_micro_version; - - #define GEGL_REQUIRED_MAJOR 0 --#define GEGL_REQUIRED_MINOR 2 -+#define GEGL_REQUIRED_MINOR 3 - #define GEGL_REQUIRED_MICRO 0 - - gegl_get_version (&gegl_major_version, -diff --git a/configure.ac b/configure.ac -index 26812b6..4252fe9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,8 +40,8 @@ m4_define([gimp_stable], - m4_define([gimp_full_name], [GNU Image Manipulation Program]) - - # required versions of other packages --m4_define([babl_required_version], [0.1.10]) --m4_define([gegl_required_version], [0.2.0]) -+m4_define([babl_required_version], [0.1.12]) -+m4_define([gegl_required_version], [0.3.0]) - m4_define([glib_required_version], [2.30.2]) - m4_define([atk_required_version], [2.2.0]) - m4_define([gtk_required_version], [2.24.10]) -@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR) - ############################### - - PKG_CHECK_MODULES(BABL, babl >= babl_required_version) --PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version) -+PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) - PKG_CHECK_MODULES(ATK, atk >= atk_required_version) - - AM_PATH_GLIB_2_0(glib_required_version, :, - diff --git a/gimp.changes b/gimp.changes index f403671..51075da 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Apr 27 22:22:46 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 2.10.0: + + Image processing nearly fully ported to GEGL, allowing high bit + depth processing, multi-threaded and hardware accelerated pixel + processing, and more. + + Color management is a core feature now, most widgets and + preview areas are color-managed. + + Many improved tools, and several new and exciting tools, such + as the Warp transform, the Unified transform and the Handle + transform tools. + + On-canvas preview for all filters ported to GEGL. + + Improved digital painting with canvas rotation and flipping, + symmetry painting, MyPaint brush support. + + Support for several new image formats added (OpenEXR, RGBE, + WebP, HGT), as well as improved support for many existing + formats (in particular more robust PSD importing). + + Metadata viewing and editing for Exif, XMP, IPTC, and DICOM. + + Basic HiDPI support: automatic or user-selected icon size. + + New themes for GIMP (Light, Gray, Dark, and System) and new + symbolic icons meant to somewhat dim the environment and shift + the focus towards content (former theme and color icons are + still available in Preferences). + + And more, better, more, and even more awesome! +- Drop gimp-gegl03-buildfix.patch: Fixed upstream, following this + drop libtool BuildRequires and no longer pass autoreconf. +- Replace pkgconfig(gegl-0.3) with gegl-0.4) BuildRequires. +- Add gcc-c++, gegl, glib-networking, pkgconfig(gexiv2), + pkgconfig(liblzma), pkgconfig(libmypaint), + pkgconfig(mypaint-brushes-1.0) and pkgconfig(poppler-data) + BuildRequires: New dependencies. + ------------------------------------------------------------------- Thu Mar 8 01:16:27 UTC 2018 - bjorn.lie@gmail.com diff --git a/gimp.spec b/gimp.spec index 0a1bc2b..3869069 100644 --- a/gimp.spec +++ b/gimp.spec @@ -18,30 +18,30 @@ %global abiver 4 %global apiver 2.0 - Name: gimp -Version: 2.8.22 +Version: 2.10.0 Release: 0 Summary: The GNU Image Manipulation Program -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Graphics/Bitmap Editors URL: http://www.gimp.org/ -Source: http://download.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2 +Source: http://download.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar.bz2 Source1: macros.gimp # openSUSE palette file Source2: openSUSE.gpl Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gimp-gegl03-buildfix.patch bjorn.lie@gmail.com -- Port to gegl-03, patch taken from debian -Patch0: gimp-gegl03-buildfix.patch - BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 BuildRequires: fdupes BuildRequires: fontconfig-devel >= 2.2.0 +BuildRequires: gcc-c++ +# For some odd reason build needs gegl executable. +BuildRequires: gegl BuildRequires: ghostscript-devel # Explicitly needed, otherwise ghostscript-mini is used during the # build, and it's not enough for gimp. BuildRequires: ghostscript-library +BuildRequires: glib-networking BuildRequires: intltool >= 0.40.1 BuildRequires: iso-codes-devel BuildRequires: libbz2-devel @@ -50,7 +50,6 @@ BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: librsvg-devel >= 2.36.0 BuildRequires: libtiff-devel -BuildRequires: libtool BuildRequires: libwmf-devel >= 0.2.8 BuildRequires: libxslt-tools BuildRequires: pkgconfig @@ -63,22 +62,24 @@ 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.3) +BuildRequires: pkgconfig(gegl-0.4) >= 0.4.0 +BuildRequires: pkgconfig(gexiv2) >= 0.10.6 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(liblzma) >= 5.0.0 +BuildRequires: pkgconfig(libmypaint) >= 1.3.0 BuildRequires: pkgconfig(libpng) >= 1.2.37 +BuildRequires: pkgconfig(mypaint-brushes-1.0) BuildRequires: pkgconfig(pango) >= 1.29.4 +BuildRequires: pkgconfig(poppler-data) >= 0.4.7 BuildRequires: pkgconfig(poppler-glib) >= 0.12.4 BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(zlib) -#%%if 0%{?suse_version} > 1320 -#BuildRequires: pkgconfig(libmypaint) >= 1.3 -#%%endif # Explicitly declare the libgimp versions for upgrade purposes Requires: libgimp-2_0-0 = %{version} Requires: libgimpui-2_0-0 = %{version} @@ -88,7 +89,6 @@ Recommends: iso-codes Suggests: AdobeICCProfiles Suggests: gimp-2.0-scanner-plugin Obsoletes: %{name}-help-browser - Provides: gimp-2.0 = %{version} Provides: gimp(abi) = %{abiver} Provides: gimp(api) = %{apiver} @@ -174,7 +174,6 @@ applications that want to make use of the GIMP libraries. %prep %setup -q -%patch0 -p1 translation-update-upstream translation-update-upstream po-libgimp gimp20-libgimp @@ -199,7 +198,6 @@ fi %build export CFLAGS="%{optflags} -fno-strict-aliasing" -autoreconf -fiv %configure \ --disable-static\ %if 0%{?suse_version} >= 1330 @@ -257,18 +255,20 @@ install -m 644 -c macros.gimp \ %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 %files -f plugins.list -%doc AUTHORS COPYING ChangeLog LICENSE NEWS* README +%license COPYING LICENSE +%doc AUTHORS ChangeLog NEWS* README %{_bindir}/gimp -%{_bindir}/gimp-2.? +%{_bindir}/gimp-2.* %{_bindir}/gimp-console -%{_bindir}/gimp-console-2.? -%dir %{_datadir}/appdata -%{_datadir}/appdata/gimp.appdata.xml +%{_bindir}/gimp-console-2.* +%{_libexecdir}/gimp-debug-tool-2.0 +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/gimp-data-extras.metainfo.xml +%{_datadir}/metainfo/org.gimp.GIMP.appdata.xml %{_datadir}/applications/gimp.desktop %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/gimp/ @@ -284,14 +284,14 @@ install -m 644 -c macros.gimp \ %{_libdir}/gimp/2.0/modules/libdisplay-filter-color-blind.so %{_libdir}/gimp/2.0/modules/libdisplay-filter-gamma.so %{_libdir}/gimp/2.0/modules/libdisplay-filter-high-contrast.so -%{_libdir}/gimp/2.0/modules/libdisplay-filter-lcms.so -%{_libdir}/gimp/2.0/modules/libdisplay-filter-proof.so -%doc %{_mandir}/man?/gimp.* -%doc %{_mandir}/man?/gimp-2.?.* -%doc %{_mandir}/man?/gimp-console.* -%doc %{_mandir}/man?/gimp-console-2.?.* -%doc %{_mandir}/man?/gimprc.* -%doc %{_mandir}/man?/gimprc-2.?.* +%{_libdir}/gimp/2.0/modules/libdisplay-filter-clip-warning.so +%{_mandir}/man?/gimp.* +%{_mandir}/man?/gimp-2.* +%{_mandir}/man?/gimp-console.* +%{_mandir}/man?/gimp-console-2.* +%{_mandir}/man?/gimprc.* +%{_mandir}/man?/gimprc-2.* +%{_mandir}/man?/gimptool-2.* %dir %{_sysconfdir}/gimp %dir %{_sysconfdir}/gimp/2.0 %config %{_sysconfdir}/gimp/2.0/*rc @@ -333,7 +333,7 @@ install -m 644 -c macros.gimp \ %files devel %doc README.i18n %{_bindir}/gimptool-2.0 -%doc %{_mandir}/man?/gimptool-2.0.* +#{_mandir}/man?/gimptool-2.0%{?ext_man} %{_includedir}/gimp-2.0/ %{_libdir}/*.so %{_datadir}/aclocal/gimp-2.0.m4