[packages/gimp] - added no-checks-for-runtime-deps (don't BR poppler-data just for runtime dependency check) - updat
qboosh
qboosh at pld-linux.org
Mon Jun 17 20:33:29 CEST 2019
commit 50c619806709d8e60488f75c29157cb3a58e1188
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jun 17 20:34:34 2019 +0200
- added no-checks-for-runtime-deps (don't BR poppler-data just for runtime dependency check)
- updated dependencies
- don't hide python behind /usr/bin/env
- drop .la files
- release 3
gimp-no-checks-for-runtime-deps.patch | 11 +++
gimp.spec | 147 ++++++++++++++++++----------------
2 files changed, 88 insertions(+), 70 deletions(-)
---
diff --git a/gimp.spec b/gimp.spec
index db28244..066532b 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,8 +1,9 @@
#
# Conditional build:
-%bcond_without aalib # without aa plugin (which requires aalib)
-%bcond_without python # without python plugins
-%bcond_without webkit # without webkit-based help browser
+%bcond_without aalib # aa plugin (which requires aalib)
+%bcond_without python # python plugins
+%bcond_without libunwind # detailed backtraces using libunwind
+%bcond_without webkit # webkit-based help browser
%bcond_with posix_shm # with POSIX SHM (default is SysV SHM)
%define babl_ver 0.1.62
@@ -22,7 +23,7 @@ Summary(zh_CN.UTF-8): [图像]GNU图象处理工具
Summary(zh_TW.UTF-8): [圖像]GNU圖象處理工具
Name: gimp
Version: 2.10.10
-Release: 2
+Release: 3
Epoch: 1
License: GPL v3+
Group: X11/Applications/Graphics
@@ -31,51 +32,58 @@ Source0: http://ftp.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar.bz2
Patch0: %{name}-home_etc.patch
Patch1: %{name}-desktop.patch
Patch2: %{name}-gcc4.patch
+Patch3: %{name}-no-checks-for-runtime-deps.patch
URL: http://www.gimp.org/
+BuildRequires: OpenEXR-devel >= 1.6.1
%{?with_aalib:BuildRequires: aalib-devel}
BuildRequires: alsa-lib-devel >= 1.0.11
BuildRequires: atk-devel >= 1:2.2.0
BuildRequires: autoconf >= 2.54
BuildRequires: automake
BuildRequires: babl-devel >= %{babl_ver}
-BuildRequires: cairo-devel >= 1.10.2
-BuildRequires: curl-devel >= 7.15.1
-BuildRequires: dbus-glib-devel >= 0.70
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel >= 1.12.2
BuildRequires: docbook-dtd412-xml
BuildRequires: fontconfig-devel >= 2.12.4
+BuildRequires: freetype-devel >= 1:2.1.7
BuildRequires: gdk-pixbuf2-devel >= 2.30.8
BuildRequires: gegl-devel >= %{gegl_ver}
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.19
+BuildRequires: gexiv2-devel >= 0.10.6
BuildRequires: ghostscript-devel
BuildRequires: giflib-devel
BuildRequires: glib2-devel >= 1:2.54.2
BuildRequires: glib-networking
-BuildRequires: gtk+2-devel >= 2:2.24.10
+BuildRequires: gtk+2-devel >= 2:2.24.32
+BuildRequires: gtk-update-icon-cache >= 2.24.32
BuildRequires: gtk-doc >= 1.6
%{?with_webkit:BuildRequires: gtk-webkit-devel >= 1.6.1}
+BuildRequires: harfbuzz-devel >= 0.9.19
BuildRequires: intltool >= 0.40.1
BuildRequires: iso-codes
-BuildRequires: jasper-devel
BuildRequires: lcms2-devel >= 2.8
-BuildRequires: libexif-devel >= 0.6.15
-BuildRequires: libheif-devel
+BuildRequires: libheif-devel >= 1.1.0
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
BuildRequires: libmypaint-devel >= 1.3.0
-BuildRequires: libpng-devel >= 1.2.37
-BuildRequires: librsvg-devel >= 1:2.36.0
+BuildRequires: libpng-devel >= 2:1.6.25
+BuildRequires: librsvg-devel >= 1:2.40.6
+BuildRequires: libstdc++-devel >= 6:5
BuildRequires: libtiff-devel
BuildRequires: libtool >= 2:2.2
+%{?with_libunwind:BuildRequires: libunwind-devel >= 1.1.0}
+BuildRequires: libwebp-devel >= 0.6.0
BuildRequires: libwmf-devel >= 2:0.2.8
-BuildRequires: mypaint-brushes-devel
+BuildRequires: mypaint-brushes-devel >= 1.0
+BuildRequires: mypaint-brushes-devel < 2
+BuildRequires: openjpeg2-devel >= 2.1.0
BuildRequires: pango-devel >= 1:1.29.4
+BuildRequires: perl-base >= 1:5.10.0
BuildRequires: pkgconfig >= 1:0.16
-BuildRequires: poppler-data >= 0.4.7
-BuildRequires: poppler-devel >= 0.17
-BuildRequires: poppler-glib-devel >= 0.44.0
+BuildRequires: poppler-glib-devel >= 0.50.0
+%{?with_python:BuildRequires: python >= 1:2.5.0}
%{?with_python:BuildRequires: python-pycairo-devel >= 1.12.2}
%{?with_python:BuildRequires: python-pygtk-devel >= 1:2.10.4}
-%{?with_python:BuildRequires: python >= 1:2.5.0}
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: udev-glib-devel >= 1:167
@@ -84,19 +92,31 @@ BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXfixes-devel
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXpm-devel
-Requires(post,postun): gtk+2 >= 2:2.24.10
+BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xz-devel
+BuildRequires: zlib-devel
+Requires(post,postun): gtk+2 >= 2:2.24.32
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: OpenEXR >= 1.6.1
+Requires: alsa-lib >= 1.0.11
Requires: atk >= 1:2.2.0
-Requires: babl >= %{babl_ver}
-Requires: curl >= 7.15.1
-Requires: dbus-glib >= 0.70
-Requires: fontconfig-libs >= 2.2.0
-Requires: gegl >= %{gegl_ver}
+Requires: fontconfig-libs >= 2.12.4
+Requires: freetype >= 1:2.1.7
+Requires: harfbuzz >= 0.9.19
Requires: hicolor-icon-theme
-Requires: lcms2 >= 2.2
-Requires: libexif >= 0.6.15
-Requires: mypaint-brushes
+Requires: iso-codes
+Requires: libheif >= 1.1.0
+Requires: libmypaint >= 1.3.0
+Requires: libpng >= 2:1.6.25
+Requires: libwebp >= 0.6.0
+Requires: libwmf-libs >= 2:0.2.8
+Requires: mypaint-brushes >= 1.0
+Requires: mypaint-brushes < 2
+Requires: openjpeg2 >= 2.1.0
+Requires: poppler-data >= 0.4.7
+Requires: poppler-glib >= 0.50.0
%{?with_python:Requires: python-pygtk-gtk >= 1:2.10.4}
+Requires: udev-glib >= 1:167
Obsoletes: gimp-data-min
Obsoletes: gimp-libgimp
Obsoletes: gimp-print
@@ -177,14 +197,6 @@ антиалиасинг, всяческие конверторы и все эт
GIMP включает поддержку создания сценариев (scripting facility),
однако многие из поставляемых с программой сценариев предполагают
наличие шрифтов, которые не могут быть включены в дистрибутив.
-FTP-сайт GIMP содержит пакет шрифтов, которые вы можете поставить
-самостоятельно, включающий все шрифты, необходимые для работы входящих
-в комплект сценариев. Некоторые из шрифтов имеют весьма необычные
-лицензионные требования; все лицензии включены в упомянутый пакет.
-Скачайте ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz и
-ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz, если хотите
-запускать сценарии без изменений или выберите те шрифты, которые
-установлены у вас в системе, перед запуском сценариев.
%description -l uk.UTF-8
GIMP - це програма для створення та обробки зображень. Її вважають
@@ -200,25 +212,21 @@ багаторівневим відкатом.
GIMP має підтримку сценаріїв (scripting facility), проте багато з
включених до поставки сценаріїв припускають наявність шрифтів, які не
-можуть бути включені в дистрибутив. FTP-сайт GIMP містить пакет
-шрифтів, котрі ви можете встановити самостійно, в який входять всі
-шрифти, необхідні для роботи сценаріїв з поставки GIMP. Деякі з
-шрифтів мають вельми незвичайні ліцензійні умови; всі ліцензії
-включено в згаданий пакет. Завантажте
-ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz та
-ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz. якщо хочете
-запускати сценарії без змін або ж виберіть встановалені у вас в
-системі шрифти перед запуском сценаріїв.
+можуть бути включені в дистрибутив.
%package libs
Summary: GIMP libraries
Summary(pl.UTF-8): Biblioteki GIMP-a
License: LGPL v2+
-Group: Libraries
-Requires: cairo >= 1.10.2
-Requires: gdk-pixbuf2 >= 2.24.1
-Requires: glib2 >= 1:2.30.2
-Requires: gtk+2 >= 2:2.24.10
+Group: X11/Libraries
+Requires: babl >= %{babl_ver}
+Requires: cairo >= 1.12.2
+Requires: gdk-pixbuf2 >= 2.30.8
+Requires: gegl >= %{gegl_ver}
+Requires: gexiv2 >= 0.10.6
+Requires: glib2 >= 1:2.54.2
+Requires: gtk+2 >= 2:2.24.32
+Requires: lcms2 >= 2.8
Requires: pango >= 1:1.29.4
%description libs
@@ -242,10 +250,11 @@ Summary(zh_TW.UTF-8): [開發]gimp的開發包
License: LGPL v2+
Group: X11/Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: cairo-devel >= 1.10.2
-Requires: gdk-pixbuf2-devel >= 2.24.1
-Requires: glib2-devel >= 1:2.30.2
-Requires: gtk+2-devel >= 2:2.24.10
+Requires: cairo-devel >= 1.12.2
+Requires: gdk-pixbuf2-devel >= 2.30.8
+Requires: gegl-devel >= %{gegl_ver}
+Requires: glib2-devel >= 1:2.54.2
+Requires: gtk+2-devel >= 2:2.24.32
Requires: pango-devel >= 1:1.29.4
%description devel
@@ -323,7 +332,7 @@ Summary: SVG plugin for GIMP
Summary(pl.UTF-8): Wtyczka SVG dla GIMPa
Group: X11/Applications/Graphics
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: librsvg >= 1:2.36.0
+Requires: librsvg >= 1:2.40.6
%description svg
SVG plugin for GIMP.
@@ -336,6 +345,7 @@ Wtyczka SVG dla GIMPa.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__rm} acinclude.m4
@@ -351,12 +361,14 @@ Wtyczka SVG dla GIMPa.
--enable-default-binary \
--enable-gtk-doc \
--enable-static \
+ --without-appdata-test \
+ --with-bug-report-url="https://www.pld-linux.org/" \
--with-html-dir=%{_gtkdocdir} \
--with-lcms=2 \
+ %{!?with_libunwind:--without-libunwind} \
+ --with-sendmail=/usr/lib/sendmail \
%{?with_posix_shm:--with-shm=posix} \
- %{!?with_webkit:--without-webkit} \
- --without-appdata-test \
- --with-bug-report-url="https://www.pld-linux.org/"
+ %{!?with_webkit:--without-webkit}
%{__make}
@@ -370,12 +382,17 @@ rm -rf $RPM_BUILD_ROOT
ln -s gimptool-2.0 $RPM_BUILD_ROOT%{_bindir}/gimptool
echo '.so gimptool-2.0.1' > $RPM_BUILD_ROOT%{_mandir}/man1/gimptool.1
-# Remove obsolete files
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgimp*.la
+# dynamic modules loaded via gmodule
%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/modules/*.{a,la}
%if %{with python}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/python/*.{a,la,py}
%endif
+# don't hide {python,python2,python3} behind /usr/bin/env
+%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/plug-ins/*/*.py
+
%find_lang %{name} --all-name
%clean
@@ -408,6 +425,7 @@ umask 022
%{_datadir}/metainfo/gimp-data-extras.metainfo.xml
%{_datadir}/metainfo/org.gimp.GIMP.appdata.xml
%{_desktopdir}/gimp.desktop
+%{_iconsdir}/hicolor/*x*/apps/gimp.png
%{_mandir}/man1/gimp-2.10.1*
%{_mandir}/man1/gimp.1*
%{_mandir}/man1/gimp-console-2.10.1*
@@ -466,8 +484,6 @@ umask 022
%config %{_sysconfdir}/%{name}/%{mver}/sessionrc
%config %{_sysconfdir}/%{name}/%{mver}/unitrc
-%{_iconsdir}/hicolor/*/apps/gimp.*
-
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgimp-2.0.so.*.*.*
@@ -502,15 +518,6 @@ umask 022
%attr(755,root,root) %{_libdir}/libgimpthumb-2.0.so
%attr(755,root,root) %{_libdir}/libgimpui-2.0.so
%attr(755,root,root) %{_libdir}/libgimpwidgets-2.0.so
-%{_libdir}/libgimp-2.0.la
-%{_libdir}/libgimpbase-2.0.la
-%{_libdir}/libgimpcolor-2.0.la
-%{_libdir}/libgimpconfig-2.0.la
-%{_libdir}/libgimpmath-2.0.la
-%{_libdir}/libgimpmodule-2.0.la
-%{_libdir}/libgimpthumb-2.0.la
-%{_libdir}/libgimpui-2.0.la
-%{_libdir}/libgimpwidgets-2.0.la
%{_pkgconfigdir}/gimp-2.0.pc
%{_pkgconfigdir}/gimpthumb-2.0.pc
%{_pkgconfigdir}/gimpui-2.0.pc
diff --git a/gimp-no-checks-for-runtime-deps.patch b/gimp-no-checks-for-runtime-deps.patch
new file mode 100644
index 0000000..4dd82fd
--- /dev/null
+++ b/gimp-no-checks-for-runtime-deps.patch
@@ -0,0 +1,11 @@
+--- gimp-2.10.10/configure.ac.orig 2019-04-07 13:38:49.000000000 +0200
++++ gimp-2.10.10/configure.ac 2019-06-16 08:27:35.816441998 +0200
+@@ -1956,8 +1956,6 @@
+ [add_deps_error([poppler-glib >= poppler_required_version])])
+ # All modern distributions have at least this version and CJK/Cyrillic
+ # support should not be considered as "second-zone citizen".
+-PKG_CHECK_MODULES(POPPLER_DATA, [poppler-data >= poppler_data_required_version],,
+- [add_deps_error([poppler-data >= poppler_data_required_version])])
+
+ # MIME_TYPES is for the formats we can open as used for instance in the
+ # desktop file. Even if cairo-pdf (used for PDF export) is not
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gimp.git/commitdiff/50c619806709d8e60488f75c29157cb3a58e1188
More information about the pld-cvs-commit
mailing list