Clean and initialize merge with gimp-develop-git.

3 files changed, 86 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45fa3ab80031..b1d21610c418 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = gimp-git
+pkgbase = gimp-develop-git
 	pkgdesc = GNU Image Manipulation Program
-	pkgver = 3.0.r42265.ff56a3af8d
+	pkgver = 2.99.1.r1398.f7ac033777
 	pkgrel = 1
 	epoch = 1
 	url = https://www.gimp.org
@@ -10,10 +10,10 @@ pkgbase = gimp-git
 	license = LGPL
 	checkdepends = xorg-server-xvfb
 	makedepends = git
-	makedepends = gutenprint
-	makedepends = intltool
-	makedepends = gnome-python
-	makedepends = alsa-lib
+	makedepends = gutenprint>=5.0.0
+	makedepends = intltool>=0.40.1
+	makedepends = gnome-python>=2.16.2
+	makedepends = alsa-lib>=1.0.0
 	makedepends = libxslt
 	makedepends = glib-networking
 	makedepends = alsa-lib
@@ -27,26 +27,26 @@ pkgbase = gimp-git
 	makedepends = iso-codes
 	makedepends = aalib
 	makedepends = zlib
-	depends = pygtk
-	depends = lcms2
-	depends = libwmf
+	depends = pygtk>=2.10.4
+	depends = lcms2>=2.8
+	depends = libwmf>=0.2.8
 	depends = icu
 	depends = enchant
-	depends = libgexiv2
-	depends = librsvg
+	depends = libgexiv2>=0.10.6
+	depends = librsvg>=2.40.6
 	depends = desktop-file-utils
-	depends = libexif
-	depends = libart-lgpl
+	depends = libexif>=0.6.15
+	depends = libart-lgpl>=2.3.19
 	depends = dbus-glib
-	depends = gtk-doc
-	depends = poppler-glib
-	depends = poppler-data
-	depends = openexr
-	depends = mypaint-brushes
-	depends = babl
-	depends = gegl
-	depends = cairo
-	depends = appstream-glib
+	depends = gtk-doc>=1.0
+	depends = poppler-glib>=0.69.0
+	depends = poppler-data>=0.4.9
+	depends = openexr>=1.6.1
+	depends = mypaint-brushes>=1.3.0
+	depends = babl>=0.1.61
+	depends = gegl>=0.4.13
+	depends = cairo>=1.14.0
+	depends = appstream-glib>=0.7.7
 	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
@@ -59,12 +59,10 @@ pkgbase = gimp-git
 	optdepends = iso-codes: Language support
 	optdepends = aalib: ASCII art support
 	optdepends = zlib: Compression routines
-	provides = gimp
-	conflicts = gimp
 	source = git+https://gitlab.gnome.org/GNOME/gimp.git
 	source = linux.gpl
 	sha512sums = SKIP
 	sha512sums = 6f33d57f242fa8ce04b65e06a712bd54677306a45b22cb853fbe348089cd4673bd4ed91073074fe067166fe8951c370f8bbbc386783e3ed5170d52e9062666fe
 
-pkgname = gimp-git
+pkgname = gimp-develop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fc0e9a802bfa..00d8c08823f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,39 @@
 # Contributor: Alexander Hunziker <alex.hunziker@gmail.com>
 # Contributor: Alessio Biancalana <dottorblaster@gmail.com>
 
-pkgname=gimp-git
-_pkgname=${pkgname%-git}
+pkgname=gimp-develop-git
+_pkgname=${pkgname%-develop-git}
 epoch=1
-pkgver=3.0.r42265.ff56a3af8d
+pkgver=2.99.1.r1398.f7ac033777
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="https://www.gimp.org"
 license=('GPL' 'LGPL')
-depends=('pygtk' 'lcms2' 'libwmf' 'icu' 'enchant'
-         'libgexiv2' 'librsvg' 'desktop-file-utils'
-         'libexif' 'libart-lgpl' 'dbus-glib' 'gtk-doc'
-         'poppler-glib' 'poppler-data' 'openexr' 'mypaint-brushes'
-         'babl' 'gegl' 'cairo' 'appstream-glib')
-makedepends=('git' 'gutenprint' 'intltool' 'gnome-python'
-             'alsa-lib' 'libxslt' 'glib-networking'
+depends=(
+	'pygtk>=2.10.4'
+	'lcms2>=2.8'
+	'libwmf>=0.2.8'
+	'icu'
+	'enchant'
+	'libgexiv2>=0.10.6'
+	'librsvg>=2.40.6'
+	'desktop-file-utils'
+	'libexif>=0.6.15'
+	'libart-lgpl>=2.3.19'
+	'dbus-glib'
+	'gtk-doc>=1.0'
+	'poppler-glib>=0.69.0'
+	'poppler-data>=0.4.9'
+	'openexr>=1.6.1'
+	'mypaint-brushes>=1.3.0'
+	'babl>=0.1.61'
+	'gegl>=0.4.13'
+	'cairo>=1.14.0'
+	'appstream-glib>=0.7.7'
+	)
+makedepends=('git' 'gutenprint>=5.0.0' 'intltool>=0.40.1' 'gnome-python>=2.16.2'
+             'alsa-lib>=1.0.0' 'libxslt' 'glib-networking'
              'alsa-lib' 'curl' 'ghostscript' 'libxpm' 'webkit2gtk'
              'libheif' 'libwebp' 'libmng' 'iso-codes' 'aalib' 'zlib')
 checkdepends=('xorg-server-xvfb')
@@ -34,8 +51,6 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu
             'iso-codes: Language support'
             'aalib: ASCII art support'
             'zlib: Compression routines')
