From 83eacb1f558c041a38820b56916867507a247097 Mon Sep 17 00:00:00 2001 From: Kartik Singh Date: Thu, 3 May 2018 14:36:16 +0530 Subject: [PATCH] gimp: update to 2.10.0 --- common/shlibs | 18 ++++++++-------- srcpkgs/gimp/template | 49 +++++++++++++++---------------------------- 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/common/shlibs b/common/shlibs index 4dd8f037fe..ab2505074f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -550,15 +550,15 @@ libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 libjavascriptcoregtk-1.0.so.0 webkitgtk2-2.4.8_2 libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1 libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1 -libgimp-2.0.so.0 libgimp-2.8.10_3 -libgimpwidgets-2.0.so.0 libgimp-2.8.10_3 -libgimpui-2.0.so.0 libgimp-2.8.10_3 -libgimpbase-2.0.so.0 libgimp-2.8.10_3 -libgimpthumb-2.0.so.0 libgimp-2.8.10_3 -libgimpconfig-2.0.so.0 libgimp-2.8.10_3 -libgimpmath-2.0.so.0 libgimp-2.8.10_3 -libgimpcolor-2.0.so.0 libgimp-2.8.10_3 -libgimpmodule-2.0.so.0 libgimp-2.8.10_3 +libgimp-2.0.so.0 libgimp-2.10.0_1 +libgimpwidgets-2.0.so.0 libgimp-2.10.0_1 +libgimpui-2.0.so.0 libgimp-2.10.0_1 +libgimpbase-2.0.so.0 libgimp-2.10.0_1 +libgimpthumb-2.0.so.0 libgimp-2.10.0_1 +libgimpconfig-2.0.so.0 libgimp-2.10.0_1 +libgimpmath-2.0.so.0 libgimp-2.10.0_1 +libgimpcolor-2.0.so.0 libgimp-2.10.0_1 +libgimpmodule-2.0.so.0 libgimp-2.10.0_1 libgmic.so.2 gmic-2.1.8_1 libcgmic.so.2 gmic-2.1.8_1 libexiv2.so.26 exiv2-0.26_1 diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 7fdfac0ac7..f19b0d72bd 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,41 +1,24 @@ -# Template build file for 'gimp'. +# Template build file for 'gimp' pkgname=gimp -version=2.8.22 -revision=2 +version=2.10.0 +revision=1 lib32disabled=yes build_style=gnu-configure -configure_args="--without-aa --without-gvfs --enable-gimp-console - --enable-python --with-gif-compression=lzw --with-libcurl --enable-mp" -hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool" -makedepends="libpng-devel gtk+-devel lcms2-devel - alsa-lib-devel dbus-glib-devel libXmu-devel libXcursor-devel - libexif-devel libsoup-devel libwmf-devel librsvg-devel - libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel - libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel iso-codes" +hostmakedepends="pkg-config intltool gettext-devel" +makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel + ghostscript-devel glib-devel jasper-devel json-glib-devel lcms-devel + libXcursor-devel libXpm-devel libgexiv2-devel libgudev-devel + libmng-devel libmypaint-devel libopenexr-devel librsvg-devel libwmf-devel + mypaint-brushes poppler-glib-devel pygtk-devel webkitgtk2-devel" +depends="desktop-file-utils gegl hicolor-icon-theme iso-codes + mypaint-brushes" short_desc="The GNU image manipulation program" conf_files="/etc/gimp/2.0/*" -depends="desktop-file-utils hicolor-icon-theme iso-codes" -maintainer="Juan RP " +maintainer="Kartik S " +license="GPL-3.0-only" homepage="https://www.gimp.org" -license="GPL-3" distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2" -checksum=9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" dbus-glib-devel gdk-pixbuf-devel pygtk-devel" - configure_args+=" am_cv_python_pythondir=${XBPS_CROSS_BASE}/usr/lib/python2.7/site-packages" - CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" - case "$XBPS_TARGET_MACHINE" in - arm*|musl*) - configure_args+=" --disable-python" - subpackages="libgimp gimp-devel" - ;; - esac -fi - -pre_configure() { - NOCONFIGURE=1 autoreconf -fi -} +checksum=7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2 libgimp_package() { short_desc+=" - runtime libraries" @@ -43,6 +26,7 @@ libgimp_package() { vmove usr/lib/*.so.* } } + gimp-devel_package() { depends="libgimp>=${version}_${revision}" short_desc+=" - development files" @@ -54,10 +38,11 @@ gimp-devel_package() { vmove "usr/lib/*.so" } } + gimp-python_package() { lib32disabled=yes depends="pygtk" - pycompile_dirs="usr/lib/gimp/2.0" + pycompile_dirs="usr/lib/gimp/2.0/python" short_desc+=" - python bindings" pkg_install() { vmove usr/lib/gimp/2.0/python