Version bump 2.99.2

2 files changed, 79 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96298207f9c4..ac0bf31c87d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,57 +1,73 @@
-# Generated by mksrcinfo v8
-# Mon Apr 30 18:08:34 UTC 2018
 pkgbase = gimp-devel
 	pkgdesc = GNU Image Manipulation Program (Development version)
-	pkgver = 2.10.0
+	pkgver = 2.99.2
 	pkgrel = 1
-	epoch = 1
 	url = http://www.gimp.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	license = LGPL
+	checkdepends = xorg-server-xvfb
 	makedepends = intltool
-	makedepends = poppler-glib
-	makedepends = poppler-data
+	makedepends = libxslt
+	makedepends = glib-networking
 	makedepends = alsa-lib
-	makedepends = iso-codes
 	makedepends = curl
 	makedepends = ghostscript
+	makedepends = libxpm
+	makedepends = webkit2gtk
+	makedepends = libheif
+	makedepends = libwebp
+	makedepends = libmng
+	makedepends = iso-codes
+	makedepends = aalib
+	makedepends = zlib
+	makedepends = gjs
+	makedepends = luajit
+	makedepends = meson
+	makedepends = gobject-introspection
 	makedepends = gtk-doc
-	makedepends = glib-networking
-	depends = pygtk
-	depends = lcms
-	depends = libxpm
+	makedepends = xorg-server-xvfb
+	depends = gtk3
+	depends = lcms2
 	depends = libwmf
-	depends = libxmu
+	depends = icu
+	depends = enchant
+	depends = libgexiv2
 	depends = librsvg
-	depends = libmng
-	depends = dbus-glib
-	depends = libexif
-	depends = gegl>=0.4.0
-	depends = jasper
 	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = babl>=0.1.46
+	depends = libexif
+	depends = openjpeg2
+	depends = poppler-glib
+	depends = poppler-data
 	depends = openexr
-	depends = libgudev
-	depends = libgexiv2
-	depends = libmypaint>=1.3.0
-	depends = libwebp
-	depends = aalib
-	depends = mypaint-brushes
+	depends = mypaint-brushes1
+	depends = babl>=0.1.78
+	depends = gegl>=0.4.27
+	depends = cairo
+	depends = python-gobject
+	depends = appstream-glib
+	depends = libxmu
 	optdepends = gutenprint: for sophisticated printing only as gimp has built-in cups print support
-	optdepends = poppler-glib: for pdf support
-	optdepends = poppler-data: for pdf support
 	optdepends = alsa-lib: for MIDI event controller module
 	optdepends = curl: for URI support
 	optdepends = ghostscript: for postscript support
-	provides = gimp=2.10.0
+	optdepends = libxpm: XPM support
+	optdepends = webkit2gtk: HTML renderer and web content engine
+	optdepends = libheif: HEIF support
+	optdepends = libwebp: WebP support
+	optdepends = libmng: MNG 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
+	provides = gimp=2.99.2
 	conflicts = gimp
-	options = !makeflags
-	source = https://download.gimp.org/pub/gimp/v2.10/gimp-2.10.0.tar.bz2
+	source = https://download.gimp.org/pub/gimp/v2.99/gimp-2.99.2.tar.bz2
 	source = linux.gpl
-	sha256sums = 7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2
+	sha256sums = 39dc99a1581bbaafa9d6686bf246f7be12b0788ebfc37d185dea5bdae9c3ae73
 	sha256sums = 1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3
 
 pkgname = gimp-devel
diff --git a/PKGBUILD b/PKGBUILD
index 915129ec3668..70fe91243262 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,71 +2,57 @@
 
 _pkgname=gimp
 pkgname=${_pkgname}-devel
-epoch=1
-pkgver=2.10.0
+pkgver=2.99.2
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development version)"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
 license=('GPL' 'LGPL')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib'
-         'libexif' 'gegl>=0.4.0' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl>=0.1.46'
-         'openexr' 'libgudev' 'libgexiv2' 'libmypaint>=1.3.0' 'libwebp' 'aalib' 'mypaint-brushes')
-makedepends=('intltool' 'poppler-glib' 'poppler-data' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript' 'gtk-doc' 'glib-networking')
+depends=('gtk3' 'lcms2' 'libwmf' 'icu' 'enchant' 'libgexiv2' 'librsvg' 'desktop-file-utils'
+         'libexif' 'openjpeg2' 'poppler-glib' 'poppler-data' 'openexr' 'mypaint-brushes1'
+         'babl>=0.1.78' 'gegl>=0.4.27' 'cairo' 'python-gobject' 'appstream-glib' 'libxmu')
+makedepends=('intltool' 'libxslt' 'glib-networking'
+             'alsa-lib' 'curl' 'ghostscript' 'libxpm' 'webkit2gtk'
+             'libheif' 'libwebp' 'libmng' 'iso-codes' 'aalib' 'zlib'
+             'gjs'  'luajit' 'meson' 'gobject-introspection'
+             'gtk-doc' 'xorg-server-xvfb')
+checkdepends=('xorg-server-xvfb')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'poppler-glib: for pdf support'
-            'poppler-data: for pdf support'
             'alsa-lib: for MIDI event controller module'
             'curl: for URI support'
-            'ghostscript: for postscript support')
-options=('!makeflags')
+            'ghostscript: for postscript support'
+            'libxpm: XPM support'
+            'webkit2gtk: HTML renderer and web content engine'
+            'libheif: HEIF 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/_rc/-RC}.tar.bz2 linux.gpl)
-sha256sums=('7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2'
+source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2 linux.gpl)
+sha256sums=('39dc99a1581bbaafa9d6686bf246f7be12b0788ebfc37d185dea5bdae9c3ae73'
             '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3')
-
-prepare() {
-  export PYTHON=/usr/bin/python2
-  cd "${srcdir}/${_pkgname}-${pkgver/_rc/-RC}"
-  _mypaintver=$( ls /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
-  
-  autoreconf -vi
-  # python2 fixes
-  sed -i 's:PYTHON=python$:&2:' plug-ins/pygimp/py-compile
-  find ./plug-ins -type f -name *py -exec \
-    sed -i 's|#!.*python$|#!/usr/bin/python2|' '{}' \;
-}
-  
 build() {
-  export PYTHON=/usr/bin/python2
-  cd "${srcdir}/${_pkgname}-${pkgver/_rc/-RC}"
-  ./configure \
+  cd "${_pkgname}-${pkgver}"
+    ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --libdir=/usr/lib \
+    --libexecdir=/usr/lib/gimp \
+    --datarootdir=/usr/share \
     --enable-mp \
     --enable-gimp-console \
-    --enable-gimp-remote \
-    --enable-python \
-    --enable-gtk-doc \
-    --without-webkit
+    --enable-gtk-doc
   make
 }
 
 package() {
-  export PYTHON=/usr/bin/python2
-  cd "${srcdir}/${_pkgname}-${pkgver/_rc/-RC}"
+  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-${pkgver%.*}.1"
-  ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
-
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-#  ln -s gimp-${pkgver%.*} ${pkgdir}/usr/bin/gimp
-#  ln -s gimp-console-${pkgver%.*} ${pkgdir}/usr/bin/gimp-console
+  install -Dm 644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.99/palettes/Linux.gpl"
 }
-