[arch-commits] Commit in gimp/repos/extra-x86_64 (7 files)
Christian Hesse
eworm at archlinux.org
Thu Mar 19 16:31:14 UTC 2020
Date: Thursday, March 19, 2020 @ 16:31:13
Author: eworm
Revision: 377933
archrelease: copy trunk to extra-x86_64
Added:
gimp/repos/extra-x86_64/0001-no-check-update.patch
(from rev 377932, gimp/trunk/0001-no-check-update.patch)
gimp/repos/extra-x86_64/PKGBUILD
(from rev 377932, gimp/trunk/PKGBUILD)
gimp/repos/extra-x86_64/gimp.install
(from rev 377932, gimp/trunk/gimp.install)
gimp/repos/extra-x86_64/linux.gpl
(from rev 377932, gimp/trunk/linux.gpl)
Deleted:
gimp/repos/extra-x86_64/0001-no-check-update.patch
gimp/repos/extra-x86_64/PKGBUILD
gimp/repos/extra-x86_64/linux.gpl
----------------------------+
0001-no-check-update.patch | 28 ++++----
PKGBUILD | 135 +++++++++++++++++++++----------------------
gimp.install | 8 ++
linux.gpl | 38 ++++++------
4 files changed, 109 insertions(+), 100 deletions(-)
Deleted: 0001-no-check-update.patch
===================================================================
--- 0001-no-check-update.patch 2020-03-19 16:31:02 UTC (rev 377932)
+++ 0001-no-check-update.patch 2020-03-19 16:31:13 UTC (rev 377933)
@@ -1,14 +0,0 @@
-diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
-index d767d830f0..4352f021ca 100644
---- a/app/dialogs/about-dialog.c
-+++ b/app/dialogs/about-dialog.c
-@@ -163,7 +163,9 @@ about_dialog_create (GimpCoreConfig *config)
- #ifdef GIMP_UNSTABLE
- about_dialog_add_unstable_message (children->data);
- #endif /* GIMP_UNSTABLE */
-+#ifdef CHECK_UPDATE
- about_dialog_add_update (&dialog, config);
-+#endif /* CHECK_UPDATE */
- }
- else
- g_warning ("%s: ooops, no box in this container?", G_STRLOC);
Copied: gimp/repos/extra-x86_64/0001-no-check-update.patch (from rev 377932, gimp/trunk/0001-no-check-update.patch)
===================================================================
--- 0001-no-check-update.patch (rev 0)
+++ 0001-no-check-update.patch 2020-03-19 16:31:13 UTC (rev 377933)
@@ -0,0 +1,14 @@
+diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
+index d767d830f0..4352f021ca 100644
+--- a/app/dialogs/about-dialog.c
++++ b/app/dialogs/about-dialog.c
+@@ -163,7 +163,9 @@ about_dialog_create (GimpCoreConfig *config)
+ #ifdef GIMP_UNSTABLE
+ about_dialog_add_unstable_message (children->data);
+ #endif /* GIMP_UNSTABLE */
++#ifdef CHECK_UPDATE
+ about_dialog_add_update (&dialog, config);
++#endif /* CHECK_UPDATE */
+ }
+ else
+ g_warning ("%s: ooops, no box in this container?", G_STRLOC);
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-19 16:31:02 UTC (rev 377932)
+++ PKGBUILD 2020-03-19 16:31:13 UTC (rev 377933)
@@ -1,67 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Daniel Isenmann <daniel at archlinux.org>
-
-pkgname=gimp
-pkgver=2.10.18
-pkgrel=3
-pkgdesc='GNU Image Manipulation Program'
-url='https://www.gimp.org/'
-arch=('x86_64')
-license=('GPL' 'LGPL')
-depends=('babl' 'dbus-glib' 'desktop-file-utils' 'gegl' 'glib-networking' 'hicolor-icon-theme'
- 'jasper' 'lcms2' 'libheif' 'libexif' 'libgudev' 'libmng' 'libmypaint' 'librsvg' 'libwebp'
- 'libwmf' 'libxmu' 'libxpm' 'mypaint-brushes1' 'openexr' 'poppler-data' 'gtk2')
-makedepends=('alsa-lib' 'curl' 'ghostscript' '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-no-check-update.patch
- linux.gpl)
-sha256sums=('65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716'
- '0695e23b343289d48074e57268012d620b249c670e98f489176c707020785dcb'
- '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 < ../0001-no-check-update.patch
-
- autoreconf -vi
-}
-
-build() {
-pkg-config --exists --print-errors "OpenEXR >= 1.6.1"
- cd ${pkgname}-${pkgver}
- PYTHON=/usr/bin/python2 ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/bin \
- --enable-mp \
- --enable-gimp-console \
- --enable-gtk-doc \
- --disable-check-update \
- --disable-python \
- --with-bug-report-url='https://bugs.archlinux.org/?string=gimp' \
- --with-openexr \
- --without-aa
- 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/extra-x86_64/PKGBUILD (from rev 377932, gimp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-19 16:31:13 UTC (rev 377933)
@@ -0,0 +1,68 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Daniel Isenmann <daniel at archlinux.org>
+
+pkgname=gimp
+pkgver=2.10.18
+pkgrel=4
+pkgdesc='GNU Image Manipulation Program'
+url='https://www.gimp.org/'
+arch=('x86_64')
+license=('GPL' 'LGPL')
+depends=('babl' 'dbus-glib' 'desktop-file-utils' 'gegl' 'glib-networking' 'hicolor-icon-theme'
+ 'jasper' 'lcms2' 'libheif' 'libexif' 'libgudev' 'libmng' 'libmypaint' 'librsvg' 'libwebp'
+ 'libwmf' 'libxmu' 'libxpm' 'mypaint-brushes1' 'openexr' 'poppler-data' 'gtk2')
+makedepends=('alsa-lib' 'curl' 'ghostscript' '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')
+install=gimp.install
+source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ 0001-no-check-update.patch
+ linux.gpl)
+sha256sums=('65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716'
+ '0695e23b343289d48074e57268012d620b249c670e98f489176c707020785dcb'
+ '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -Np1 < ../0001-no-check-update.patch
+
+ autoreconf -vi
+}
+
+build() {
+pkg-config --exists --print-errors "OpenEXR >= 1.6.1"
+ cd ${pkgname}-${pkgver}
+ PYTHON=/usr/bin/python2 ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/bin \
+ --enable-mp \
+ --enable-gimp-console \
+ --enable-gtk-doc \
+ --disable-check-update \
+ --disable-python \
+ --with-bug-report-url='https://bugs.archlinux.org/?string=gimp' \
+ --with-openexr \
+ --without-aa
+ 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/extra-x86_64/gimp.install (from rev 377932, gimp/trunk/gimp.install)
===================================================================
--- gimp.install (rev 0)
+++ gimp.install 2020-03-19 16:31:13 UTC (rev 377933)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+post_upgrade() {
+ if [[ $(vercmp '2.10.18-4' "$2") -eq 1 ]]; then
+ echo ' > The python2 plugin support is disabled, you will need to install this'
+ echo ' > separately if you need it, e.g. the python2-gimp package in the AUR.'
+ fi
+}
Deleted: linux.gpl
===================================================================
--- linux.gpl 2020-03-19 16:31:02 UTC (rev 377932)
+++ linux.gpl 2020-03-19 16:31:13 UTC (rev 377933)
@@ -1,19 +0,0 @@
-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
Copied: gimp/repos/extra-x86_64/linux.gpl (from rev 377932, gimp/trunk/linux.gpl)
===================================================================
--- linux.gpl (rev 0)
+++ linux.gpl 2020-03-19 16:31:13 UTC (rev 377933)
@@ -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