-provides=('gimp')
-conflicts=('gimp')
 source=('git+https://gitlab.gnome.org/GNOME/gimp.git'
         'linux.gpl')
 sha512sums=('SKIP'
@@ -43,11 +58,7 @@ sha512sums=('SKIP'
 
 pkgver() {
   cd $_pkgname
-
-  printf "%s.r%s.%s" \
-  	$(cat configure.ac | grep '^m4_define(\[gimp_api_version\], \[.*\])' | sed -e 's|m4_define(\[gimp_api_version\], \[||' -e 's|\])||') \
-  	$(git rev-list --count HEAD) \
-  	$(git rev-parse --short HEAD)
+  printf %s.%s.%s.r%s.%s $(grep -oP 'gimp_(major|minor|micro)_version\], \[\K[0-9]{1,2}' configure.ac) $(git rev-list $(git describe --abbrev=0)..HEAD --count) $(git log --pretty=format:'%h' -n 1)
 }
 
 prepare() {
@@ -94,9 +105,17 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  install -Dm 644 "$srcdir"/linux.gpl "$pkgdir"/usr/share/gimp/2.0/palettes/Linux.gpl
+  install -Dm 644 "$srcdir"/linux.gpl "$pkgdir"/usr/share/gimp/2.99/palettes/Linux.gpl
+  
+  #fix gimp.desktop
+  mv ${pkgdir}/usr/share/applications/gimp.desktop ${pkgdir}/usr/share/applications/gimp-2.99.desktop
+  sed -i 's/Icon=gimp/&-2.99/' ${pkgdir}/usr/share/applications/gimp-2.99.desktop
 
-  ln -s gimptool-2.0 "$pkgdir"/usr/bin/gimptool
-  ln -sf gimptool-2.0.1.gz "$pkgdir"/usr/share/man/man1/gimptool.1.gz
-}
+  #fix icons
+  for icon in $(find ${pkgdir}/usr/share/icons -type f); do
+    mv ${icon} ${icon%.png}-2.99.png
+  done
 
+  #fix metainfo
+  rm -rf ${pkgdir}/usr/share/metainfo
+}
diff --git a/update.PKGBUILD b/update.PKGBUILD
new file mode 100755
index 000000000000..a97517e886fc
--- /dev/null
+++ b/update.PKGBUILD
@@ -0,0 +1,23 @@
+#!/bin/bash
+#source PKGBUILD
+_gitname=gimp
+srcdir=$PWD/src
+
+declare -A dep_versions
+readonly -a deps=(pygtk gexiv2 poppler poppler_data libmypaint gtkdoc cairo babl lcms wmf gexiv2 rsvg openexr libmypaint appstream_glib)
+
+## probe configure.ac for dependencies versions
+# gegl version is broken to major_minor|micro those need to be probled separately
+dep_versions["_gegl_version"]=$(printf "%s.%s" $(grep -oP '\[gegl_(major_minor|micro)_version\], \[\K[0-9.]*' ${srcdir}/${_gitname}/configure.ac))
+# the rest have standard form of "[{dep_name}_raqured_version], [{version}]"
+for dep in ${deps[*]};do
+	dep_versions["_${dep}_version"]=$(grep -oP "(\[${dep}_required_version\], \[)\K[0-9.]*" ${srcdir}/${_gitname}/configure.ac)
+done
+
+echo "##probed deps versions:" >&2
+for key in ${!dep_versions[*]};do echo $key:${dep_versions[$key]};done >&2
+
+echo "##generate PKGBUILD" >&2
+cp -v --backup=numbered PKGBUILD.in PKGBUILD
+for key in ${!dep_versions[*]};do sed -i "s/@${key}@/${dep_versions[${key}]}/" PKGBUILD;done >&2
+echo "##finish generating PKGBUILD"