Version bump 2.99.16

5 files changed, 11 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ab298c37ad4..8d4ebd3298e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gimp-devel
 	pkgdesc = GNU Image Manipulation Program (Development version)
-	pkgver = 2.99.14
-	pkgrel = 2
+	pkgver = 2.99.16
+	pkgrel = 1
 	url = https://www.gimp.org/
 	arch = i686
 	arch = x86_64
@@ -50,7 +50,7 @@ pkgbase = gimp-devel
 	depends = openexr
 	depends = mypaint-brushes1
 	depends = babl>=0.1.98
-	depends = gegl>=0.4.40
+	depends = gegl>=0.4.46
 	depends = cairo
 	depends = python-gobject
 	depends = appstream-glib
@@ -71,12 +71,12 @@ pkgbase = gimp-devel
 	optdepends = gjs: JavaScript scripting support
 	optdepends = luajit: LUA scripting support
 	optdepends = lua51-lgi: LUA scripting support
-	provides = gimp=2.99.14
+	provides = gimp=2.99.16
 	conflicts = gimp
-	source = https://download.gimp.org/pub/gimp/v2.99/gimp-2.99.14.tar.xz
+	source = https://download.gimp.org/pub/gimp/v2.99/gimp-2.99.16.tar.xz
 	source = babl-0.1-name-change-meson.patch
 	source = linux.gpl
-	sha256sums = 313a205475d1ff03c5c4d9602f09f5c975ba6c1c79d8843e2396f9fe2abdf7a8
+	sha256sums = 6b4496edee447339f923276755247eadb64ec40d8aec241d06b62d1a6eb6508d
 	sha256sums = e012d022fe53eaf4cd2fc08f07cb0377fb14c8f791e42d13027983e41f7f4fc2
 	sha256sums = 1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3
 
diff --git a/PKGBUILD b/PKGBUILD
index fcc0ceadc29f..7d756f34ad34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,15 @@
 
 _pkgname=gimp
 pkgname=${_pkgname}-devel
-pkgver=2.99.14
-pkgrel=2
+pkgver=2.99.16
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development version)"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://www.gimp.org/"
 license=('GPL' 'LGPL')
 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.40' 'cairo' 'python-gobject' 'appstream-glib' 'libxmu' 'graphviz')
+         'babl>=0.1.98' 'gegl>=0.4.46' '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'
@@ -37,11 +37,11 @@ provides=("${_pkgname}=${pkgver}")
 source=("https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"
         'babl-0.1-name-change-meson.patch'
         'linux.gpl')
-sha256sums=('313a205475d1ff03c5c4d9602f09f5c975ba6c1c79d8843e2396f9fe2abdf7a8'
+sha256sums=('6b4496edee447339f923276755247eadb64ec40d8aec241d06b62d1a6eb6508d'
             'e012d022fe53eaf4cd2fc08f07cb0377fb14c8f791e42d13027983e41f7f4fc2'
             '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
 
-prepare() {
+_prepare() {
   cd "${_pkgname}-${pkgver}"
   patch -Np1 -i ../babl-0.1-name-change-meson.patch
 }
diff --git a/PKGBUILD.autotools b/PKGBUILD.autotools
deleted file mode 100644
index ce28bacc1cec..000000000000
--- a/PKGBUILD.autotools
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: twa022 <twa022 at gmail dot com>
-
-_pkgname=gimp
-pkgname=${_pkgname}-devel
-pkgver=2.99.14
-pkgrel=2
-pkgdesc="GNU Image Manipulation Program (Development version)"
-arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-url="https://www.gimp.org/"
-license=('GPL' 'LGPL')
-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.40' 'cairo' 'python-gobject' 'appstream-glib' 'libxmu' 'graphviz')
-makedepends=('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') #'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'
-            'curl: for URI support'
-            'ghostscript: for postscript support'
-            'libxpm: XPM support'
-            'libheif: HEIF support'
-            'libjxl: JPEG XL support'
-            'libwebp: WebP support'
-            'libmng: MNG support'
-            'iso-codes: Language support'
-            'aalib: ASCII art support'
-            'zlib: Compression routines'
-            'gjs: JavaScript scripting support'
-            'luajit: LUA scripting support'
-            'lua51-lgi: LUA scripting support')
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
-source=("https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}-autotools.tar.bz2"
-        'babl-0.1-name-change-autotools.patch'
-        'linux.gpl')
-sha256sums=('810761c432224157f45c5104ded58245acb95d2070a538caa516327c5b0e0f58'
-            'e92f88fbfb31514b1be47d303f69a5020c9fffdd6f4557fceeaab36b7881eb78'
-            '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
-
-prepare() {
-  cd "${_pkgname}-${pkgver}"
-  patch -Np1 -i ../babl-0.1-name-change-autotools.patch
-}
-
-build() {
-  cd "${_pkgname}-${pkgver}"
-    ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib \
-    --libexecdir=/usr/lib/gimp \
-    --datarootdir=/usr/share \
-    --enable-mp \
-    --enable-gimp-console \
-    --enable-gi-docgen
-#   --enable-g-ir-doc
-  make
-}
-
-package() {
-  cd "${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm 644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.99/palettes/Linux.gpl"
-}
diff --git a/babl-0.1-name-change-autotools.patch b/babl-0.1-name-change-autotools.patch
deleted file mode 100644
index 1a8b85143441..000000000000
--- a/babl-0.1-name-change-autotools.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 09ece8f6f99756ed84ded47d9da6e2f5cbda5375 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Fri, 9 Dec 2022 16:34:11 +0100
-Subject: [PATCH] Issue #8948: Autotools build does not support the new
- babl-0.1 naming.
-
----
- configure.ac | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index cd4b2a53a11..7d35d558dba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -707,8 +707,11 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
- # Checks for required libraries
- ###############################
- 
--PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],,
--                  [add_deps_error([babl >= babl_required_version])])
-+PKG_CHECK_MODULES(BABL, [babl-0.1 >= babl_required_version],,
-+                  [
-+                   PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],,
-+                   [add_deps_error([babl-0.1 >= babl_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,,
--- 
-GitLab
-
diff --git a/babl-0.1-name-change-meson.patch b/babl-0.1-name-change-meson.patch
deleted file mode 100644
index d1e0e5320fb6..000000000000
--- a/babl-0.1-name-change-meson.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 04a78154e1af5e30dcedde6dbaa321be3f0e24b1 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Mon, 5 Dec 2022 14:34:48 +0100
-Subject: [PATCH] meson: take into account babl's pkg-config name change.
-
-See babl!52 (babl commit b8da847) and gimp#8912.
----
- meson.build | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 45b72d017f1..155fc166ec6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -340,7 +340,13 @@ mscms             = platform_windows ? cc.find_library('mscms') : no_dep
- atk_minver        = '2.4.0'
- atk               = dependency('atk',                version: '>='+atk_minver)
- babl_minver       = '0.1.98'
--babl              = dependency('babl',               version: '>='+babl_minver)
-+babl              = dependency('babl-0.1',           version: '>='+babl_minver, required: false)
-+if not babl.found()
-+  # babl changed its pkg-config name from 'babl' to 'babl-0.1' in version
-+  # 0.1.100 (0.1.99 dev cycle more exactly). 'babl-0.1' is checked in priority
-+  # because it would be a newer version.
-+  babl            = dependency('babl',               version: '>='+babl_minver)
-+endif
- cairo_minver      = '1.12.2'
- cairo             = dependency('cairo',              version: '>='+cairo_minver)
- 
--- 
-GitLab
-