3 files changed, 48 insertions, 84 deletions
diff --git a/pcr/mypaint-gegl-git/PKGBUILD b/pcr/mypaint-gegl-git/PKGBUILD
deleted file mode 100644
index e6e4a2098..000000000
--- a/pcr/mypaint-gegl-git/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor (Arch): Jon Nordby <jononor@gmail.com>
-
-_pkgname=mypaint
-pkgname=('mypaint-gegl-git' 'libmypaint-gegl-git')
-pkgver=r4141.ad19153
-pkgrel=2
-pkgdesc="A fast and easy painting application for digital painters, with brush dynamics and GEGL support"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://mypaint.intilinux.com/"
-license=('GPL' 'LGPL')
-depends=('python2-gobject' 'python2-numpy' 'gtk3' 'json-c' 'lcms2' 'gegl')
-makedepends=('scons>=0.97' 'swig>=1.3.39' 'git')
-source=($_pkgname-$pkgver::git+https://github.com/$_pkgname/$_pkgname
-        brushlib::git+https://github.com/$_pkgname/lib$_pkgname)
-md5sums=('SKIP'
-         'SKIP')
-
-pkgver() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  git submodule init
-  git config submodule.'brushlib'.url "${srcdir}/brushlib"
-  git submodule update
-
-  # python2 fix
-  sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-}
-
-package_mypaint-gegl-git() {
-  depends=('python2-gobject' 'python2-numpy' 'gtk3' 'lcms2' 'libmypaint-gegl-git')
-  provides=("${_pkgname}")
-  conflicts=("${_pkgname}")
-  install=mypaint.install
-
-  cd $srcdir/$_pkgname-$pkgver
-  scons prefix="$pkgdir"/usr use_sharedlib=yes enable_gegl=yes install
-
-  # separate files to libmypaint package
-  install -vdm 0755 $srcdir/lib$_pkgname-fakeinstall/usr/{include,lib,share}
-  mv -v $pkgdir/usr/include/lib$_pkgname{,-gegl}/*	$srcdir/lib$_pkgname-fakeinstall/usr/include
-  mv -v $pkgdir/usr/lib/lib$_pkgname*.so		$srcdir/lib$_pkgname-fakeinstall/usr/lib
-  mv -v $pkgdir/usr/lib/pkgconfig			$srcdir/lib$_pkgname-fakeinstall/usr/lib
-  mv -v $pkgdir/usr/share/lib$_pkgname			$srcdir/lib$_pkgname-fakeinstall/usr/share
-  # mypaint needs libmypaint-tests.so
-  install -vDm 0644 brushlib/lib$_pkgname-tests.so	$srcdir/lib$_pkgname-fakeinstall/usr/lib
-}
-
-package_libmypaint-gegl-git() {
-  _pkgver() {
-    cd "${srcdir}/brushlib"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  }
-  pkgver=$(_pkgver)
-  pkgdesc="A library for making brushstrokes, with GEGL support"
-  depends=('python2' 'gcc-libs' 'glib2' 'json-c' 'gegl')
-  provides=("lib${_pkgname}")
-  conflicts=("lib${_pkgname}" "${_pkgname}<1.2a")
-
-  mv -v $srcdir/lib$_pkgname-fakeinstall/* $pkgdir
-}
diff --git a/pcr/mypaint-gegl-git/mypaint.install b/pcr/mypaint-gegl-git/mypaint.install
deleted file mode 100644
index 5f0358791..000000000
--- a/pcr/mypaint-gegl-git/mypaint.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
-	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	/bin/true
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-post_remove() {
-	post_install $1
-}
diff --git a/pcr/mypaint-gegl/PKGBUILD b/pcr/mypaint-gegl/PKGBUILD
new file mode 100644
index 000000000..5c5405bf1
--- /dev/null
+++ b/pcr/mypaint-gegl/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# based of mypaint
+
+_pkgname=mypaint
+pkgname=mypaint-gegl
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="A fast and easy painting application for digital painters, with brush dynamics and GEGL support"
+arch=('i686' 'x86_64' 'armv7h')
+url="http://mypaint.org/"
+license=('GPL' 'LGPL')
+depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2' 'json-c'
+	 'lcms2' 'python2-gobject' 'gtk3' 'gegl')
+makedepends=('scons>=0.97' 'swig>=1.3.39')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+source=(https://github.com/mypaint/mypaint/releases/download/v$pkgver/mypaint-$pkgver.tar.xz
+	https://github.com/mypaint/mypaint/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch)
+md5sums=('c7c2cfac8e1eec5549e58567ec68daac'
+         'e196d8ea9eb9e939118a17c04678a69a')
+
+prepare() {
+  cd $srcdir/$_pkgname-$pkgver
+  patch -p1 <$srcdir/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch
+}
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  scons prefix="$pkgdir"/usr use_sharedlib=yes enable_gegl=yes install
+
+  # fixing headers files, it's needed for GIMP 2.9 and above package
+  install -vdm 0755					$pkgdir/usr/include/glib
+  ln -vs lib$_pkgname-gegl/$_pkgname-gegl-surface.h	$pkgdir/usr/include
+  ln -vs lib$_pkgname/glib/$_pkgname-brush.h		$pkgdir/usr/include/glib
+  ln -vs lib$_pkgname/glib/$_pkgname-gegl-glib.h	$pkgdir/usr/include/glib
+  ln -vs lib$_pkgname/$_pkgname-brush-settings-gen.h	$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-brush-settings.h	$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-brush.h			$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-config.h		$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-fixed-tiled-surface.h	$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-glib-compat.h		$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-rectangle.h		$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-surface.h		$pkgdir/usr/include
+  ln -vs lib$_pkgname/$_pkgname-tiled-surface.h		$pkgdir/usr/include
+
+  # add libmypaint-tests.so, it's needed for shared libraries
+  install -vDm 0644 brushlib/lib$_pkgname-tests.so	$pkgdir/usr/lib
+}