add {,lib}mypaint-gegl-git to [pcr], rm mypaint-gegl package

3 files changed, 87 insertions, 56 deletions

diff --git a/pcr/libmypaint-gegl-git/PKGBUILD b/pcr/libmypaint-gegl-git/PKGBUILD
new file mode 100644
index 000000000..417c98674
--- /dev/null
+++ b/pcr/libmypaint-gegl-git/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# based of mypaint
+
+_pkgname=mypaint
+pkgname=libmypaint-gegl-git
+pkgver=r686.9491163
+pkgrel=1
+pkgdesc="MyPaint Libraries, with brush dynamics and GEGL support"
+arch=('i686' 'x86_64' 'armv7h')
+url="http://mypaint.org/"
+license=('GPL' 'LGPL')
+depends=('json-c' 'gegl')
+makedepends=('git' 'intltool')
+provides=("lib${_pkgname}")
+conflicts=("lib${_pkgname}-gegl")
+source=(lib${_pkgname}-${pkgver}::git+https://github.com/${_pkgname}/lib${_pkgname}.git)
+md5sums=('SKIP')
+
+pkgver() {
+  cd lib${_pkgname}-${pkgver}
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd lib${_pkgname}-${pkgver}
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd lib${_pkgname}-${pkgver}
+  ./configure \
+    --prefix=/usr \
+    --enable-docs \
+    --enable-gegl \
+    --with-glib
+  make
+}
+
+package() {
+  cd $srcdir/lib$_pkgname-$pkgver
+  make DESTDIR="${pkgdir}" 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-glib.h        $pkgdir/usr/include
+  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/$_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-mapping.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
+}
diff --git a/pcr/mypaint-gegl-git/PKGBUILD b/pcr/mypaint-gegl-git/PKGBUILD
new file mode 100644
index 000000000..f839354a2
--- /dev/null
+++ b/pcr/mypaint-gegl-git/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# based of mypaint
+
+_pkgname=mypaint
+pkgname=mypaint-gegl-git
+pkgver=r4556.427c7e5
+pkgrel=1
+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'
+	 'lcms2' 'python2-gobject' 'gtk3' 'libmypaint-gegl-git')
+makedepends=('scons>=0.97' 'swig>=1.3.39' 'git')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}" "${_pkgname}-gegl")
+source=(${_pkgname}-${pkgver}::git+https://github.com/${_pkgname}/${_pkgname}.git
+        remove-delete-function.patch)
+md5sums=('SKIP' 'SKIP')
+
+pkgver() {
+  cd ${_pkgname}-${pkgver}
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  scons prefix="$pkgdir"/usr use_sharedlib=yes enable_gegl=yes install
+}
diff --git a/pcr/mypaint-gegl/PKGBUILD b/pcr/mypaint-gegl/PKGBUILD
deleted file mode 100644
index 31ba30856..000000000
--- a/pcr/mypaint-gegl/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of mypaint
-
-_pkgname=mypaint
-pkgname=mypaint-gegl
-pkgver=1.2.0
-pkgrel=3.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.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' 'git')
-provides=("${_pkgname}")
-conflicts=("${_pkgname}" "lib${_pkgname}")
-source=(${_pkgname}-${pkgver}::git+https://github.com/${_pkgname}/${_pkgname}.git#tag=v${pkgver}
-	https://github.com/${_pkgname}/${_pkgname}/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch
-	lib${_pkgname}.git::git+https://github.com/${_pkgname}/lib${_pkgname}.git)
-md5sums=('SKIP'
-         'e196d8ea9eb9e939118a17c04678a69a'
-         'SKIP')
-
-prepare() {
-  cd $srcdir/$_pkgname-$pkgver
-  patch -p1 <$srcdir/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593.patch
-
-  # update libmypaint
-  rm -r brushlib
-  git submodule init
-  git config submodule.'libmypaint'.url                          "${srcdir}/lib${_pkgname}.git"
-  git submodule update
-}
-
-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
-}