Date: Tuesday, May 22, 2018 @ 11:03:56 Author: eworm Revision: 324762
upgpkg: gimp 2.10.2-1 * new upstream release * drop upstream patch * remove invalid configure options * add make dependency on glu, required to link against ilmbase/openexr (FS#58593) * change bug report url * conflict and replace gimp-plugin-wavelet-decompose (FS#58590) Modified: gimp/trunk/PKGBUILD Deleted: gimp/trunk/0001-do-not-hardcode-gegl-version.patch -----------------------------------------+ 0001-do-not-hardcode-gegl-version.patch | 80 ------------------------------ PKGBUILD | 31 +++++------ 2 files changed, 14 insertions(+), 97 deletions(-) Deleted: 0001-do-not-hardcode-gegl-version.patch =================================================================== --- 0001-do-not-hardcode-gegl-version.patch 2018-05-22 09:44:44 UTC (rev 324761) +++ 0001-do-not-hardcode-gegl-version.patch 2018-05-22 11:03:56 UTC (rev 324762) @@ -1,80 +0,0 @@ -From 245143532325783fb3414a74cbf58adc8a3199e8 Mon Sep 17 00:00:00 2001 -From: Jehan <[email protected]> -Date: Sat, 28 Apr 2018 01:45:45 +0200 -Subject: [PATCH] configure: argh! Forgot to AC_SUBST() the GEGL major-minor - version. - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 33754e3e99..e28a55ec58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -174,6 +174,7 @@ AC_SUBST(GTK_REQUIRED_VERSION) - AC_SUBST(GTK_WIN32_RECOMMENDED_VERSION) - AC_SUBST(CAIRO_REQUIRED_VERSION) - AC_SUBST(CAIRO_PDF_REQUIRED_VERSION) -+AC_SUBST(GEGL_MAJOR_MINOR_VERSION) - AC_SUBST(GEGL_REQUIRED_VERSION) - AC_SUBST(GEXIV2_REQUIRED_VERSION) - AC_SUBST(LCMS_REQUIRED_VERSION) -From f6a8d93190e2e00006295ed1c1a7c34b770989d6 Mon Sep 17 00:00:00 2001 -From: Jehan <[email protected]> -Date: Sat, 28 Apr 2018 01:30:19 +0200 -Subject: [PATCH] configure, gimp.pc: do no hardcode the major.minor version of - GEGL. - ---- - configure.ac | 10 +++++++--- - gimp.pc.in | 2 +- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 07faa44..f017e34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,7 +44,10 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program]) - - # required versions of other packages - m4_define([babl_required_version], [0.1.46]) --m4_define([gegl_required_version], [0.4.0]) -+m4_define([gegl_major_minor_version], [0.4]) -+m4_define([gegl_micro_version], [0]) -+m4_define([gegl_required_version], -+ [gegl_major_minor_version.gegl_micro_version]) - m4_define([glib_required_version], [2.54.2]) - m4_define([atk_required_version], [2.2.0]) - m4_define([gtk_required_version], [2.24.10]) -@@ -141,6 +144,7 @@ GTK_REQUIRED_VERSION=gtk_required_version - GTK_WIN32_RECOMMENDED_VERSION=gtk_win32_recommended_version - CAIRO_REQUIRED_VERSION=cairo_required_version - CAIRO_PDF_REQUIRED_VERSION=cairo_pdf_required_version -+GEGL_MAJOR_MINOR_VERSION=gegl_major_minor_version - GEGL_REQUIRED_VERSION=gegl_required_version - GEXIV2_REQUIRED_VERSION=gexiv2_required_version - LCMS_REQUIRED_VERSION=lcms_required_version -@@ -671,8 +675,8 @@ m4_define([add_deps_error], [ - - PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],, - [add_deps_error([babl >= babl_required_version])]) --PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version,, -- [add_deps_error([gegl-0.4 >= gegl_required_version])]) -+PKG_CHECK_MODULES(GEGL, gegl-gegl_major_minor_version >= gegl_required_version,, -+ [add_deps_error([gegl-gegl_major_minor_version >= gegl_required_version])]) - PKG_CHECK_MODULES(ATK, atk >= atk_required_version,, - [add_deps_error([atk >= atk_required_version])]) - -diff --git a/gimp.pc.in b/gimp.pc.in -index 9cf1da9..2e8d78c 100644 ---- a/gimp.pc.in -+++ b/gimp.pc.in -@@ -12,6 +12,6 @@ gimplocaledir=@gimplocaledir@ - Name: GIMP - Description: GIMP Library - Version: @GIMP_REAL_VERSION@ --Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.3 >= @GEGL_REQUIRED_VERSION@ -+Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-@GEGL_MAJOR_MINOR_VERSION@ >= @GEGL_REQUIRED_VERSION@ - Libs: -L${libdir} -lgimp-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ -lgimpconfig-@GIMP_API_VERSION@ -lgimpcolor-@GIMP_API_VERSION@ -lgimpbase-@GIMP_API_VERSION@ @RT_LIBS@ - Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@ Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-22 09:44:44 UTC (rev 324761) +++ PKGBUILD 2018-05-22 11:03:56 UTC (rev 324762) @@ -2,26 +2,27 @@ # Contributor: Daniel Isenmann <[email protected]> pkgname=gimp -pkgver=2.10.0 -pkgrel=6 +pkgver=2.10.2 +pkgrel=1 pkgdesc='GNU Image Manipulation Program' url='https://www.gimp.org/' arch=('x86_64') license=('GPL' 'LGPL') -depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' 'libwebp' - 'libexif' 'gegl>=0.4' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl' - 'openexr' 'libgudev' 'poppler-data' 'libmypaint' 'mypaint-brushes' 'glib-networking') -makedepends=('intltool' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript' 'gtk-doc') +depends=('babl' 'dbus-glib' 'desktop-file-utils' 'gegl' 'glib-networking' 'hicolor-icon-theme' + 'jasper' 'lcms' 'libexif' 'libgudev' 'libmng' 'libmypaint' 'librsvg' 'libwebp' 'libwmf' + 'libxmu' 'libxpm' 'mypaint-brushes' 'openexr' 'poppler-data' 'pygtk') +makedepends=('alsa-lib' 'curl' 'ghostscript' 'glu' 'gtk-doc' 'intltool' 'iso-codes' + 'poppler-glib') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'poppler-glib: for pdf support' 'alsa-lib: for MIDI event controller module' 'curl: for URI support' 'ghostscript: for postscript support') +conflicts=('gimp-plugin-wavelet-decompose') +replaces=('gimp-plugin-wavelet-decompose') source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - 0001-do-not-hardcode-gegl-version.patch linux.gpl) -sha256sums=('7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2' - '99e8c8957dd0d3f6b090cc4dc22deebdd4f9ed299df1f79e2ece41c96f18f8cd' +sha256sums=('1cb0baaecdefe44d371a15f2739a1bcbce4682336b4ccf8eb7b587ce52c333eb' '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3') prepare() { @@ -28,11 +29,11 @@ cd ${pkgname}-${pkgver} _mypaintver=$(echo /usr/lib/libmypaint-*.so | grep -o -E '\-[0-9]+(\.[0-9]+)*' | head -1) sed -i "s|\\(libmypaint\\)\\( >= libmypaint_required_version\\)|\\1${_mypaintver}\\2|g" configure.ac - patch -Np1 < ../0001-do-not-hardcode-gegl-version.patch autoreconf -vi } build() { +pkg-config --exists --print-errors "OpenEXR >= 1.6.1" cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure \ --prefix=/usr \ @@ -40,15 +41,11 @@ --libexecdir=/usr/bin \ --enable-mp \ --enable-gimp-console \ - --enable-gimp-remote \ --enable-python \ --enable-gtk-doc \ - --with-gif-compression=lzw \ - --with-libcurl \ - --without-aa \ - --without-hal \ - --without-gvfs \ - --without-gnomevfs + --with-bug-report-url='https://bugs.archlinux.org/index.php?project=1&do=newtask' \ + --with-openexr \ + --without-aa sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make }
