summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2024-06-07 20:52:25 -0400
committerTed Alff2024-06-07 20:52:25 -0400
commit9d20ade763a750c8103c5b82a05bab68aa16be2d (patch)
treed25cb3f0769d683fdd4a277c442d6b5aeb1aa0cd
parent485aaa8fdf0a113f4db162178eb10fecfae8c428 (diff)
downloadaur-9d20ade763a750c8103c5b82a05bab68aa16be2d.tar.gz
Fix build with documentation. Fix missing gimpchoice.h header.
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD22
2 files changed, 24 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cebe1c32af86..2c21df370e0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
pkgbase = gimp-devel
pkgdesc = GNU Image Manipulation Program (Development version)
pkgver = 2.99.18
- pkgrel = 2
+ pkgrel = 5
url = https://www.gimp.org/
arch = i686
arch = x86_64
arch = armv7h
arch = aarch64
- license = GPL
- license = LGPL
+ license = GPL-3.0-or-later
checkdepends = xorg-server-xvfb
makedepends = appstream
makedepends = intltool
@@ -29,13 +28,14 @@ pkgbase = gimp-devel
makedepends = luajit
makedepends = meson
makedepends = gobject-introspection
- makedepends = gi-docgen
makedepends = xorg-server-xvfb
makedepends = vala
makedepends = highway
makedepends = meson
makedepends = qoi-headers
makedepends = cfitsio
+ makedepends = gi-docgen
+ makedepends = yelp-tools
depends = gtk3
depends = lcms2
depends = libwmf
@@ -58,7 +58,6 @@ pkgbase = gimp-devel
depends = appstream-glib
depends = libxmu
depends = graphviz
- optdepends = gutenprint: for sophisticated printing only as gimp has built-in cups print support
optdepends = alsa-lib: for MIDI event controller module
optdepends = curl: for URI support
optdepends = ghostscript: for postscript support
@@ -78,8 +77,12 @@ pkgbase = gimp-devel
provides = gimp=2.99.18
conflicts = gimp
source = https://download.gimp.org/pub/gimp/v2.99/gimp-2.99.18.tar.xz
+ source = docs_dont_fail_on_warn.patch
+ source = fix-missing-gimpchoice-header.patch::https://gitlab.gnome.org/GNOME/gimp/-/commit/11892f1d83ffc465346dab7e2e8c6e790f555a64.patch
source = linux.gpl
sha256sums = 8c1bb7a94ac0d4d0cde4d701d8b356387c2ecd87abbd35bbf7d222d40f6ddb6e
+ sha256sums = 7517df6ce9f2237253a49cb96eeb2638c80c53301bada6b44ce7f6eab835fe13
+ sha256sums = daeddaae0b5634f953189f4a479cc335c1516e7d490e6bf95f7be8e21835db3e
sha256sums = 1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3
pkgname = gimp-devel
diff --git a/PKGBUILD b/PKGBUILD
index 330b46b0fedc..fe2abcd840ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
_pkgname=gimp
pkgname=${_pkgname}-devel
pkgver=2.99.18
-pkgrel=2
+pkgrel=5
pkgdesc="GNU Image Manipulation Program (Development version)"
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
url="https://www.gimp.org/"
-license=('GPL' 'LGPL')
+license=('GPL-3.0-or-later')
depends=('gtk3' 'lcms2' 'libwmf' 'icu' 'enchant' 'libgexiv2' 'librsvg' 'desktop-file-utils'
'libexif' 'libgudev' 'openjpeg2' 'poppler-glib' 'poppler-data' 'openexr' 'mypaint-brushes1'
'babl>=0.1.98' 'gegl>=0.4.48' 'cairo' 'python-gobject' 'appstream-glib' 'libxmu' 'graphviz')
@@ -15,11 +15,11 @@ makedepends=('appstream' 'intltool' 'libxslt' 'glib-networking'
'alsa-lib' 'curl' 'ghostscript' 'libxpm'
'libheif' 'libwebp' 'libmng' 'iso-codes' 'aalib' 'zlib' 'libjxl'
'gjs' 'luajit' 'meson' 'gobject-introspection'
- 'gi-docgen' 'xorg-server-xvfb' 'vala' 'highway' 'meson' 'qoi-headers'
- 'cfitsio') #yelp-tools')
+ 'xorg-server-xvfb' 'vala' 'highway' 'meson' 'qoi-headers'
+ 'cfitsio' 'gi-docgen' 'yelp-tools')
checkdepends=('xorg-server-xvfb')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
- 'alsa-lib: for MIDI event controller module'
+#'gutenprint: for sophisticated printing only as gimp has built-in cups print support'
+optdepends=('alsa-lib: for MIDI event controller module'
'curl: for URI support'
'ghostscript: for postscript support'
'libxpm: XPM support'
@@ -38,13 +38,23 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
source=("https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"
+ 'docs_dont_fail_on_warn.patch'
+ 'fix-missing-gimpchoice-header.patch::https://gitlab.gnome.org/GNOME/gimp/-/commit/11892f1d83ffc465346dab7e2e8c6e790f555a64.patch'
'linux.gpl')
sha256sums=('8c1bb7a94ac0d4d0cde4d701d8b356387c2ecd87abbd35bbf7d222d40f6ddb6e'
+ '7517df6ce9f2237253a49cb96eeb2638c80c53301bada6b44ce7f6eab835fe13'
+ 'daeddaae0b5634f953189f4a479cc335c1516e7d490e6bf95f7be8e21835db3e'
'1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+ patch -uNp2 -r- -i ../docs_dont_fail_on_warn.patch
+}
+
build() {
local meson_options=(
-Dilbm=disabled
+ -Dg-ir-doc=true
)
arch-meson "${_pkgname}-${pkgver}" build "${meson_options[@]}"