summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2024-11-06 11:27:59 -0500
committerTed Alff2024-11-06 11:27:59 -0500
commitf8059bf0bc873b52698000aa4a0d878cc98dde27 (patch)
treec6cb76220e2b36327f618693d1b2ae572c33cc85
parent8ec25e247ea86e144ed09130f040a8d611eacc58 (diff)
downloadaur-f8059bf0bc873b52698000aa4a0d878cc98dde27.tar.gz
Version bump 3.0.0rc1
Diffstat
-rw-r--r--.SRCINFO100
-rw-r--r--PKGBUILD70
-rw-r--r--docs_dont_fail_on_warn.patch22
3 files changed, 78 insertions, 114 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7817b6fd9c6a..995712934029 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,91 +1,83 @@
pkgbase = gimp-devel
pkgdesc = GNU Image Manipulation Program (Development version)
- pkgver = 2.99.18
- pkgrel = 6
+ pkgver = 3.0.0rc1
+ pkgrel = 1
url = https://www.gimp.org/
arch = i686
arch = x86_64
arch = armv7h
arch = aarch64
license = GPL-3.0-or-later
- checkdepends = xorg-server-xvfb
- makedepends = appstream
- makedepends = intltool
- makedepends = libxslt
- makedepends = glib-networking
+ makedepends = aalib
makedepends = alsa-lib
+ makedepends = appstream
+ makedepends = cfitsio
makedepends = curl
makedepends = ghostscript
- makedepends = libxpm
- makedepends = libheif
- makedepends = libwebp
- makedepends = libmng
- makedepends = iso-codes
- makedepends = aalib
- makedepends = zlib
- makedepends = libjxl
- makedepends = libilbm
+ makedepends = gi-docgen
makedepends = gjs
- makedepends = luajit
- makedepends = meson
+ makedepends = glib2-devel
+ makedepends = glib-networking
makedepends = gobject-introspection
- makedepends = xorg-server-xvfb
- makedepends = vala
makedepends = highway
+ makedepends = intltool
+ makedepends = iso-codes
+ makedepends = libheif
+ makedepends = libilbm
+ makedepends = libjxl
+ makedepends = libmng
+ makedepends = libwebp
+ makedepends = libxpm
+ makedepends = libxslt
+ makedepends = luajit
makedepends = meson
makedepends = qoi-headers
- makedepends = cfitsio
- makedepends = gi-docgen
- makedepends = yelp-tools
- makedepends = glib2-devel
+ makedepends = vala
+ makedepends = zlib
+ depends = appstream-glib
+ depends = babl>=0.1.110
+ depends = cairo
+ depends = desktop-file-utils
+ depends = enchant
+ depends = gegl>=0.4.50
+ depends = graphviz
depends = gtk3
- depends = lcms2
- depends = libwmf
depends = icu
- depends = enchant
- depends = libgexiv2
- depends = librsvg
- depends = desktop-file-utils
+ depends = lcms2
depends = libexif
+ depends = libgexiv2
depends = libgudev
+ depends = librsvg
+ depends = libwmf
+ depends = libxmu
+ depends = mypaint-brushes1
+ depends = openexr
depends = openjpeg2
- depends = poppler-glib
depends = poppler-data
- depends = openexr
- depends = mypaint-brushes1
- depends = babl>=0.1.98
- depends = gegl>=0.4.48
- depends = cairo
+ depends = poppler-glib
depends = python-gobject
- depends = appstream-glib
- depends = libxmu
- depends = graphviz
+ optdepends = aalib: ASCII art support
optdepends = alsa-lib: for MIDI event controller module
+ optdepends = cfitsio: FITS support
optdepends = curl: for URI support
+ optdepends = gjs: JavaScript scripting support
optdepends = ghostscript: for postscript support
- optdepends = libxpm: XPM support
+ optdepends = iso-codes: Language support
optdepends = libheif: HEIF support
optdepends = libilbm: ILBM support
optdepends = libjxl: JPEG XL support
- optdepends = libwebp: WebP support
optdepends = libmng: MNG support
+ optdepends = libwebp: WebP support
+ optdepends = libxpm: XPM support
+ optdepends = lua51-lgi: LUA scripting support
+ optdepends = luajit: LUA scripting support
optdepends = qoi-headers: QOI image support
- optdepends = iso-codes: Language support
- optdepends = aalib: ASCII art support
optdepends = zlib: Compression routines
- optdepends = gjs: JavaScript scripting support
- optdepends = luajit: LUA scripting support
- optdepends = lua51-lgi: LUA scripting support
- optdepends = cfitsio: FITS support
- provides = gimp=2.99.18
+ provides = gimp=3.0.0rc1
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 = https://download.gimp.org/pub/gimp/v3.0/gimp-3.0.0-RC1.tar.xz
source = linux.gpl
- sha256sums = 8c1bb7a94ac0d4d0cde4d701d8b356387c2ecd87abbd35bbf7d222d40f6ddb6e
- sha256sums = 7517df6ce9f2237253a49cb96eeb2638c80c53301bada6b44ce7f6eab835fe13
- sha256sums = daeddaae0b5634f953189f4a479cc335c1516e7d490e6bf95f7be8e21835db3e
+ sha256sums = b3d0b264c5e38e789faaf3417003397f3240014c59c7f417f9ca3bd39c5ffb66
sha256sums = 1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3
pkgname = gimp-devel
diff --git a/PKGBUILD b/PKGBUILD
index 35bb5ce09e94..43e678cc1b22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,67 +2,61 @@
_pkgname=gimp
pkgname=${_pkgname}-devel
-pkgver=2.99.18
-pkgrel=6
+pkgver=3.0.0rc1
+pkgrel=1
pkgdesc="GNU Image Manipulation Program (Development version)"
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
url="https://www.gimp.org/"
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')
-makedepends=('appstream' 'intltool' 'libxslt' 'glib-networking'
- 'alsa-lib' 'curl' 'ghostscript' 'libxpm'
- 'libheif' 'libwebp' 'libmng' 'iso-codes' 'aalib' 'zlib' 'libjxl' 'libilbm'
- 'gjs' 'luajit' 'meson' 'gobject-introspection'
- 'xorg-server-xvfb' 'vala' 'highway' 'meson' 'qoi-headers'
- 'cfitsio' 'gi-docgen' 'yelp-tools' 'glib2-devel')
-checkdepends=('xorg-server-xvfb')
-#'gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-optdepends=('alsa-lib: for MIDI event controller module'
+depends=('appstream-glib' 'babl>=0.1.110' 'cairo' 'desktop-file-utils' 'enchant'
+ 'gegl>=0.4.50' 'graphviz' 'gtk3' 'icu' 'lcms2' 'libexif' 'libgexiv2'
+ 'libgudev' 'librsvg' 'libwmf' 'libxmu' 'mypaint-brushes1' 'openexr'
+ 'openjpeg2' 'poppler-data' 'poppler-glib' 'python-gobject')
+makedepends=('aalib' 'alsa-lib' 'appstream' 'cfitsio' 'curl' 'ghostscript'
+ 'gi-docgen' 'gjs' 'glib2-devel' 'glib-networking' 'gobject-introspection'
+ 'highway' 'intltool' 'iso-codes' 'libheif' 'libilbm' 'libjxl'
+ 'libmng' 'libwebp' 'libxpm' 'libxslt' 'luajit' 'meson' 'qoi-headers'
+ 'vala' 'zlib')
+ # 'xorg-server-xvfb' # needed for -Dheadless-tests=enabled
+ # 'yelp-tools' # needed for -Dg-ir-doc=true
+optdepends=('aalib: ASCII art support'
+ 'alsa-lib: for MIDI event controller module'
+ 'cfitsio: FITS support'
'curl: for URI support'
+ 'gjs: JavaScript scripting support'
'ghostscript: for postscript support'
- 'libxpm: XPM support'
+ 'iso-codes: Language support'
'libheif: HEIF support'
'libilbm: ILBM support'
'libjxl: JPEG XL support'
- 'libwebp: WebP support'
'libmng: MNG support'
- 'qoi-headers: QOI image support'
- 'iso-codes: Language support'
- 'aalib: ASCII art support'
- 'zlib: Compression routines'
- 'gjs: JavaScript scripting support'
- 'luajit: LUA scripting support'
+ 'libwebp: WebP support'
+ 'libxpm: XPM support'
'lua51-lgi: LUA scripting support'
- 'cfitsio: FITS support')
+ 'luajit: LUA scripting support'
+ 'qoi-headers: QOI image support'
+ 'zlib: Compression routines')
+# 'gutenprint: for sophisticated printing only as gimp has built-in cups print support' # GIMP 2.0 only
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'
+source=("https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver/rc/-RC}.tar.xz"
'linux.gpl')
-sha256sums=('8c1bb7a94ac0d4d0cde4d701d8b356387c2ecd87abbd35bbf7d222d40f6ddb6e'
- '7517df6ce9f2237253a49cb96eeb2638c80c53301bada6b44ce7f6eab835fe13'
- 'daeddaae0b5634f953189f4a479cc335c1516e7d490e6bf95f7be8e21835db3e'
+sha256sums=('b3d0b264c5e38e789faaf3417003397f3240014c59c7f417f9ca3bd39c5ffb66'
'1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
-prepare() {
- cd "${_pkgname}-${pkgver}"
- patch -uNp2 -r- -i ../docs_dont_fail_on_warn.patch
-}
-
build() {
local meson_options=(
- -Dg-ir-doc=true
+ # -Dg-ir-doc=false # disabled by default, depends on yelp-tools -- was causing build errors on 3.0 RC1
+ -Dheadless-tests=disabled # enabled by default, depends on xorg-server-xvfb
+ -Dlua=true # disabled by default for release (flagged as experimental)
)
- arch-meson "${_pkgname}-${pkgver}" build "${meson_options[@]}"
+ arch-meson "${_pkgname}-${pkgver/rc/-RC}" build "${meson_options[@]}"
meson compile -C build
}
package() {
- meson install -C build --destdir "$pkgdir"
+ meson install -C build --destdir "${pkgdir}"
- install -Dm 644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.99/palettes/Linux.gpl"
+ install -Dm 644 "${srcdir}"/linux.gpl "${pkgdir}/usr/share/gimp/${pkgver%.*}/palettes/Linux.gpl"
}
diff --git a/docs_dont_fail_on_warn.patch b/docs_dont_fail_on_warn.patch
deleted file mode 100644
index 71a76d97d0a3..000000000000
--- a/docs_dont_fail_on_warn.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur ./gimp-2.99.18.orig/devel-docs/reference/gimp/meson.build ./gimp-2.99.18/devel-docs/reference/gimp/meson.build
---- ./gimp-2.99.18.orig/devel-docs/reference/gimp/meson.build 2024-06-07 20:22:23.408718999 -0400
-+++ ./gimp-2.99.18/devel-docs/reference/gimp/meson.build 2024-06-07 20:22:48.556456913 -0400
-@@ -18,7 +18,6 @@
- gi_docgen,
- 'generate',
- '--quiet',
-- '--fatal-warnings',
- '--config', gimp_doc_toml,
- '--output-dir=@OUTPUT@',
- '--no-namespace-dir',
-diff -Naur ./gimp-2.99.18.orig/devel-docs/reference/gimp-ui/meson.build ./gimp-2.99.18/devel-docs/reference/gimp-ui/meson.build
---- ./gimp-2.99.18.orig/devel-docs/reference/gimp-ui/meson.build 2024-06-07 20:22:23.408718999 -0400
-+++ ./gimp-2.99.18/devel-docs/reference/gimp-ui/meson.build 2024-06-07 20:22:56.464372472 -0400
-@@ -19,7 +19,6 @@
- gi_docgen,
- 'generate',
- '--quiet',
-- '--fatal-warnings',
- '--config', gimp_ui_doc_toml,
- '--output-dir=@OUTPUT@',
- '--no-namespace-dir',