Take over pantheon-code-git

2 files changed, 43 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 469a66914ac2..951ec2a91f44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 # Generated by mksrcinfo v8
-# Thu Jan 18 23:02:02 UTC 2018
+# Fri May 25 19:46:14 UTC 2018
 pkgbase = pantheon-code-git
-	pkgdesc = Code editor designed for elementary OS
-	pkgver = r2477.0a016808
+	pkgdesc = The Pantheon Code Editor
+	pkgver = r3101.21d512a8
 	pkgrel = 1
-	url = https://github.com/elementary/code
-	arch = i686
+	url = https://github.com/elementary/scratch
 	arch = x86_64
 	groups = pantheon-unstable
 	license = GPL3
-	makedepends = cmake
+	makedepends = appstream
 	makedepends = git
 	makedepends = gobject-introspection
-	makedepends = granite
+	makedepends = granite-git
+	makedepends = gtkspell3
 	makedepends = intltool
+	makedepends = meson
 	makedepends = vala
 	makedepends = vte3
 	makedepends = webkit2gtk
 	depends = cairo
+	depends = editorconfig-core-c
 	depends = glib2
 	depends = glibc
 	depends = gtk3
@@ -28,7 +30,15 @@ pkgbase = pantheon-code-git
 	depends = pango
 	depends = zeitgeist
 	depends = libgranite.so
+	optdepends = gtkspell3: Spell Check extension
+	optdepends = vala: Outline extension
+	optdepends = vte3: Terminal extension
+	optdepends = webkit2gtk: Browser Preview extension
 	provides = pantheon-code
+	provides = scratch-text-editor
+	conflicts = pantheon-code
+	conflicts = scratch-text-editor
+	replaces = scratch-text-editor-git
 	source = pantheon-code::git+https://github.com/elementary/code.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index e1d9b9a89d02..5c6a4c4f47f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,54 @@
-# Maintainer: Augustin deMayo <gus.demayo@gmail.com>
-# Contributor: Maxime Gauduin <alucryd@archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=pantheon-code-git
-pkgver=r2477.0a016808
+pkgver=r3101.21d512a8
 pkgrel=1
-pkgdesc='Code editor designed for elementary OS'
-arch=('i686' 'x86_64')
-url='https://github.com/elementary/code'
+pkgdesc='The Pantheon Code Editor'
+arch=('x86_64')
+url='https://github.com/elementary/scratch'
 license=('GPL3')
 groups=('pantheon-unstable')
-depends=('cairo' 'glib2' 'glibc' 'gtk3' 'gtksourceview3' 'libgee' 'libpeas'
-         'libsoup' 'pango' 'zeitgeist'
+depends=('cairo' 'editorconfig-core-c' 'glib2' 'glibc' 'gtk3' 'gtksourceview3'
+         'libgee' 'libpeas' 'libsoup' 'pango' 'zeitgeist'
          'libgranite.so')
-makedepends=('cmake' 'git' 'gobject-introspection' 'granite'
-             'intltool' 'vala' 'vte3' 'webkit2gtk')
-provides=('pantheon-code')
+makedepends=('appstream' 'git' 'gobject-introspection' 'granite-git'
+             'gtkspell3' 'intltool' 'meson' 'vala' 'vte3' 'webkit2gtk')
+optdepends=('gtkspell3: Spell Check extension'
+            'vala: Outline extension'
+            'vte3: Terminal extension'
+            'webkit2gtk: Browser Preview extension')
+provides=('pantheon-code' 'scratch-text-editor')
+conflicts=('pantheon-code' 'scratch-text-editor')
+replaces=('scratch-text-editor-git')
 source=('pantheon-code::git+https://github.com/elementary/code.git')
 sha256sums=('SKIP')
 
 pkgver() {
   cd pantheon-code
+
   echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd pantheon-code
-
   if [[ -d build ]]; then
     rm -rf build
   fi
-
   mkdir build
+
+  sed 's/libvala-0.36/libvala-0.38/' -i pantheon-code/plugins/outline/meson.build
 }
 
 build() {
-  cd pantheon-code/build
-
-  cmake .. \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
-    -DGSETTINGS_COMPILE='OFF'
-  make
+  cd build
+
+  arch-meson ../pantheon-code
+  ninja
 }
 
 package() {
-  cd pantheon-code/build
-  make DESTDIR="${pkgdir}" install
+  cd build
+
+  DESTDIR="${pkgdir}" ninja install
 }
 
 # vim: ts=2 sw=2 et: