[arch-commits] Commit in gimp/repos (4 files)
Christian Hesse
eworm at archlinux.org
Mon May 14 07:27:22 UTC 2018
Date: Monday, May 14, 2018 @ 07:27:21
Author: eworm
Revision: 324252
archrelease: copy trunk to testing-x86_64
Added:
gimp/repos/testing-x86_64/
gimp/repos/testing-x86_64/0001-do-not-hardcode-gegl-version.patch
(from rev 324251, gimp/trunk/0001-do-not-hardcode-gegl-version.patch)
gimp/repos/testing-x86_64/PKGBUILD
(from rev 324251, gimp/trunk/PKGBUILD)
gimp/repos/testing-x86_64/linux.gpl
(from rev 324251, gimp/trunk/linux.gpl)
-----------------------------------------+
0001-do-not-hardcode-gegl-version.patch | 80 ++++++++++++++++++++++++++++++
PKGBUILD | 67 +++++++++++++++++++++++++
linux.gpl | 19 +++++++
3 files changed, 166 insertions(+)
Copied: gimp/repos/testing-x86_64/0001-do-not-hardcode-gegl-version.patch (from rev 324251, gimp/trunk/0001-do-not-hardcode-gegl-version.patch)
===================================================================
--- testing-x86_64/0001-do-not-hardcode-gegl-version.patch (rev 0)
+++ testing-x86_64/0001-do-not-hardcode-gegl-version.patch 2018-05-14 07:27:21 UTC (rev 324252)
@@ -0,0 +1,80 @@
+From 245143532325783fb3414a74cbf58adc8a3199e8 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan at girinstud.io>
+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 <jehan at girinstud.io>
+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- at GEGL_MAJOR_MINOR_VERSION@ >= @GEGL_REQUIRED_VERSION@
+ Libs: -L${libdir} -lgimp- at GIMP_API_VERSION@ -lgimpmath- at GIMP_API_VERSION@ -lgimpconfig- at GIMP_API_VERSION@ -lgimpcolor- at GIMP_API_VERSION@ -lgimpbase- at GIMP_API_VERSION@ @RT_LIBS@
+ Cflags: -I${includedir}/gimp- at GIMP_API_VERSION@
Copied: gimp/repos/testing-x86_64/PKGBUILD (from rev 324251, gimp/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-05-14 07:27:21 UTC (rev 324252)
@@ -0,0 +1,67 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Daniel Isenmann <daniel at archlinux.org>
+
+pkgname=gimp
+pkgver=2.10.0
+pkgrel=6
+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')
+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')
+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'
+ '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
+
+prepare() {
+ 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() {
+ cd ${pkgname}-${pkgver}
+ PYTHON=/usr/bin/python2 ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --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
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
+
+ rm "${pkgdir}/usr/share/man/man1/gimp-console.1"
+ ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
+ ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
+ ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
+}
+
+# vim: ts=2 sw=2 et:
Copied: gimp/repos/testing-x86_64/linux.gpl (from rev 324251, gimp/trunk/linux.gpl)
===================================================================
--- testing-x86_64/linux.gpl (rev 0)
+++ testing-x86_64/linux.gpl 2018-05-14 07:27:21 UTC (rev 324252)
@@ -0,0 +1,19 @@
+GIMP Palette
+Name: linux
+#
+ 0 0 0
+ 0 0 170
+ 0 170 0
+ 0 170 170
+170 0 0
+170 0 170
+170 85 0
+170 170 170
+ 85 85 85
+ 85 85 255
+ 85 255 85
+ 85 255 255
+255 85 85
+255 85 255
+255 255 85
+255 255 255
More information about the arch-commits
mailing list